diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2011-08-14 19:39:40 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-08-24 14:41:41 -0400 |
| commit | 04023afcce2eaff4f66d19ca21b106512fffabe7 (patch) | |
| tree | 85b196fad65ddadde0081f14948e0ad5fe7897eb /drivers/ssb/main.c | |
| parent | 292121dce2af63dab371102097a887de7cf24233 (diff) | |
| download | op-kernel-dev-04023afcce2eaff4f66d19ca21b106512fffabe7.zip op-kernel-dev-04023afcce2eaff4f66d19ca21b106512fffabe7.tar.gz | |
ssb: fix DMA translation for some specific boards
Signed-off-by: Michael Buesch <m@bues.ch>
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/ssb/main.c')
| -rw-r--r-- | drivers/ssb/main.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index 29c7d4f..d0cbdb0 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c @@ -1260,16 +1260,34 @@ void ssb_device_disable(struct ssb_device *dev, u32 core_specific_flags) } EXPORT_SYMBOL(ssb_device_disable); +/* Some chipsets need routing known for PCIe and 64-bit DMA */ +static bool ssb_dma_translation_special_bit(struct ssb_device *dev) +{ + u16 chip_id = dev->bus->chip_id; + + if (dev->id.coreid == SSB_DEV_80211) { + return (chip_id == 0x4322 || chip_id == 43221 || + chip_id == 43231 || chip_id == 43222); + } + + return 0; +} + u32 ssb_dma_translation(struct ssb_device *dev) { switch (dev->bus->bustype) { case SSB_BUSTYPE_SSB: return 0; case SSB_BUSTYPE_PCI: - if (ssb_read32(dev, SSB_TMSHIGH) & SSB_TMSHIGH_DMA64) + if (pci_is_pcie(dev->bus->host_pci) && + ssb_read32(dev, SSB_TMSHIGH) & SSB_TMSHIGH_DMA64) { return SSB_PCIE_DMA_H32; - else - return SSB_PCI_DMA; + } else { + if (ssb_dma_translation_special_bit(dev)) + return SSB_PCIE_DMA_H32; + else + return SSB_PCI_DMA; + } default: __ssb_dma_not_implemented(dev); } |
