| Message ID | 20240424191141.32549-6-quic_pradeepc@quicinc.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | bug fixes and enhancements to 6 GHz band support | expand |
On 4/24/2024 12:11 PM, Pradeep Kumar Chitrapu wrote: > Move fetching smps value to a new function and use u16_get_bits v2 comment not addressed: s/smps/SMPS/ here and in the next line > to extract smps value from capabilities. This will help in > extending the functionality when SMPS support in 6 GHz band gets > added in subsequent patches. > > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 > > Signed-off-by: Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com> > --- > drivers/net/wireless/ath/ath12k/mac.c | 32 ++++++++++++++++----------- > 1 file changed, 19 insertions(+), 13 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c > index 8836dc67f7e0..65688e55c285 100644 > --- a/drivers/net/wireless/ath/ath12k/mac.c > +++ b/drivers/net/wireless/ath/ath12k/mac.c > @@ -2086,18 +2086,29 @@ static void ath12k_peer_assoc_h_he_6ghz(struct ath12k *ar, > ampdu_factor)) - 1; > } > > +static inline int ath12k_get_smps_from_capa(const struct ieee80211_sta_ht_cap *ht_cap, v2 comment not addressed: remove inline > + int *smps) > +{ > + if (!ht_cap->ht_supported) > + return -EOPNOTSUPP; > + > + *smps = u16_get_bits(ht_cap->cap, IEEE80211_HT_CAP_SM_PS); > + > + if (*smps >= ARRAY_SIZE(ath12k_smps_map)) > + return -EINVAL; > + > + return 0; > +} > + > static void ath12k_peer_assoc_h_smps(struct ieee80211_sta *sta, > struct ath12k_wmi_peer_assoc_arg *arg) > { > const struct ieee80211_sta_ht_cap *ht_cap = &sta->deflink.ht_cap; > int smps; > > - if (!ht_cap->ht_supported) > + if (ath12k_get_smps_from_capa(ht_cap, &smps)) > return; > > - smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS; > - smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT; > - > switch (smps) { > case WLAN_HT_CAP_SM_PS_STATIC: > arg->static_mimops_flag = true; > @@ -2571,16 +2582,11 @@ static int ath12k_setup_peer_smps(struct ath12k *ar, struct ath12k_vif *arvif, > const u8 *addr, > const struct ieee80211_sta_ht_cap *ht_cap) > { > - int smps; > + int smps, ret = 0; > > - if (!ht_cap->ht_supported) > - return 0; > - > - smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS; > - smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT; > - > - if (smps >= ARRAY_SIZE(ath12k_smps_map)) > - return -EINVAL; > + ret = ath12k_get_smps_from_capa(ht_cap, &smps); > + if (ret < 0) > + return ret; > > return ath12k_wmi_set_peer_param(ar, addr, arvif->vdev_id, > WMI_PEER_MIMO_PS_STATE,
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c index 8836dc67f7e0..65688e55c285 100644 --- a/drivers/net/wireless/ath/ath12k/mac.c +++ b/drivers/net/wireless/ath/ath12k/mac.c @@ -2086,18 +2086,29 @@ static void ath12k_peer_assoc_h_he_6ghz(struct ath12k *ar, ampdu_factor)) - 1; } +static inline int ath12k_get_smps_from_capa(const struct ieee80211_sta_ht_cap *ht_cap, + int *smps) +{ + if (!ht_cap->ht_supported) + return -EOPNOTSUPP; + + *smps = u16_get_bits(ht_cap->cap, IEEE80211_HT_CAP_SM_PS); + + if (*smps >= ARRAY_SIZE(ath12k_smps_map)) + return -EINVAL; + + return 0; +} + static void ath12k_peer_assoc_h_smps(struct ieee80211_sta *sta, struct ath12k_wmi_peer_assoc_arg *arg) { const struct ieee80211_sta_ht_cap *ht_cap = &sta->deflink.ht_cap; int smps; - if (!ht_cap->ht_supported) + if (ath12k_get_smps_from_capa(ht_cap, &smps)) return; - smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS; - smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT; - switch (smps) { case WLAN_HT_CAP_SM_PS_STATIC: arg->static_mimops_flag = true; @@ -2571,16 +2582,11 @@ static int ath12k_setup_peer_smps(struct ath12k *ar, struct ath12k_vif *arvif, const u8 *addr, const struct ieee80211_sta_ht_cap *ht_cap) { - int smps; + int smps, ret = 0; - if (!ht_cap->ht_supported) - return 0; - - smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS; - smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT; - - if (smps >= ARRAY_SIZE(ath12k_smps_map)) - return -EINVAL; + ret = ath12k_get_smps_from_capa(ht_cap, &smps); + if (ret < 0) + return ret; return ath12k_wmi_set_peer_param(ar, addr, arvif->vdev_id, WMI_PEER_MIMO_PS_STATE,
Move fetching smps value to a new function and use u16_get_bits to extract smps value from capabilities. This will help in extending the functionality when SMPS support in 6 GHz band gets added in subsequent patches. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 Signed-off-by: Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com> --- drivers/net/wireless/ath/ath12k/mac.c | 32 ++++++++++++++++----------- 1 file changed, 19 insertions(+), 13 deletions(-)