[PATCH] Update mac80211 and make b43 driver build and load on targets other than brcm47xx (#4266)

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13431 3c298f89-4303-0410-b956-a3cf2f4a3e73

3 files changed, 336 insertions, 14 deletions

diff --git a/package/mac80211/patches-old/001-disable_drivers.patch b/package/mac80211/patches-old/001-disable_drivers.patch
index 49bc193f59..72c72cd2fa 100644
--- a/package/mac80211/patches-old/001-disable_drivers.patch
+++ b/package/mac80211/patches-old/001-disable_drivers.patch
@@ -1,7 +1,6 @@
-diff -urN compat-wireless-2008-08-06/config.mk compat-wireless-2008-08-06.new/config.mk
 --- compat-wireless-2008-08-06/config.mk	2008-07-18 06:11:03.000000000 +0200
-+++ compat-wireless-2008-08-06.new/config.mk	2008-11-15 00:21:17.000000000 +0100
-@@ -72,70 +72,8 @@
++++ compat-wireless-2008-08-06.new/config.mk	2008-11-28 21:10:31.000000000 +0100
+@@ -72,70 +72,34 @@
  CONFIG_ATH5K=m
  CONFIG_ATH5K_DEBUG=n
  
@@ -13,25 +12,40 @@ diff -urN compat-wireless-2008-08-06/config.mk compat-wireless-2008-08-06.new/co
 -CONFIG_IWL4965=m
 -CONFIG_IWL4965_HT=y
 -CONFIG_B43=m
--# B43 uses PCMCIA only for Compact Flash. The Cardbus cards uses PCI
--# Example, bcm4318:
--# http://www.multicap.biz/wireless-lan/indoor-wlan-hardware/sdc-cf10g-80211g-compact-flash-module
++# CONFIG_B43=m
++CONFIG_B43_NPHY=y
+ # B43 uses PCMCIA only for Compact Flash. The Cardbus cards uses PCI
+ # Example, bcm4318:
+ # http://www.multicap.biz/wireless-lan/indoor-wlan-hardware/sdc-cf10g-80211g-compact-flash-module
 -CONFIG_B43_PCMCIA=y
--CONFIG_B43_DMA=y
++# CONFIG_B43_PCMCIA=y
+ CONFIG_B43_DMA=y
 -CONFIG_B43_PIO=y
--# B43_PIO selects SSB_BLOCKIO
++# CONFIG_B43_PIO=y
+ # B43_PIO selects SSB_BLOCKIO
 -CONFIG_SSB_BLOCKIO=y
 -CONFIG_B43_DMA_AND_PIO_MODE=y
 -CONFIG_B43_PCI_AUTOSELECT=y
 -CONFIG_B43_PCICORE_AUTOSELECT=y
 -#CONFIG_B43_RFKILL=n
 -CONFIG_B43_LEDS=y
--# CONFIG_B43_DEBUG is not set
--
++# CONFIG_SSB_BLOCKIO=y
++# CONFIG_B43_DMA_AND_PIO_MODE=y
++# CONFIG_B43_PCI_AUTOSELECT=y
++# CONFIG_B43_PCICORE_AUTOSELECT=y
++# CONFIG_B43_RFKILL=y
++# CONFIG_B43_LEDS=y
+ # CONFIG_B43_DEBUG is not set
+ 
 -CONFIG_B43LEGACY=m
 -CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
--CONFIG_B43LEGACY_DMA=y
++# CONFIG_B43LEGACY=m
++# CONFIG_B43LEGACY_RFKILL=y
++# CONFIG_B43LEGACY_LEDS=y
++# CONFIG_B43LEGACY_PCI_AUTOSELECT=y
++# CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+ CONFIG_B43LEGACY_DMA=y
 -CONFIG_B43LEGACY_PIO=y
 -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 -
@@ -57,7 +71,9 @@ diff -urN compat-wireless-2008-08-06/config.mk compat-wireless-2008-08-06.new/co
 -CONFIG_IPW2200_QOS=y
 -
 -NEED_IEEE80211=y
--
++# CONFIG_B43LEGACY_PIO=y
++# CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+ 
  CONFIG_P54_PCI=m
  
 -CONFIG_SSB_PCIHOST_POSSIBLE=y
@@ -72,7 +88,7 @@ diff -urN compat-wireless-2008-08-06/config.mk compat-wireless-2008-08-06.new/co
  CONFIG_RT2X00_LIB_PCI=m
  CONFIG_RT2400PCI=m
  CONFIG_RT2500PCI=m
-@@ -159,31 +97,7 @@
+@@ -159,31 +123,7 @@
  ifneq ($(CONFIG_USB),)
  CONFIG_ZD1211RW=m
  
@@ -104,7 +120,7 @@ diff -urN compat-wireless-2008-08-06/config.mk compat-wireless-2008-08-06.new/co
  
  # RT2500USB does not require firmware
  CONFIG_RT2500USB=m
-@@ -212,36 +126,6 @@
+@@ -212,36 +152,6 @@
  # p54
  CONFIG_P54_COMMON=m
  
diff --git a/package/mac80211/patches-old/002-ssb-backport.patch b/package/mac80211/patches-old/002-ssb-backport.patch
new file mode 100644
index 0000000000..a57143ae1d
--- /dev/null
+++ b/package/mac80211/patches-old/002-ssb-backport.patch
@@ -0,0 +1,296 @@
+This patch backports the interface of the b43 and b43legacy driver from 
+the new to the old ssb API. This patch is needed as long the old ssb
+version is used in the kernel for broadcom devices. After upgrading to
+ssb version out of kernel 2.6.27 or later this patch is not needed any more.
+
+diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
+index 098f886..8a09a1d 100644
+--- a/drivers/net/wireless/b43/dma.c
++++ b/drivers/net/wireless/b43/dma.c
+@@ -328,11 +328,11 @@ static inline
+ 	dma_addr_t dmaaddr;
+ 
+ 	if (tx) {
+-		dmaaddr = ssb_dma_map_single(ring->dev->dev,
+-					     buf, len, DMA_TO_DEVICE);
++		dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
++					 buf, len, DMA_TO_DEVICE);
+ 	} else {
+-		dmaaddr = ssb_dma_map_single(ring->dev->dev,
+-					     buf, len, DMA_FROM_DEVICE);
++		dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
++					 buf, len, DMA_FROM_DEVICE);
+ 	}
+ 
+ 	return dmaaddr;
+@@ -343,11 +343,11 @@ static inline
+ 			  dma_addr_t addr, size_t len, int tx)
+ {
+ 	if (tx) {
+-		ssb_dma_unmap_single(ring->dev->dev,
+-				     addr, len, DMA_TO_DEVICE);
++		dma_unmap_single(ring->dev->dev->dma_dev,
++				 addr, len, DMA_TO_DEVICE);
+ 	} else {
+-		ssb_dma_unmap_single(ring->dev->dev,
+-				     addr, len, DMA_FROM_DEVICE);
++		dma_unmap_single(ring->dev->dev->dma_dev,
++				 addr, len, DMA_FROM_DEVICE);
+ 	}
+ }
+ 
+@@ -356,8 +356,8 @@ static inline
+ 				 dma_addr_t addr, size_t len)
+ {
+ 	B43_WARN_ON(ring->tx);
+-	ssb_dma_sync_single_for_cpu(ring->dev->dev,
+-				    addr, len, DMA_FROM_DEVICE);
++	dma_sync_single_for_cpu(ring->dev->dev->dma_dev,
++				addr, len, DMA_FROM_DEVICE);
+ }
+ 
+ static inline
+@@ -365,8 +365,8 @@ static inline
+ 				    dma_addr_t addr, size_t len)
+ {
+ 	B43_WARN_ON(ring->tx);
+-	ssb_dma_sync_single_for_device(ring->dev->dev,
+-				       addr, len, DMA_FROM_DEVICE);
++	dma_sync_single_for_device(ring->dev->dev->dma_dev,
++				   addr, len, DMA_FROM_DEVICE);
+ }
+ 
+ static inline
+@@ -381,6 +381,7 @@ static inline
+ 
+ static int alloc_ringmemory(struct b43_dmaring *ring)
+ {
++	struct device *dma_dev = ring->dev->dev->dma_dev;
+ 	gfp_t flags = GFP_KERNEL;
+ 
+ 	/* The specs call for 4K buffers for 30- and 32-bit DMA with 4K
+@@ -391,14 +392,11 @@ static int alloc_ringmemory(struct b43_dmaring *ring)
+ 	 * For unknown reasons - possibly a hardware error - the BCM4311 rev
+ 	 * 02, which uses 64-bit DMA, needs the ring buffer in very low memory,
+ 	 * which accounts for the GFP_DMA flag below.
+-	 *
+-	 * The flags here must match the flags in free_ringmemory below!
+ 	 */
+ 	if (ring->type == B43_DMA_64BIT)
+ 		flags |= GFP_DMA;
+-	ring->descbase = ssb_dma_alloc_consistent(ring->dev->dev,
+-						  B43_DMA_RINGMEMSIZE,
+-						  &(ring->dmabase), flags);
++	ring->descbase = dma_alloc_coherent(dma_dev, B43_DMA_RINGMEMSIZE,
++					    &(ring->dmabase), flags);
+ 	if (!ring->descbase) {
+ 		b43err(ring->dev->wl, "DMA ringmemory allocation failed\n");
+ 		return -ENOMEM;
+@@ -410,13 +408,10 @@ static int alloc_ringmemory(struct b43_dmaring *ring)
+ 
+ static void free_ringmemory(struct b43_dmaring *ring)
+ {
+-	gfp_t flags = GFP_KERNEL;
+-
+-	if (ring->type == B43_DMA_64BIT)
+-		flags |= GFP_DMA;
++	struct device *dma_dev = ring->dev->dev->dma_dev;
+ 
+-	ssb_dma_free_consistent(ring->dev->dev, B43_DMA_RINGMEMSIZE,
+-				ring->descbase, ring->dmabase, flags);
++	dma_free_coherent(dma_dev, B43_DMA_RINGMEMSIZE,
++			  ring->descbase, ring->dmabase);
+ }
+ 
+ /* Reset the RX DMA channel */
+@@ -523,7 +518,7 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring,
+ 				  dma_addr_t addr,
+ 				  size_t buffersize, bool dma_to_device)
+ {
+-	if (unlikely(ssb_dma_mapping_error(ring->dev->dev, addr)))
++	if (unlikely(dma_mapping_error(addr)))
+ 		return 1;
+ 
+ 	switch (ring->type) {
+@@ -849,10 +844,10 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
+ 			goto err_kfree_meta;
+ 
+ 		/* test for ability to dma to txhdr_cache */
+-		dma_test = ssb_dma_map_single(dev->dev,
+-					      ring->txhdr_cache,
+-					      b43_txhdr_size(dev),
+-					      DMA_TO_DEVICE);
++		dma_test = dma_map_single(dev->dev->dma_dev,
++					  ring->txhdr_cache,
++					  b43_txhdr_size(dev),
++					  DMA_TO_DEVICE);
+ 
+ 		if (b43_dma_mapping_error(ring, dma_test,
+ 					  b43_txhdr_size(dev), 1)) {
+@@ -864,10 +859,10 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
+ 			if (!ring->txhdr_cache)
+ 				goto err_kfree_meta;
+ 
+-			dma_test = ssb_dma_map_single(dev->dev,
+-						      ring->txhdr_cache,
+-						      b43_txhdr_size(dev),
+-						      DMA_TO_DEVICE);
++			dma_test = dma_map_single(dev->dev->dma_dev,
++						  ring->txhdr_cache,
++						  b43_txhdr_size(dev),
++						  DMA_TO_DEVICE);
+ 
+ 			if (b43_dma_mapping_error(ring, dma_test,
+ 						  b43_txhdr_size(dev), 1)) {
+@@ -878,9 +873,9 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
+ 			}
+ 		}
+ 
+-		ssb_dma_unmap_single(dev->dev,
+-				     dma_test, b43_txhdr_size(dev),
+-				     DMA_TO_DEVICE);
++		dma_unmap_single(dev->dev->dma_dev,
++				 dma_test, b43_txhdr_size(dev),
++				 DMA_TO_DEVICE);
+ 	}
+ 
+ 	err = alloc_ringmemory(ring);
+diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
+index fb6819e..87b1049 100644
+--- a/drivers/net/wireless/b43legacy/dma.c
++++ b/drivers/net/wireless/b43legacy/dma.c
+@@ -393,13 +393,13 @@ dma_addr_t map_descbuffer(struct b43legacy_dmaring *ring,
+ 	dma_addr_t dmaaddr;
+ 
+ 	if (tx)
+-		dmaaddr = ssb_dma_map_single(ring->dev->dev,
+-					     buf, len,
+-					     DMA_TO_DEVICE);
++		dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
++					 buf, len,
++					 DMA_TO_DEVICE);
+ 	else
+-		dmaaddr = ssb_dma_map_single(ring->dev->dev,
+-					     buf, len,
+-					     DMA_FROM_DEVICE);
++		dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
++					 buf, len,
++					 DMA_FROM_DEVICE);
+ 
+ 	return dmaaddr;
+ }
+@@ -411,13 +411,13 @@ void unmap_descbuffer(struct b43legacy_dmaring *ring,
+ 		      int tx)
+ {
+ 	if (tx)
+-		ssb_dma_unmap_single(ring->dev->dev,
+-				     addr, len,
+-				     DMA_TO_DEVICE);
++		dma_unmap_single(ring->dev->dev->dma_dev,
++				 addr, len,
++				 DMA_TO_DEVICE);
+ 	else
+-		ssb_dma_unmap_single(ring->dev->dev,
+-				     addr, len,
+-				     DMA_FROM_DEVICE);
++		dma_unmap_single(ring->dev->dev->dma_dev,
++				 addr, len,
++				 DMA_FROM_DEVICE);
+ }
+ 
+ static inline
+@@ -427,8 +427,8 @@ void sync_descbuffer_for_cpu(struct b43legacy_dmaring *ring,
+ {
+ 	B43legacy_WARN_ON(ring->tx);
+ 
+-	ssb_dma_sync_single_for_cpu(ring->dev->dev,
+-				    addr, len, DMA_FROM_DEVICE);
++	dma_sync_single_for_cpu(ring->dev->dev->dma_dev,
++				addr, len, DMA_FROM_DEVICE);
+ }
+ 
+ static inline
+@@ -438,8 +438,8 @@ void sync_descbuffer_for_device(struct b43legacy_dmaring *ring,
+ {
+ 	B43legacy_WARN_ON(ring->tx);
+ 
+-	ssb_dma_sync_single_for_device(ring->dev->dev,
+-				       addr, len, DMA_FROM_DEVICE);
++	dma_sync_single_for_device(ring->dev->dev->dma_dev,
++				   addr, len, DMA_FROM_DEVICE);
+ }
+ 
+ static inline
+@@ -458,11 +458,10 @@ void free_descriptor_buffer(struct b43legacy_dmaring *ring,
+ 
+ static int alloc_ringmemory(struct b43legacy_dmaring *ring)
+ {
+-	/* GFP flags must match the flags in free_ringmemory()! */
+-	ring->descbase = ssb_dma_alloc_consistent(ring->dev->dev,
+-						  B43legacy_DMA_RINGMEMSIZE,
+-						  &(ring->dmabase),
+-						  GFP_KERNEL);
++	struct device *dma_dev = ring->dev->dev->dma_dev;
++
++	ring->descbase = dma_alloc_coherent(dma_dev, B43legacy_DMA_RINGMEMSIZE,
++					    &(ring->dmabase), GFP_KERNEL);
+ 	if (!ring->descbase) {
+ 		b43legacyerr(ring->dev->wl, "DMA ringmemory allocation"
+ 			     " failed\n");
+@@ -475,8 +474,10 @@ static int alloc_ringmemory(struct b43legacy_dmaring *ring)
+ 
+ static void free_ringmemory(struct b43legacy_dmaring *ring)
+ {
+-	ssb_dma_free_consistent(ring->dev->dev, B43legacy_DMA_RINGMEMSIZE,
+-				ring->descbase, ring->dmabase, GFP_KERNEL);
++	struct device *dma_dev = ring->dev->dev->dma_dev;
++
++	dma_free_coherent(dma_dev, B43legacy_DMA_RINGMEMSIZE,
++			  ring->descbase, ring->dmabase);
+ }
+ 
+ /* Reset the RX DMA channel */
+@@ -588,7 +589,7 @@ static bool b43legacy_dma_mapping_error(struct b43legacy_dmaring *ring,
+ 					 size_t buffersize,
+ 					 bool dma_to_device)
+ {
+-	if (unlikely(ssb_dma_mapping_error(ring->dev->dev, addr)))
++	if (unlikely(dma_mapping_error(addr)))
+ 		return 1;
+ 
+ 	switch (ring->type) {
+@@ -905,9 +906,9 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev,
+ 			goto err_kfree_meta;
+ 
+ 		/* test for ability to dma to txhdr_cache */
+-		dma_test = ssb_dma_map_single(dev->dev, ring->txhdr_cache,
+-					      sizeof(struct b43legacy_txhdr_fw3),
+-					      DMA_TO_DEVICE);
++		dma_test = dma_map_single(dev->dev->dma_dev, ring->txhdr_cache,
++					  sizeof(struct b43legacy_txhdr_fw3),
++					  DMA_TO_DEVICE);
+ 
+ 		if (b43legacy_dma_mapping_error(ring, dma_test,
+ 					sizeof(struct b43legacy_txhdr_fw3), 1)) {
+@@ -919,7 +920,7 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev,
+ 			if (!ring->txhdr_cache)
+ 				goto err_kfree_meta;
+ 
+-				dma_test = ssb_dma_map_single(dev->dev,
++			dma_test = dma_map_single(dev->dev->dma_dev,
+ 					ring->txhdr_cache,
+ 					sizeof(struct b43legacy_txhdr_fw3),
+ 					DMA_TO_DEVICE);
+@@ -929,9 +930,9 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev,
+ 				goto err_kfree_txhdr_cache;
+ 		}
+ 
+-		ssb_dma_unmap_single(dev->dev, dma_test,
+-				     sizeof(struct b43legacy_txhdr_fw3),
+-				     DMA_TO_DEVICE);
++		dma_unmap_single(dev->dev->dma_dev,
++				 dma_test, sizeof(struct b43legacy_txhdr_fw3),
++				 DMA_TO_DEVICE);
+ 	}
+ 
+ 	ring->nr_slots = nr_slots;
diff --git a/package/mac80211/patches-old/005-disable_ssb_build.patch b/package/mac80211/patches-old/005-disable_ssb_build.patch
new file mode 100644
index 0000000000..8a9a06b9d5
--- /dev/null
+++ b/package/mac80211/patches-old/005-disable_ssb_build.patch
@@ -0,0 +1,10 @@
+--- a/Makefile	2008-07-18 06:11:03.000000000 +0200
++++ b/Makefile	2008-11-28 19:31:58.000000000 +0100
+@@ -19,7 +19,6 @@
+ obj-y := net/wireless/ net/mac80211/
+ ifeq ($(ONLY_CORE),)
+ obj-y += net/ieee80211/ \
+-	drivers/ssb/ \
+ 	drivers/misc/ \
+ 	drivers/net/usb/ \
+ 	drivers/net/wireless/