You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From f706821596d8a3dcda314c38b13d91f108fdc435 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Fri, 22 Jul 2011 17:10:29 +0200
|
|
Subject: [PATCH 21/22] b43: read correct register on bcma bus.
|
|
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
---
|
|
drivers/net/wireless/b43/dma.c | 20 +++++++++++++++++---
|
|
1 files changed, 17 insertions(+), 3 deletions(-)
|
|
|
|
--- 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
|
|
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);
|