diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-07-23 13:57:33 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-08-09 16:11:31 -0400 |
| commit | 5b36c9b4a9872f7852b8ce7cffbfc2f6d6c25371 (patch) | |
| tree | f9de2ab995260c3f9be6016e86d592a31ed572d6 /drivers/net | |
| parent | a5d5a914770a81a1f775be2ee35b9fa8fd19d381 (diff) | |
| download | linux-3.10-5b36c9b4a9872f7852b8ce7cffbfc2f6d6c25371.tar.gz linux-3.10-5b36c9b4a9872f7852b8ce7cffbfc2f6d6c25371.tar.bz2 linux-3.10-5b36c9b4a9872f7852b8ce7cffbfc2f6d6c25371.zip | |
b43: read correct register on bcma bus.
This causes an databus error on a Broadcom SoC using bcma.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/b43/dma.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c index 83cba22ac6e..481e534534e 100644 --- a/drivers/net/wireless/b43/dma.c +++ b/drivers/net/wireless/b43/dma.c @@ -795,9 +795,23 @@ static u64 supported_dma_mask(struct b43_wldev *dev) u32 tmp; u16 mmio_base; - tmp = b43_read32(dev, SSB_TMSHIGH); - if (tmp & SSB_TMSHIGH_DMA64) - return DMA_BIT_MASK(64); + switch (dev->dev->bus_type) { +#ifdef CONFIG_B43_BCMA + case B43_BUS_BCMA: + tmp = bcma_aread32(dev->dev->bdev, BCMA_IOST); + if (tmp & BCMA_IOST_DMA64) + return DMA_BIT_MASK(64); + break; +#endif +#ifdef CONFIG_B43_SSB + case B43_BUS_SSB: + tmp = ssb_read32(dev->dev->sdev, SSB_TMSHIGH); + if (tmp & SSB_TMSHIGH_DMA64) + return DMA_BIT_MASK(64); + break; +#endif + } + mmio_base = b43_dmacontroller_base(0, 0); b43_write32(dev, mmio_base + B43_DMA32_TXCTL, B43_DMA32_TXADDREXT_MASK); tmp = b43_read32(dev, mmio_base + B43_DMA32_TXCTL); |