diff mbox series

brcmfmac: Use ISO3166 country code and rev 0 as fallback on 43430

Message ID 20220810142328.141030-1-hdegoede@redhat.com (mailing list archive)
State Accepted
Commit d173d0207bda8173b27a38cae439a2f904d4f7c8
Delegated to: Kalle Valo
Headers show
Series brcmfmac: Use ISO3166 country code and rev 0 as fallback on 43430 | expand

Commit Message

Hans de Goede Aug. 10, 2022, 2:23 p.m. UTC
Many devices ship with a nvram ccode value of X2/XT/XU/XV/ALL which are
all special world-wide compatibility ccode-s. Most of these world-wide
ccode-s allow passive scan mode only for 2.4GHz channels 12-14,
only enabling them when an AP is seen on them.

Since linux-firmware has moved to the new cyfmac43430-sdio.bin +
cyfmac43430-sdio.clm_blob firmware files this no longer works and
43430 devices using e.g. an X2 ccode fail to connect to an AP on
channel 13.

Add the 43430 chip-id to the list of chips for which to use the ISO3166
country code + rev 0 as fallback in brcmf_translate_country_code() to
fix this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Kalle Valo Sept. 7, 2022, 7:58 a.m. UTC | #1
Hans de Goede <hdegoede@redhat.com> wrote:

> Many devices ship with a nvram ccode value of X2/XT/XU/XV/ALL which are
> all special world-wide compatibility ccode-s. Most of these world-wide
> ccode-s allow passive scan mode only for 2.4GHz channels 12-14,
> only enabling them when an AP is seen on them.
> 
> Since linux-firmware has moved to the new cyfmac43430-sdio.bin +
> cyfmac43430-sdio.clm_blob firmware files this no longer works and
> 43430 devices using e.g. an X2 ccode fail to connect to an AP on
> channel 13.
> 
> Add the 43430 chip-id to the list of chips for which to use the ISO3166
> country code + rev 0 as fallback in brcmf_translate_country_code() to
> fix this.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Patch applied to wireless-next.git, thanks.

d173d0207bda wifi: brcmfmac: Use ISO3166 country code and rev 0 as fallback on 43430
diff mbox series

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 605206abe424..5fe075fc22af 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -7480,6 +7480,7 @@  int brcmf_cfg80211_wait_vif_event(struct brcmf_cfg80211_info *cfg,
 static bool brmcf_use_iso3166_ccode_fallback(struct brcmf_pub *drvr)
 {
 	switch (drvr->bus_if->chip) {
+	case BRCM_CC_43430_CHIP_ID:
 	case BRCM_CC_4345_CHIP_ID:
 	case BRCM_CC_43602_CHIP_ID:
 		return true;