ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-08 03:50:48 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

mac80211: b43: update b43 to version master-2014-07-29-1

Browse Source 
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
This commit is contained in:
Hauke Mehrtens 2014-07-30 21:15:42 +00:00
parent b1df24f00e
commit 83c803086c
7 changed files with 283 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

355
package/kernel/mac80211/patches/800-b43-backports-form-wireless-testing-master-master-20.patch
View File

File diff suppressed because it is too large Load Diff

12
package/kernel/mac80211/patches/801-fix-5ghz.patch Normal file
View File

@ -0,0 +1,12 @@
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -6217,6 +6217,9 @@ static void b43_nphy_channel_setup(struc
u16 tmp16;
if (new_channel->band == IEEE80211_BAND_5GHZ) {
+ /* Switch to 2 GHz for a moment to access B43_PHY_B_BBCFG */
+ b43_phy_mask(dev, B43_NPHY_BANDCTL, ~B43_NPHY_BANDCTL_5GHZ);
+
tmp16 = b43_read16(dev, B43_MMIO_PSM_PHY_HDR);
b43_write16(dev, B43_MMIO_PSM_PHY_HDR, tmp16 | 4);
/* Put BPHY in the reset */

2
package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch
View File

@ -22,7 +22,7 @@
static int modparam_bad_frames_preempt; static int modparam_bad_frames_preempt;
module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444); module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);
MODULE_PARM_DESC(bad_frames_preempt, MODULE_PARM_DESC(bad_frames_preempt,
@@ -2798,10 +2803,10 @@ static int b43_gpio_init(struct b43_wlde @@ -2814,10 +2819,10 @@ static int b43_gpio_init(struct b43_wlde
u32 mask, set; u32 mask, set;
b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0); b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);

2
package/kernel/mac80211/patches/810-b43_no_pio.patch
View File

@ -11,7 +11,7 @@
b43-$(CPTCFG_B43_PCMCIA) += pcmcia.o b43-$(CPTCFG_B43_PCMCIA) += pcmcia.o
--- a/drivers/net/wireless/b43/main.c --- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c
@@ -1924,10 +1924,12 @@ static void b43_do_interrupt_thread(stru @@ -1940,10 +1940,12 @@ static void b43_do_interrupt_thread(stru
dma_reason[0], dma_reason[1], dma_reason[0], dma_reason[1],
dma_reason[2], dma_reason[3], dma_reason[2], dma_reason[3],
dma_reason[4], dma_reason[5]); dma_reason[4], dma_reason[5]);

16
package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/b43/main.c --- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c
@@ -1571,7 +1571,7 @@ static void b43_write_beacon_template(st @@ -1587,7 +1587,7 @@ static void b43_write_beacon_template(st
len, ram_offset, shm_size_offset, rate); len, ram_offset, shm_size_offset, rate);
/* Write the PHY TX control parameters. */ /* Write the PHY TX control parameters. */
@ -9,7 +9,7 @@
antenna = b43_antenna_to_phyctl(antenna); antenna = b43_antenna_to_phyctl(antenna);
ctl = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL); ctl = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL);
/* We can't send beacons with short preamble. Would get PHY errors. */ /* We can't send beacons with short preamble. Would get PHY errors. */
@@ -3201,8 +3201,8 @@ static int b43_chip_init(struct b43_wlde @@ -3218,8 +3218,8 @@ static int b43_chip_init(struct b43_wlde
/* Select the antennae */ /* Select the antennae */
if (phy->ops->set_rx_antenna) if (phy->ops->set_rx_antenna)
@ -20,7 +20,7 @@
if (phy->type == B43_PHYTYPE_B) { if (phy->type == B43_PHYTYPE_B) {
value16 = b43_read16(dev, 0x005E); value16 = b43_read16(dev, 0x005E);
@@ -3896,7 +3896,6 @@ static int b43_op_config(struct ieee8021 @@ -3913,7 +3913,6 @@ static int b43_op_config(struct ieee8021
struct b43_wldev *dev = wl->current_dev; struct b43_wldev *dev = wl->current_dev;
struct b43_phy *phy = &dev->phy; struct b43_phy *phy = &dev->phy;
struct ieee80211_conf *conf = &hw->conf; struct ieee80211_conf *conf = &hw->conf;
@ -28,7 +28,7 @@
int err = 0; int err = 0;
mutex_lock(&wl->mutex); mutex_lock(&wl->mutex);
@@ -3936,11 +3935,9 @@ static int b43_op_config(struct ieee8021 @@ -3953,11 +3952,9 @@ static int b43_op_config(struct ieee8021
} }
/* Antennas for RX and management frame TX. */ /* Antennas for RX and management frame TX. */
@ -42,7 +42,7 @@
if (wl->radio_enabled != phy->radio_on) { if (wl->radio_enabled != phy->radio_on) {
if (wl->radio_enabled) { if (wl->radio_enabled) {
@@ -5077,6 +5074,47 @@ static int b43_op_get_survey(struct ieee @@ -5094,6 +5091,47 @@ static int b43_op_get_survey(struct ieee
return 0; return 0;
} }
@ -90,7 +90,7 @@
static const struct ieee80211_ops b43_hw_ops = { static const struct ieee80211_ops b43_hw_ops = {
.tx = b43_op_tx, .tx = b43_op_tx,
.conf_tx = b43_op_conf_tx, .conf_tx = b43_op_conf_tx,
@@ -5098,6 +5136,8 @@ static const struct ieee80211_ops b43_hw @@ -5115,6 +5153,8 @@ static const struct ieee80211_ops b43_hw
.sw_scan_complete = b43_op_sw_scan_complete_notifier, .sw_scan_complete = b43_op_sw_scan_complete_notifier,
.get_survey = b43_op_get_survey, .get_survey = b43_op_get_survey,
.rfkill_poll = b43_rfkill_poll, .rfkill_poll = b43_rfkill_poll,
@ -99,7 +99,7 @@
}; };
/* Hard-reset the chip. Do not call this directly. /* Hard-reset the chip. Do not call this directly.
@@ -5397,6 +5437,8 @@ static int b43_one_core_attach(struct b4 @@ -5418,6 +5458,8 @@ static int b43_one_core_attach(struct b4
if (!wldev) if (!wldev)
goto out; goto out;
@ -108,7 +108,7 @@
wldev->use_pio = b43_modparam_pio; wldev->use_pio = b43_modparam_pio;
wldev->dev = dev; wldev->dev = dev;
wldev->wl = wl; wldev->wl = wl;
@@ -5487,6 +5529,9 @@ static struct b43_wl *b43_wireless_init( @@ -5508,6 +5550,9 @@ static struct b43_wl *b43_wireless_init(
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;

59
package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
View File

@ -19,28 +19,12 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/net/wireless/b43/b43.h --- a/drivers/net/wireless/b43/b43.h
+++ b/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; 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 +#ifdef CONFIG_BCM47XX_BCMA
+#include <asm/mach-bcm47xx/bcm47xx.h> +void b43_wflush16(struct b43_wldev *dev, u16 offset, u16 value);
+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);
+ }
+}
+#else +#else
+static inline void b43_wflush16(struct b43_wldev *dev, u16 offset, u16 value) +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); struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev);
--- a/drivers/net/wireless/b43/main.c --- a/drivers/net/wireless/b43/main.c
+++ b/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]; u16 radio24[3];
for (tmp = 0; tmp < 3; tmp++) { 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); 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 else
tmp = 0x5205017F; tmp = 0x5205017F;
} else { } else {
@ -96,6 +80,33 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
B43_RADIOCTL_ID); B43_RADIOCTL_ID);
tmp |= (u32)b43_read16(dev, B43_MMIO_RADIO_DATA_HIGH) tmp |= (u32)b43_read16(dev, B43_MMIO_RADIO_DATA_HIGH)
<< 16; << 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 --- a/drivers/net/wireless/b43/phy_common.c
+++ b/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 @@ -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 --- a/drivers/net/wireless/b43/phy_n.c
+++ b/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) static u16 b43_nphy_op_read(struct b43_wldev *dev, u16 reg)
{ {
check_phyreg(dev, 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); 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) u16 set)
{ {
check_phyreg(dev, reg); 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); 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 else
reg |= 0x100; reg |= 0x100;
@ -234,7 +245,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW); 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. */ /* Register 1 is a 32-bit register. */
B43_WARN_ON(dev->phy.rev < 7 && reg == 1); B43_WARN_ON(dev->phy.rev < 7 && reg == 1);

2
package/kernel/mac80211/patches/845-b43-only-use-gpio-0-1-for-led.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/b43/main.c --- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c
@@ -2815,6 +2815,14 @@ static int b43_gpio_init(struct b43_wlde @@ -2831,6 +2831,14 @@ static int b43_gpio_init(struct b43_wlde
} else if (dev->dev->chip_id == 0x5354) { } else if (dev->dev->chip_id == 0x5354) {
/* Don't allow overtaking buttons GPIOs */ /* Don't allow overtaking buttons GPIOs */
set &= 0x2; /* 0x2 is LED GPIO on BCM5354 */ set &= 0x2; /* 0x2 is LED GPIO on BCM5354 */