mca80211: add support for b43 on bcma bus.
This makes b43 work on broadcom SoCs using bcma as system bus. SVN-Revision: 27734v19.07.3_mercusys_ac12_duma
Hauke Mehrtens
13 years ago
parent
49f4d4217e
commit
96b6f27271
@ -0,0 +1,11 @@
|
||||
--- a/drivers/net/wireless/b43/main.c~ 2011-07-23 00:33:46.573306410 +0200
|
||||
+++ b/drivers/net/wireless/b43/main.c 2011-07-23 00:36:14.657726075 +0200
|
||||
@@ -4955,7 +4955,7 @@
|
||||
static void b43_wireless_core_detach(struct b43_wldev *dev)
|
||||
{
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
|
||||
- if (dev->sdev->bus->bustype != SSB_BUSTYPE_SDIO)
|
||||
+ if (dev->dev->sdev->bus->bustype != SSB_BUSTYPE_SDIO)
|
||||
compat_destroy_threaded_irq(&dev->irq_compat);
|
||||
#endif
|
||||
/* We release firmware that late to not be required to re-request
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,40 @@
|
||||
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);
|
||||
@ -0,0 +1,26 @@
|
||||
Fixes bug described in:
|
||||
https://bugzilla.kernel.org/show_bug.cgi?id=39172
|
||||
|
||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
---
|
||||
John: this is trivial and fixes quite ugly memory (linked list exactly)
|
||||
corruption. I believe this fix should be taken for 3.1.
|
||||
---
|
||||
drivers/net/wireless/b43/bus.c | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
--- a/drivers/net/wireless/b43/bus.c
|
||||
+++ b/drivers/net/wireless/b43/bus.c
|
||||
@@ -244,10 +244,12 @@ void b43_bus_set_wldev(struct b43_bus_de
|
||||
#ifdef CONFIG_B43_BCMA
|
||||
case B43_BUS_BCMA:
|
||||
bcma_set_drvdata(dev->bdev, wldev);
|
||||
+ break;
|
||||
#endif
|
||||
#ifdef CONFIG_B43_SSB
|
||||
case B43_BUS_SSB:
|
||||
ssb_set_drvdata(dev->sdev, wldev);
|
||||
+ break;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
From 46c79b0cdc60a974da409d641a69086694046ea0 Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Fri, 22 Jul 2011 17:47:46 +0200
|
||||
Subject: [PATCH 23/23] b43: add core rev 17 used on bcma SoC
|
||||
|
||||
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
drivers/net/wireless/b43/main.c | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
|
||||
--- a/drivers/net/wireless/b43/main.c
|
||||
+++ b/drivers/net/wireless/b43/main.c
|
||||
@@ -120,6 +120,7 @@ MODULE_PARM_DESC(pio, "Use PIO accesses
|
||||
|
||||
#ifdef CONFIG_B43_BCMA
|
||||
static const struct bcma_device_id b43_bcma_tbl[] = {
|
||||
+ BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x11, BCMA_ANY_CLASS),
|
||||
BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x17, BCMA_ANY_CLASS),
|
||||
BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x18, BCMA_ANY_CLASS),
|
||||
BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x1D, BCMA_ANY_CLASS),
|
||||
Loading…
Reference in New Issue