* [PATCH] brcmfmac: fix setting AP channel with new firmwares @ 2016-05-24 9:09 Rafał Miłecki 2016-05-25 21:08 ` Arend van Spriel 2016-05-27 19:07 ` [PATCH V2] " Rafał Miłecki 0 siblings, 2 replies; 5+ messages in thread From: Rafał Miłecki @ 2016-05-24 9:09 UTC (permalink / raw) To: Kalle Valo Cc: Rafał Miłecki, Brett Rudley, Arend van Spriel, Franky (Zhenhui) Lin, Hante Meuleman, Pieter-Paul Giesberts, open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER, open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER, open list:NETWORKING DRIVERS, open list Firmware for new chipsets is based on a new major version of code internally maintained at Broadcom. E.g. brcmfmac4366b-pcie.bin (used for BCM4366B1) is based on 10.10.69.3309 while brcmfmac43602-pcie.ap.bin was based on 7.35.177.56. Currently setting AP 5 GHz channel doesn't work reliably with BCM4366B1. When setting e.g. 36 control channel with VHT80 (center channel 42) firmware may randomly pick one of: 1) 52 control channel with 58 as center one 2) 100 control channel with 106 as center one 3) 116 control channel with 122 as center one 4) 149 control channel with 155 as center one It seems new firmwares require setting AP mode (BRCMF_C_SET_AP) before specifying a channel. Changing an order of firmware calls fixes the problem. This fix was verified with BCM4366B1 and tested for regressions on BCM43602. It's unclear if it's needed (or correct at all) for P2P interfaces so it leaves this code unaffected. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> --- .../net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index 299a404..3d09d23 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -4423,7 +4423,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, struct brcmf_join_params join_params; enum nl80211_iftype dev_role; struct brcmf_fil_bss_enable_le bss_enable; - u16 chanspec; + u16 chanspec = chandef_to_chanspec(&cfg->d11inf, &settings->chandef); bool mbss; int is_11d; @@ -4499,16 +4499,16 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, brcmf_config_ap_mgmt_ie(ifp->vif, &settings->beacon); - if (!mbss) { - chanspec = chandef_to_chanspec(&cfg->d11inf, - &settings->chandef); + if (dev_role == NL80211_IFTYPE_P2P_GO) { err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec); if (err < 0) { brcmf_err("Set Channel failed: chspec=%d, %d\n", chanspec, err); goto exit; } + } + if (!mbss) { if (is_11d != ifp->vif->is_11d) { err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY, is_11d); @@ -4565,6 +4565,14 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, brcmf_err("setting AP mode failed %d\n", err); goto exit; } + if (!mbss) { + err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec); + if (err < 0) { + brcmf_err("Set Channel failed: chspec=%d, %d\n", + chanspec, err); + goto exit; + } + } err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1); if (err < 0) { brcmf_err("BRCMF_C_UP error (%d)\n", err); -- 1.8.4.5 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] brcmfmac: fix setting AP channel with new firmwares 2016-05-24 9:09 [PATCH] brcmfmac: fix setting AP channel with new firmwares Rafał Miłecki @ 2016-05-25 21:08 ` Arend van Spriel 2016-05-25 21:49 ` Rafał Miłecki 2016-05-27 19:07 ` [PATCH V2] " Rafał Miłecki 1 sibling, 1 reply; 5+ messages in thread From: Arend van Spriel @ 2016-05-25 21:08 UTC (permalink / raw) To: Rafał Miłecki, Kalle Valo Cc: Brett Rudley, Arend van Spriel, Franky (Zhenhui) Lin, Hante Meuleman, Pieter-Paul Giesberts, open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER, open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER, open list:NETWORKING DRIVERS, open list On 24-05-16 11:09, Rafał Miłecki wrote: > Firmware for new chipsets is based on a new major version of code > internally maintained at Broadcom. E.g. brcmfmac4366b-pcie.bin (used for > BCM4366B1) is based on 10.10.69.3309 while brcmfmac43602-pcie.ap.bin was > based on 7.35.177.56. > > Currently setting AP 5 GHz channel doesn't work reliably with BCM4366B1. > When setting e.g. 36 control channel with VHT80 (center channel 42) > firmware may randomly pick one of: > 1) 52 control channel with 58 as center one > 2) 100 control channel with 106 as center one > 3) 116 control channel with 122 as center one > 4) 149 control channel with 155 as center one > > It seems new firmwares require setting AP mode (BRCMF_C_SET_AP) before > specifying a channel. Changing an order of firmware calls fixes the > problem. > > This fix was verified with BCM4366B1 and tested for regressions on > BCM43602. It's unclear if it's needed (or correct at all) for P2P > interfaces so it leaves this code unaffected. In doing so the code reads a bit awkward so if P2P-GO works with the changed order that would be preferable. > Signed-off-by: Rafał Miłecki <zajec5@gmail.com> > --- > .../net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] brcmfmac: fix setting AP channel with new firmwares 2016-05-25 21:08 ` Arend van Spriel @ 2016-05-25 21:49 ` Rafał Miłecki 0 siblings, 0 replies; 5+ messages in thread From: Rafał Miłecki @ 2016-05-25 21:49 UTC (permalink / raw) To: Arend van Spriel Cc: Kalle Valo, Brett Rudley, Arend van Spriel, Franky (Zhenhui) Lin, Hante Meuleman, Pieter-Paul Giesberts, open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER, open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER, open list:NETWORKING DRIVERS, open list On 25 May 2016 at 23:08, Arend van Spriel <arend.vanspriel@broadcom.com> wrote: > On 24-05-16 11:09, Rafał Miłecki wrote: >> Firmware for new chipsets is based on a new major version of code >> internally maintained at Broadcom. E.g. brcmfmac4366b-pcie.bin (used for >> BCM4366B1) is based on 10.10.69.3309 while brcmfmac43602-pcie.ap.bin was >> based on 7.35.177.56. >> >> Currently setting AP 5 GHz channel doesn't work reliably with BCM4366B1. >> When setting e.g. 36 control channel with VHT80 (center channel 42) >> firmware may randomly pick one of: >> 1) 52 control channel with 58 as center one >> 2) 100 control channel with 106 as center one >> 3) 116 control channel with 122 as center one >> 4) 149 control channel with 155 as center one >> >> It seems new firmwares require setting AP mode (BRCMF_C_SET_AP) before >> specifying a channel. Changing an order of firmware calls fixes the >> problem. >> >> This fix was verified with BCM4366B1 and tested for regressions on >> BCM43602. It's unclear if it's needed (or correct at all) for P2P >> interfaces so it leaves this code unaffected. > > In doing so the code reads a bit awkward so if P2P-GO works with the > changed order that would be preferable. I'd prefer to have one code path as well, but my device/firmware doesn't support P2P so I couldn't test it. Could you test it or check firmware code to see if it's safe to change P2P path as well? -- Rafał ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH V2] brcmfmac: fix setting AP channel with new firmwares 2016-05-24 9:09 [PATCH] brcmfmac: fix setting AP channel with new firmwares Rafał Miłecki 2016-05-25 21:08 ` Arend van Spriel @ 2016-05-27 19:07 ` Rafał Miłecki 2016-06-16 15:07 ` [V2] " Kalle Valo 1 sibling, 1 reply; 5+ messages in thread From: Rafał Miłecki @ 2016-05-27 19:07 UTC (permalink / raw) To: Kalle Valo Cc: Rafał Miłecki, Brett Rudley, Arend van Spriel, Franky (Zhenhui) Lin, Hante Meuleman, Pieter-Paul Giesberts, open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER, open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER, open list:NETWORKING DRIVERS, open list Firmware for new chipsets is based on a new major version of code internally maintained at Broadcom. E.g. brcmfmac4366b-pcie.bin (used for BCM4366B1) is based on 10.10.69.3309 while brcmfmac43602-pcie.ap.bin was based on 7.35.177.56. Currently setting AP 5 GHz channel doesn't work reliably with BCM4366B1. When setting e.g. 36 control channel with VHT80 (center channel 42) firmware may randomly pick one of: 1) 52 control channel with 58 as center one 2) 100 control channel with 106 as center one 3) 116 control channel with 122 as center one 4) 149 control channel with 155 as center one It seems new firmwares require setting AP mode (BRCMF_C_SET_AP) before specifying a channel. Changing an order of firmware calls fixes the problem. This requirement resulted in two separated "chanspec" calls, one in AP code path and one in P2P path. This fix was verified with BCM4366B1 and tested for regressions on BCM43602. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> --- V2: Avoid checking AP vs. P2P at two different places, just add code setting "chanspec" to existing paths. --- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 36 +++++++++++++++------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index 1e2527f..38df1be 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -4438,7 +4438,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, struct brcmf_join_params join_params; enum nl80211_iftype dev_role; struct brcmf_fil_bss_enable_le bss_enable; - u16 chanspec; + u16 chanspec = chandef_to_chanspec(&cfg->d11inf, &settings->chandef); bool mbss; int is_11d; @@ -4514,16 +4514,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, brcmf_config_ap_mgmt_ie(ifp->vif, &settings->beacon); + /* Parameters shared by all radio interfaces */ if (!mbss) { - chanspec = chandef_to_chanspec(&cfg->d11inf, - &settings->chandef); - err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec); - if (err < 0) { - brcmf_err("Set Channel failed: chspec=%d, %d\n", - chanspec, err); - goto exit; - } - if (is_11d != ifp->vif->is_11d) { err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY, is_11d); @@ -4571,6 +4563,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, err = -EINVAL; goto exit; } + + /* Interface specific setup */ if (dev_role == NL80211_IFTYPE_AP) { if ((brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS)) && (!mbss)) brcmf_fil_iovar_int_set(ifp, "mbss", 1); @@ -4580,6 +4574,17 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, brcmf_err("setting AP mode failed %d\n", err); goto exit; } + if (!mbss) { + /* Firmware 10.x requires setting channel after enabling + * AP and before bringing interface up. + */ + err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec); + if (err < 0) { + brcmf_err("Set Channel failed: chspec=%d, %d\n", + chanspec, err); + goto exit; + } + } err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1); if (err < 0) { brcmf_err("BRCMF_C_UP error (%d)\n", err); @@ -4601,7 +4606,13 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, goto exit; } brcmf_dbg(TRACE, "AP mode configuration complete\n"); - } else { + } else if (dev_role == NL80211_IFTYPE_P2P_GO) { + err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec); + if (err < 0) { + brcmf_err("Set Channel failed: chspec=%d, %d\n", + chanspec, err); + goto exit; + } err = brcmf_fil_bsscfg_data_set(ifp, "ssid", &ssid_le, sizeof(ssid_le)); if (err < 0) { @@ -4618,7 +4629,10 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, } brcmf_dbg(TRACE, "GO mode configuration complete\n"); + } else { + WARN_ON(1); } + set_bit(BRCMF_VIF_STATUS_AP_CREATED, &ifp->vif->sme_state); brcmf_net_setcarrier(ifp, true); -- 1.8.4.5 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [V2] brcmfmac: fix setting AP channel with new firmwares 2016-05-27 19:07 ` [PATCH V2] " Rafał Miłecki @ 2016-06-16 15:07 ` Kalle Valo 0 siblings, 0 replies; 5+ messages in thread From: Kalle Valo @ 2016-06-16 15:07 UTC (permalink / raw) To: Rafał Miłecki Cc: Rafał Miłecki, Brett Rudley, Arend van Spriel, Franky (Zhenhui) Lin, Hante Meuleman, Pieter-Paul Giesberts, open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER, open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER, open list:NETWORKING DRIVERS, open list Rafał Miłecki wrote: > Firmware for new chipsets is based on a new major version of code > internally maintained at Broadcom. E.g. brcmfmac4366b-pcie.bin (used for > BCM4366B1) is based on 10.10.69.3309 while brcmfmac43602-pcie.ap.bin was > based on 7.35.177.56. > > Currently setting AP 5 GHz channel doesn't work reliably with BCM4366B1. > When setting e.g. 36 control channel with VHT80 (center channel 42) > firmware may randomly pick one of: > 1) 52 control channel with 58 as center one > 2) 100 control channel with 106 as center one > 3) 116 control channel with 122 as center one > 4) 149 control channel with 155 as center one > > It seems new firmwares require setting AP mode (BRCMF_C_SET_AP) before > specifying a channel. Changing an order of firmware calls fixes the > problem. This requirement resulted in two separated "chanspec" calls, > one in AP code path and one in P2P path. > > This fix was verified with BCM4366B1 and tested for regressions on > BCM43602. > > Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Thanks, 1 patch applied to wireless-drivers-next.git: 8707e08dbc1f brcmfmac: fix setting AP channel with new firmwares -- Sent by pwcli https://patchwork.kernel.org/patch/9138883/ ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-06-16 15:07 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-05-24 9:09 [PATCH] brcmfmac: fix setting AP channel with new firmwares Rafał Miłecki 2016-05-25 21:08 ` Arend van Spriel 2016-05-25 21:49 ` Rafał Miłecki 2016-05-27 19:07 ` [PATCH V2] " Rafał Miłecki 2016-06-16 15:07 ` [V2] " Kalle Valo
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).