aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
diff options
context:
space:
mode:
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.patch256
1 files changed, 0 insertions, 256 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
deleted file mode 100644
index 5ec2f4b2d4..0000000000
--- a/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From 4f214b1ead0af7439921637645cb63f378516175 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Sat, 21 Jan 2012 18:48:38 +0100
-Subject: [PATCH 33/34] b43: add workaround for b43 on pcie bus of bcm4716.
-
-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.
-This code is based on the brcmsmac driver.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- drivers/net/wireless/b43/b43.h | 26 ++++++++++++++++++++++++++
- drivers/net/wireless/b43/bus.h | 10 ++++++++++
- drivers/net/wireless/b43/phy_common.c | 6 ++++++
- drivers/net/wireless/b43/phy_n.c | 10 +++++-----
- 4 files changed, 47 insertions(+), 5 deletions(-)
-
---- a/drivers/net/wireless/b43/b43.h
-+++ b/drivers/net/wireless/b43/b43.h
-@@ -1054,6 +1054,15 @@ static inline bool b43_using_pio_transfe
- return dev->__using_pio_transfers;
- }
-
-+#ifdef CONFIG_BCM47XX_BCMA
-+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)
-+{
-+ b43_write16(dev, offset, value);
-+}
-+#endif
-+
- /* Message printing */
- __printf(2, 3) void b43info(struct b43_wl *wl, const char *fmt, ...);
- __printf(2, 3) void b43err(struct b43_wl *wl, const char *fmt, ...);
---- a/drivers/net/wireless/b43/bus.h
-+++ b/drivers/net/wireless/b43/bus.h
-@@ -70,6 +70,18 @@ static inline bool b43_bus_host_is_sdio(
- return false;
- #endif
- }
-+static inline bool b43_bus_host_is_pci(struct b43_bus_dev *dev)
-+{
-+#ifdef CPTCFG_B43_BCMA
-+ if (dev->bus_type == B43_BUS_BCMA)
-+ return (dev->bdev->bus->hosttype == BCMA_HOSTTYPE_PCI);
-+#endif
-+#ifdef CPTCFG_B43_SSB
-+ if (dev->bus_type == B43_BUS_SSB)
-+ return (dev->sdev->bus->bustype == SSB_BUSTYPE_PCI);
-+#endif
-+ return false;
-+}
-
- struct b43_bus_dev *b43_bus_dev_bcma_init(struct bcma_device *core);
- 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
-@@ -4481,7 +4481,7 @@ static int b43_phy_versioning(struct b43
- u16 radio24[3];
-
- for (tmp = 0; tmp < 3; tmp++) {
-- b43_write16(dev, B43_MMIO_RADIO24_CONTROL, tmp);
-+ b43_wflush16(dev, B43_MMIO_RADIO24_CONTROL, tmp);
- radio24[tmp] = b43_read16(dev, B43_MMIO_RADIO24_DATA);
- }
-
-@@ -4498,10 +4498,10 @@ static int b43_phy_versioning(struct b43
- else
- tmp = 0x5205017F;
- } else {
-- b43_write16(dev, B43_MMIO_RADIO_CONTROL,
-+ b43_wflush16(dev, B43_MMIO_RADIO_CONTROL,
- B43_RADIOCTL_ID);
- tmp = b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);
-- b43_write16(dev, B43_MMIO_RADIO_CONTROL,
-+ b43_wflush16(dev, B43_MMIO_RADIO_CONTROL,
- 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
- {
- assert_mac_suspended(dev);
- dev->phy.ops->phy_write(dev, reg, value);
-+#ifdef CONFIG_BCM47XX
-+ if (b43_bus_host_is_pci(dev->dev) && reg == 0x72) {
-+ b43_read16(dev, B43_MMIO_PHY_VER);
-+ return;
-+ }
-+#endif
- if (++dev->phy.writes_counter == B43_MAX_WRITES_IN_ROW) {
- b43_read16(dev, B43_MMIO_PHY_VER);
- dev->phy.writes_counter = 0;
---- a/drivers/net/wireless/b43/phy_ht.c
-+++ b/drivers/net/wireless/b43/phy_ht.c
-@@ -1073,20 +1073,20 @@ static unsigned int b43_phy_ht_op_get_de
-
- static u16 b43_phy_ht_op_read(struct b43_wldev *dev, u16 reg)
- {
-- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
-+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
- return b43_read16(dev, B43_MMIO_PHY_DATA);
- }
-
- static void b43_phy_ht_op_write(struct b43_wldev *dev, u16 reg, u16 value)
- {
-- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
-+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
- b43_write16(dev, B43_MMIO_PHY_DATA, value);
- }
-
- static void b43_phy_ht_op_maskset(struct b43_wldev *dev, u16 reg, u16 mask,
- u16 set)
- {
-- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
-+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
- b43_write16(dev, B43_MMIO_PHY_DATA,
- (b43_read16(dev, B43_MMIO_PHY_DATA) & mask) | set);
- }
-@@ -1096,14 +1096,14 @@ static u16 b43_phy_ht_op_radio_read(stru
- /* HT-PHY needs 0x200 for read access */
- reg |= 0x200;
-
-- b43_write16(dev, B43_MMIO_RADIO24_CONTROL, reg);
-+ b43_wflush16(dev, B43_MMIO_RADIO24_CONTROL, reg);
- return b43_read16(dev, B43_MMIO_RADIO24_DATA);
- }
-
- static void b43_phy_ht_op_radio_write(struct b43_wldev *dev, u16 reg,
- u16 value)
- {
-- b43_write16(dev, B43_MMIO_RADIO24_CONTROL, reg);
-+ b43_wflush16(dev, B43_MMIO_RADIO24_CONTROL, reg);
- b43_write16(dev, B43_MMIO_RADIO24_DATA, value);
- }
-
---- a/drivers/net/wireless/b43/phy_lcn.c
-+++ b/drivers/net/wireless/b43/phy_lcn.c
-@@ -812,20 +812,20 @@ static void b43_phy_lcn_op_adjust_txpowe
-
- static u16 b43_phy_lcn_op_read(struct b43_wldev *dev, u16 reg)
- {
-- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
-+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
- return b43_read16(dev, B43_MMIO_PHY_DATA);
- }
-
- static void b43_phy_lcn_op_write(struct b43_wldev *dev, u16 reg, u16 value)
- {
-- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
-+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
- b43_write16(dev, B43_MMIO_PHY_DATA, value);
- }
-
- static void b43_phy_lcn_op_maskset(struct b43_wldev *dev, u16 reg, u16 mask,
- u16 set)
- {
-- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
-+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
- b43_write16(dev, B43_MMIO_PHY_DATA,
- (b43_read16(dev, B43_MMIO_PHY_DATA) & mask) | set);
- }
-@@ -835,14 +835,14 @@ static u16 b43_phy_lcn_op_radio_read(str
- /* LCN-PHY needs 0x200 for read access */
- reg |= 0x200;
-
-- b43_write16(dev, B43_MMIO_RADIO24_CONTROL, reg);
-+ b43_wflush16(dev, B43_MMIO_RADIO24_CONTROL, reg);
- return b43_read16(dev, B43_MMIO_RADIO24_DATA);
- }
-
- static void b43_phy_lcn_op_radio_write(struct b43_wldev *dev, u16 reg,
- u16 value)
- {
-- b43_write16(dev, B43_MMIO_RADIO24_CONTROL, reg);
-+ b43_wflush16(dev, B43_MMIO_RADIO24_CONTROL, reg);
- b43_write16(dev, B43_MMIO_RADIO24_DATA, value);
- }
-
---- a/drivers/net/wireless/b43/phy_n.c
-+++ b/drivers/net/wireless/b43/phy_n.c
-@@ -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);
-- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
-+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
- return b43_read16(dev, B43_MMIO_PHY_DATA);
- }
-
- static void b43_nphy_op_write(struct b43_wldev *dev, u16 reg, u16 value)
- {
- check_phyreg(dev, reg);
-- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
-+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
- b43_write16(dev, B43_MMIO_PHY_DATA, value);
- }
-
-@@ -6515,7 +6515,7 @@ static void b43_nphy_op_maskset(struct b
- u16 set)
- {
- check_phyreg(dev, reg);
-- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
-+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
- b43_maskset16(dev, B43_MMIO_PHY_DATA, mask, set);
- }
-
-@@ -6529,7 +6529,7 @@ static u16 b43_nphy_op_radio_read(struct
- else
- reg |= 0x100;
-
-- b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg);
-+ b43_wflush16(dev, B43_MMIO_RADIO_CONTROL, reg);
- return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);
- }
-
-@@ -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);
-
-- b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg);
-+ b43_wflush16(dev, B43_MMIO_RADIO_CONTROL, reg);
- b43_write16(dev, B43_MMIO_RADIO_DATA_LOW, value);
- }
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 03:55:09 +0000