aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-07-30 21:15:42 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-07-30 21:15:42 +0000
commit83c803086c686aa73663f6c6391a7c2c916d1dd1 (patch)
treea101ba03c9cc6accf2167ea1861f18984d1954e6 /package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
parentb1df24f00eef530cfa587c49907cb70de7cb5517 (diff)
downloadupstream-83c803086c686aa73663f6c6391a7c2c916d1dd1.tar.gz
upstream-83c803086c686aa73663f6c6391a7c2c916d1dd1.tar.bz2
upstream-83c803086c686aa73663f6c6391a7c2c916d1dd1.zip
mac80211: b43: update b43 to version master-2014-07-29-1
This add 5GHz support for N-PHY to b43, thanks Rafał Miłecki. b43_wflush16 was put into an extra function because it is pretty big in asm. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 41900
Diffstat (limited to 'package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch')
-rw-r--r--package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch59
1 files changed, 35 insertions, 24 deletions
diff --git a/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch b/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
index 5c50bbc62d..5ec2f4b2d4 100644
--- a/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
+++ b/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
@@ -19,28 +19,12 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
-@@ -1054,6 +1054,31 @@ static inline bool b43_using_pio_transfe
+@@ -1054,6 +1054,15 @@ static inline bool b43_using_pio_transfe
return dev->__using_pio_transfers;
}
-+/*
-+ * bcm4716 (which includes 4717 & 4718), plus 4706 on PCIe can reorder
-+ * transactions. As a fix, a read after write is performed on certain places
-+ * in the code. Older chips and the newer 5357 family don't require this fix.
-+ */
+#ifdef CONFIG_BCM47XX_BCMA
-+#include <asm/mach-bcm47xx/bcm47xx.h>
-+static inline void b43_wflush16(struct b43_wldev *dev, u16 offset, u16 value)
-+{
-+ if (b43_bus_host_is_pci(dev->dev) &&
-+ bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA &&
-+ bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4716) {
-+ b43_write16(dev, offset, value);
-+ b43_read16(dev, offset);
-+ } else {
-+ b43_write16(dev, offset, value);
-+ }
-+}
++void b43_wflush16(struct b43_wldev *dev, u16 offset, u16 value);
+#else
+static inline void b43_wflush16(struct b43_wldev *dev, u16 offset, u16 value)
+{
@@ -74,7 +58,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev);
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
-@@ -4464,7 +4464,7 @@ static int b43_phy_versioning(struct b43
+@@ -4481,7 +4481,7 @@ static int b43_phy_versioning(struct b43
u16 radio24[3];
for (tmp = 0; tmp < 3; tmp++) {
@@ -83,7 +67,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
radio24[tmp] = b43_read16(dev, B43_MMIO_RADIO24_DATA);
}
-@@ -4481,10 +4481,10 @@ static int b43_phy_versioning(struct b43
+@@ -4498,10 +4498,10 @@ static int b43_phy_versioning(struct b43
else
tmp = 0x5205017F;
} else {
@@ -96,6 +80,33 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
B43_RADIOCTL_ID);
tmp |= (u32)b43_read16(dev, B43_MMIO_RADIO_DATA_HIGH)
<< 16;
+@@ -4576,6 +4576,26 @@ static int b43_phy_versioning(struct b43
+ return 0;
+ }
+
++/*
++ * bcm4716 (which includes 4717 & 4718), plus 4706 on PCIe can reorder
++ * transactions. As a fix, a read after write is performed on certain places
++ * in the code. Older chips and the newer 5357 family don't require this fix.
++ */
++#ifdef CONFIG_BCM47XX_BCMA
++#include <asm/mach-bcm47xx/bcm47xx.h>
++void b43_wflush16(struct b43_wldev *dev, u16 offset, u16 value)
++{
++ if (b43_bus_host_is_pci(dev->dev) &&
++ bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA &&
++ bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4716) {
++ b43_write16(dev, offset, value);
++ b43_read16(dev, offset);
++ } else {
++ b43_write16(dev, offset, value);
++ }
++}
++#endif
++
+ static void setup_struct_phy_for_init(struct b43_wldev *dev,
+ struct b43_phy *phy)
+ {
--- a/drivers/net/wireless/b43/phy_common.c
+++ b/drivers/net/wireless/b43/phy_common.c
@@ -275,6 +275,12 @@ void b43_phy_write(struct b43_wldev *dev
@@ -199,7 +210,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
-@@ -6494,14 +6494,14 @@ static inline void check_phyreg(struct b
+@@ -6500,14 +6500,14 @@ static inline void check_phyreg(struct b
static u16 b43_nphy_op_read(struct b43_wldev *dev, u16 reg)
{
check_phyreg(dev, reg);
@@ -216,7 +227,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
b43_write16(dev, B43_MMIO_PHY_DATA, value);
}
-@@ -6509,7 +6509,7 @@ static void b43_nphy_op_maskset(struct b
+@@ -6515,7 +6515,7 @@ static void b43_nphy_op_maskset(struct b
u16 set)
{
check_phyreg(dev, reg);
@@ -225,7 +236,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
b43_maskset16(dev, B43_MMIO_PHY_DATA, mask, set);
}
-@@ -6523,7 +6523,7 @@ static u16 b43_nphy_op_radio_read(struct
+@@ -6529,7 +6529,7 @@ static u16 b43_nphy_op_radio_read(struct
else
reg |= 0x100;
@@ -234,7 +245,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);
}
-@@ -6532,7 +6532,7 @@ static void b43_nphy_op_radio_write(stru
+@@ -6538,7 +6538,7 @@ static void b43_nphy_op_radio_write(stru
/* Register 1 is a 32-bit register. */
B43_WARN_ON(dev->phy.rev < 7 && reg == 1);