| Message ID | 20240111045045.28377-10-quic_srirrama@quicinc.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: ath12k: Add single wiphy support | expand |
On 1/10/2024 8:50 PM, Sriram R wrote: > With all the radios being combined and registered as a single > mac80211 hw/wiphy, separate regd built from firmware rules need > not be updated to cfg80211. Rather we can pick one of the regd > built from the rules to update to cfg80211 for the whole > registered device. We prefer 6 GHz pdev based rules since it has > the rules for all bands. If the hw doesn't support 6 GHz, then update > rules from one of the pdevs. Do you need to handle the case where there are multiple instances of hardware that have divergent regds? I'm thinking of a case where there are 3 underlying hardware platforms, one that is 2 GHz, one that is 5 GHz, and one that is 6 GHz, and each of them has a regd that only has the rules for the supported band. In such a case wouldn't you need to aggregate the rules in the wiphy, not just pick one of the sets of rules? If that is not an expected case, ideally you should describe the requirements & assumptions that are in play here. > > Also, when regulatory notification is received, update to all the > underlying radios/ar so that it becomes aware of the change and as > well us it updates its local regd with the new country rules. Later > pick the appropriate pdev's regd(6 GHz if available) and apply to > cfg80211. Here again, can you elaborate on the requirements and assumptions? Do you update all channels to each hardware, even if each hardware only supports a single band? > > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 > Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 > > Signed-off-by: Sriram R <quic_srirrama@quicinc.com> > --- > drivers/net/wireless/ath/ath12k/core.h | 2 + > drivers/net/wireless/ath/ath12k/mac.c | 2 + > drivers/net/wireless/ath/ath12k/reg.c | 60 ++++++++++++++++++++++---- > 3 files changed, 55 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h > index 883556313fb0..ac7b48cc2e7e 100644 > --- a/drivers/net/wireless/ath/ath12k/core.h > +++ b/drivers/net/wireless/ath/ath12k/core.h > @@ -630,6 +630,8 @@ struct ath12k_hw { > struct mutex conf_mutex; > > u8 num_radio; > + bool regd_updated; > + bool use_6ghz_regd; > struct ath12k radio[] __aligned(sizeof(void *)); > }; > > diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c > index 25d82c6fe89a..2f19d6c5b741 100644 > --- a/drivers/net/wireless/ath/ath12k/mac.c > +++ b/drivers/net/wireless/ath/ath12k/mac.c > @@ -7948,6 +7948,7 @@ static int ath12k_mac_setup_channels_rates(struct ath12k *ar, > struct ath12k_wmi_hal_reg_capabilities_ext_arg *reg_cap; > void *channels; > u32 phy_id; > + struct ath12k_hw *ah = ar->ah; > > BUILD_BUG_ON((ARRAY_SIZE(ath12k_2ghz_channels) + > ARRAY_SIZE(ath12k_5ghz_channels) + > @@ -8000,6 +8001,7 @@ static int ath12k_mac_setup_channels_rates(struct ath12k *ar, > ath12k_mac_update_ch_list(ar, band, > reg_cap->low_5ghz_chan, > reg_cap->high_5ghz_chan); > + ah->use_6ghz_regd = true; > } > > if (reg_cap->low_5ghz_chan < ATH12K_MIN_6G_FREQ) { > diff --git a/drivers/net/wireless/ath/ath12k/reg.c b/drivers/net/wireless/ath/ath12k/reg.c > index da64482f1024..3a3f66d8ea11 100644 > --- a/drivers/net/wireless/ath/ath12k/reg.c > +++ b/drivers/net/wireless/ath/ath12k/reg.c > @@ -50,7 +50,7 @@ ath12k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request) > struct ath12k_wmi_init_country_arg arg; > struct ath12k_hw *ah = ath12k_hw_to_ah(hw); > struct ath12k *ar = ath12k_ah_to_ar(ah, 0); > - int ret; > + int ret, i; > > ath12k_dbg(ar->ab, ATH12K_DBG_REG, > "Regulatory Notification received for %s\n", wiphy_name(wiphy)); > @@ -85,10 +85,17 @@ ath12k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request) > memcpy(&arg.cc_info.alpha2, request->alpha2, 2); > arg.cc_info.alpha2[2] = 0; > > - ret = ath12k_wmi_send_init_country_cmd(ar, &arg); > - if (ret) > - ath12k_warn(ar->ab, > - "INIT Country code set to fw failed : %d\n", ret); > + /* Allow fresh updates to wiphy regd */ > + ah->regd_updated = false; > + > + /* Send the reg change request to all the radios */ > + for (i = 0; i < ah->num_radio; i++) { > + ret = ath12k_wmi_send_init_country_cmd(ar, &arg); > + if (ret) > + ath12k_warn(ar->ab, > + "INIT Country code set to fw failed : %d\n", ret); > + ar++; > + } > } > > int ath12k_reg_update_chan_list(struct ath12k *ar) > @@ -204,8 +211,31 @@ int ath12k_regd_update(struct ath12k *ar, bool init) > struct ieee80211_regdomain *regd, *regd_copy = NULL; > int ret, regd_len, pdev_id; > struct ath12k_base *ab; > + struct ath12k_hw *ah; > + int i; > > ab = ar->ab; > + ah = ar->ah; > + > + /* If one of the radios within ah has already updated the regd for > + * the wiphy, then avoid setting regd again > + */ > + if (ah->regd_updated) > + return 0; > + > + /* firmware provides reg rules which are similar for 2 GHz and 5 GHz > + * pdev but 6 GHz pdev has superset of all rules including rules for > + * all bands, we prefer 6 GHz pdev's rules to be used for setup of > + * the wiphy regd. > + * If 6 GHz pdev was part of the ath12k_hw, wait for the 6 GHz pdev, > + * else pick the first pdev which calls this function and use its > + * regd to update global hw regd. > + * The regd_updated flag set at the end will not allow any further > + * updates. > + */ > + if (ah->use_6ghz_regd && !ar->supports_6ghz) > + return 0; > + > pdev_id = ar->pdev_idx; > > spin_lock_bh(&ab->base_lock); > @@ -258,10 +288,22 @@ int ath12k_regd_update(struct ath12k *ar, bool init) > if (ret) > goto err; > > - if (ar->state == ATH12K_STATE_ON) { > - ret = ath12k_reg_update_chan_list(ar); > - if (ret) > - goto err; > + ah->regd_updated = true; > + > + /* Apply the new regd to all the radios, this is expected to be received only once > + * since we check for ah->regd_updated and allow here only once > + */ > + ar = ah->radio; > + ab = ar->ab; > + > + for (i = 0; i < ah->num_radio; i++) { > + if (ar->state == ATH12K_STATE_ON) { > + ret = ath12k_reg_update_chan_list(ar); > + if (ret) > + goto err; > + } > + ar++; > + ab = ar->ab; > } > > return 0;
>-----Original Message----- >From: Jeff Johnson (QUIC) <quic_jjohnson@quicinc.com> >Sent: Friday, January 12, 2024 11:46 PM >To: Sriram R (QUIC) <quic_srirrama@quicinc.com>; ath12k@lists.infradead.org >Cc: linux-wireless@vger.kernel.org >Subject: Re: [PATCH 09/12] wifi: ath12k: modify regulatory support for single wiphy >architecture > >On 1/10/2024 8:50 PM, Sriram R wrote: >> With all the radios being combined and registered as a single >> mac80211 hw/wiphy, separate regd built from firmware rules need not be >> updated to cfg80211. Rather we can pick one of the regd built from the >> rules to update to cfg80211 for the whole registered device. We prefer >> 6 GHz pdev based rules since it has the rules for all bands. If the hw >> doesn't support 6 GHz, then update rules from one of the pdevs. > >Do you need to handle the case where there are multiple instances of hardware >that have divergent regds? I'm thinking of a case where there are 3 underlying >hardware platforms, one that is 2 GHz, one that is 5 GHz, and one that is 6 GHz, and >each of them has a regd that only has the rules for the supported band. In such a >case wouldn't you need to aggregate the rules in the wiphy, not just pick one of the >sets of rules? > >If that is not an expected case, ideally you should describe the requirements & >assumptions that are in play here. This is not an expected case with our understanding and testing so far. The 2GHz and 5GHz radio FW would pass the regd comprising both 2GHz, 5GHz. The 6GHz FW is passing all of them - 2,5,6GHz, hence the need to club all the regd info separately is not required. I will make this assumption clear in the next revision. > >> >> Also, when regulatory notification is received, update to all the >> underlying radios/ar so that it becomes aware of the change and as >> well us it updates its local regd with the new country rules. Later >> pick the appropriate pdev's regd(6 GHz if available) and apply to >> cfg80211. > >Here again, can you elaborate on the requirements and assumptions? Do you >update all channels to each hardware, even if each hardware only supports a >single band? By update during reg_notifier here we mean the country code alone to each of the FW and the channel list update on receiving the regd would update only the corresponding supported channels to the respective FW and not the combined list. Thanks, Sriram.R
diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h index 883556313fb0..ac7b48cc2e7e 100644 --- a/drivers/net/wireless/ath/ath12k/core.h +++ b/drivers/net/wireless/ath/ath12k/core.h @@ -630,6 +630,8 @@ struct ath12k_hw { struct mutex conf_mutex; u8 num_radio; + bool regd_updated; + bool use_6ghz_regd; struct ath12k radio[] __aligned(sizeof(void *)); }; diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c index 25d82c6fe89a..2f19d6c5b741 100644 --- a/drivers/net/wireless/ath/ath12k/mac.c +++ b/drivers/net/wireless/ath/ath12k/mac.c @@ -7948,6 +7948,7 @@ static int ath12k_mac_setup_channels_rates(struct ath12k *ar, struct ath12k_wmi_hal_reg_capabilities_ext_arg *reg_cap; void *channels; u32 phy_id; + struct ath12k_hw *ah = ar->ah; BUILD_BUG_ON((ARRAY_SIZE(ath12k_2ghz_channels) + ARRAY_SIZE(ath12k_5ghz_channels) + @@ -8000,6 +8001,7 @@ static int ath12k_mac_setup_channels_rates(struct ath12k *ar, ath12k_mac_update_ch_list(ar, band, reg_cap->low_5ghz_chan, reg_cap->high_5ghz_chan); + ah->use_6ghz_regd = true; } if (reg_cap->low_5ghz_chan < ATH12K_MIN_6G_FREQ) { diff --git a/drivers/net/wireless/ath/ath12k/reg.c b/drivers/net/wireless/ath/ath12k/reg.c index da64482f1024..3a3f66d8ea11 100644 --- a/drivers/net/wireless/ath/ath12k/reg.c +++ b/drivers/net/wireless/ath/ath12k/reg.c @@ -50,7 +50,7 @@ ath12k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request) struct ath12k_wmi_init_country_arg arg; struct ath12k_hw *ah = ath12k_hw_to_ah(hw); struct ath12k *ar = ath12k_ah_to_ar(ah, 0); - int ret; + int ret, i; ath12k_dbg(ar->ab, ATH12K_DBG_REG, "Regulatory Notification received for %s\n", wiphy_name(wiphy)); @@ -85,10 +85,17 @@ ath12k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request) memcpy(&arg.cc_info.alpha2, request->alpha2, 2); arg.cc_info.alpha2[2] = 0; - ret = ath12k_wmi_send_init_country_cmd(ar, &arg); - if (ret) - ath12k_warn(ar->ab, - "INIT Country code set to fw failed : %d\n", ret); + /* Allow fresh updates to wiphy regd */ + ah->regd_updated = false; + + /* Send the reg change request to all the radios */ + for (i = 0; i < ah->num_radio; i++) { + ret = ath12k_wmi_send_init_country_cmd(ar, &arg); + if (ret) + ath12k_warn(ar->ab, + "INIT Country code set to fw failed : %d\n", ret); + ar++; + } } int ath12k_reg_update_chan_list(struct ath12k *ar) @@ -204,8 +211,31 @@ int ath12k_regd_update(struct ath12k *ar, bool init) struct ieee80211_regdomain *regd, *regd_copy = NULL; int ret, regd_len, pdev_id; struct ath12k_base *ab; + struct ath12k_hw *ah; + int i; ab = ar->ab; + ah = ar->ah; + + /* If one of the radios within ah has already updated the regd for + * the wiphy, then avoid setting regd again + */ + if (ah->regd_updated) + return 0; + + /* firmware provides reg rules which are similar for 2 GHz and 5 GHz + * pdev but 6 GHz pdev has superset of all rules including rules for + * all bands, we prefer 6 GHz pdev's rules to be used for setup of + * the wiphy regd. + * If 6 GHz pdev was part of the ath12k_hw, wait for the 6 GHz pdev, + * else pick the first pdev which calls this function and use its + * regd to update global hw regd. + * The regd_updated flag set at the end will not allow any further + * updates. + */ + if (ah->use_6ghz_regd && !ar->supports_6ghz) + return 0; + pdev_id = ar->pdev_idx; spin_lock_bh(&ab->base_lock); @@ -258,10 +288,22 @@ int ath12k_regd_update(struct ath12k *ar, bool init) if (ret) goto err; - if (ar->state == ATH12K_STATE_ON) { - ret = ath12k_reg_update_chan_list(ar); - if (ret) - goto err; + ah->regd_updated = true; + + /* Apply the new regd to all the radios, this is expected to be received only once + * since we check for ah->regd_updated and allow here only once + */ + ar = ah->radio; + ab = ar->ab; + + for (i = 0; i < ah->num_radio; i++) { + if (ar->state == ATH12K_STATE_ON) { + ret = ath12k_reg_update_chan_list(ar); + if (ret) + goto err; + } + ar++; + ab = ar->ab; } return 0;
With all the radios being combined and registered as a single mac80211 hw/wiphy, separate regd built from firmware rules need not be updated to cfg80211. Rather we can pick one of the regd built from the rules to update to cfg80211 for the whole registered device. We prefer 6 GHz pdev based rules since it has the rules for all bands. If the hw doesn't support 6 GHz, then update rules from one of the pdevs. Also, when regulatory notification is received, update to all the underlying radios/ar so that it becomes aware of the change and as well us it updates its local regd with the new country rules. Later pick the appropriate pdev's regd(6 GHz if available) and apply to cfg80211. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Signed-off-by: Sriram R <quic_srirrama@quicinc.com> --- drivers/net/wireless/ath/ath12k/core.h | 2 + drivers/net/wireless/ath/ath12k/mac.c | 2 + drivers/net/wireless/ath/ath12k/reg.c | 60 ++++++++++++++++++++++---- 3 files changed, 55 insertions(+), 9 deletions(-)