ath10k: Advertize beacon_int_min_gcd as 100 while bring up multi vaps
PATCH v2 1/1 ath10k: Advertize beacon_int_min_gcd as 100 while bring up multi vaps
With the latest firmware design, the beacon interval should be greater than 100 to bring the multiple vaps.
Set beacon_int_min_gcd to 100, when the wmi service WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT is enabled in the firmware. If not, beacon_int_min_gcd will be set to the default value 1.
Tested in QCA4019 with firmware ver 10.4-3.2.1.1-00015 Tested in QCA9888 with firmware ver 10.4-3.5.1-0005
--- drivers/net/wireless/ath/ath10k/mac.c | 25 +++++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/wmi.h | 9 +++++++++ 2 files changed, 34 insertions(+)
drivers/net/wireless/ath/ath10k/mac.c +25 -0
@@ -8163,6 +8163,24 @@ void ath10k_mac_destroy(struct ath10k *ar) }, }; +static const struct +ieee80211_iface_combination ath10k_10_4_bcn_int_if_comb[] = { + { + .limits = ath10k_10_4_if_limits, + .n_limits =ARRAY_SIZE (ath10k_10_4_if_limits), + .max_interfaces =16 , + .num_different_channels =1 , + .beacon_int_infra_match = true, + .beacon_int_min_gcd =100 , +#ifdef CONFIG_ATH10K_DFS_CERTIFIED + .radar_detect_widths =BIT (NL80211_CHAN_WIDTH_20_NOHT ) | +BIT (NL80211_CHAN_WIDTH_20 ) | +BIT (NL80211_CHAN_WIDTH_40 ) | +BIT (NL80211_CHAN_WIDTH_80 ), +#endif + }, +}; +static void ath10k_get_arvif_iter (void *data,u8 *mac,struct ieee80211_vif *vif) {
@@ -8526,6 +8544,13 @@ int ath10k_mac_register(struct ath10k *ar) ar->hw->wiphy->iface_combinations = ath10k_10_4_if_comb; ar->hw->wiphy->n_iface_combinations =ARRAY_SIZE (ath10k_10_4_if_comb); +if (test_bit (WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT , + ar->wmi.svc_map)) { + ar->hw->wiphy->iface_combinations = + ath10k_10_4_bcn_int_if_comb; + ar->hw->wiphy->n_iface_combinations = +ARRAY_SIZE (ath10k_10_4_bcn_int_if_comb); + }break ;case ATH10K_FW_WMI_OP_VERSION_UNSET :case ATH10K_FW_WMI_OP_VERSION_MAX :
drivers/net/wireless/ath/ath10k/wmi.h +9 -0
@@ -204,6 +204,7 @@ enum wmi_service {WMI_SERVICE_RESET_CHIP ,WMI_SERVICE_SPOOF_MAC_SUPPORT ,WMI_SERVICE_TX_DATA_ACK_RSSI , +WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT ,/* keep last */ WMI_SERVICE_MAX,
@@ -353,6 +354,11 @@ enum wmi_10_4_service {WMI_10_4_SERVICE_TPC_STATS_FINAL ,WMI_10_4_SERVICE_CFR_CAPTURE_SUPPORT ,WMI_10_4_SERVICE_TX_DATA_ACK_RSSI , +WMI_10_4_SERVICE_CFR_CAPTURE_IND_MSG_TYPE_LEGACY , +WMI_10_4_SERVICE_PER_PACKET_SW_ENCRYPT , +WMI_10_4_SERVICE_PEER_TID_CONFIGS_SUPPORT , +WMI_10_4_SERVICE_VDEV_BCN_RATE_CONTROL , + WMI_10_4_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT, };static inline char *wmi_service_name (int service_id)
@@ -467,6 +473,7 @@ static inline char *wmi_service_name(int service_id)SVCSTR (WMI_SERVICE_TPC_STATS_FINAL );SVCSTR (WMI_SERVICE_RESET_CHIP );SVCSTR (WMI_SERVICE_TX_DATA_ACK_RSSI ); +SVCSTR (WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT );default :return NULL ; }
@@ -777,6 +784,8 @@ static inline void wmi_10_4_svc_map(const __le32 *in, unsigned long *out, WMI_SERVICE_TPC_STATS_FINAL, len);SVCMAP (WMI_10_4_SERVICE_TX_DATA_ACK_RSSI ,WMI_SERVICE_TX_DATA_ACK_RSSI , len); +SVCMAP (WMI_10_4_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT , +WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT , len); }#undef SVCMAP
Signature · 7 lines
1.9.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 8 lines · Maharaja Kennadyrajan
With the latest firmware design, the beacon interval should be greater than 100 to bring the multiple vaps.
Set
beacon_int_min_gcdto 100, when the wmi serviceWMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORTis enabled in the firmware. If not,beacon_int_min_gcdwill be set to the default value 1.
Quoted 5 lines
Tested in QCA4019 with firmware ver 10.4-3.2.1.1-00015 Tested in QCA9888 with firmware ver 10.4-3.5.1-0005
Signed-off-by Maharaja Kennadyrajan <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
4600563f9319 ath10k: advertize beacon_int_min_gcd as 100 while bring up multi vaps
Signature · 3 lines
https://patchwork.kernel.org/patch/10604255/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 8 lines · Maharaja Kennadyrajan
With the latest firmware design, the beacon interval should be greater than 100 to bring the multiple vaps.
Set
beacon_int_min_gcdto 100, when the wmi serviceWMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORTis enabled in the firmware. If not,beacon_int_min_gcdwill be set to the default value 1.
Quoted 5 lines
Tested in QCA4019 with firmware ver 10.4-3.2.1.1-00015 Tested in QCA9888 with firmware ver 10.4-3.5.1-0005
Signed-off-by Maharaja Kennadyrajan <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
4600563f9319 ath10k: advertize beacon_int_min_gcd as 100 while bring up multi vaps
Signature · 9 lines
https://patchwork.kernel.org/patch/10604255/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k