Commit 82c434c1 authored by Wen Gong's avatar Wen Gong Committed by Kalle Valo
Browse files

ath11k: set correct NL80211_FEATURE_DYNAMIC_SMPS for WCN6855 



Commit 6f4d7030 ("ath11k: support SMPS configuration for 6 GHz") changed
"if (ht_cap & WMI_HT_CAP_DYNAMIC_SMPS)" to "if (ht_cap &
WMI_HT_CAP_DYNAMIC_SMPS || ar->supports_6ghz)" which means
NL80211_FEATURE_DYNAMIC_SMPS is enabled for all chips which support 6 GHz.
However, WCN6855 supports 6 GHz but it does not support feature
NL80211_FEATURE_DYNAMIC_SMPS, and this can lead to MU-MIMO test failures for
WCN6855.

Disable NL80211_FEATURE_DYNAMIC_SMPS for WCN6855 since its ht_cap does not
support WMI_HT_CAP_DYNAMIC_SMPS. Enable the feature only on QCN9074 as that's
the only other device supporting 6 GHz band.

Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1

Signed-off-by: default avatarWen Gong <wgong@codeaurora.org>
Signed-off-by: default avatarJouni Malinen <jouni@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210914163726.38604-3-jouni@codeaurora.org
parent c1b9ca36

drivers/net/wireless/ath/ath11k/core.c

+5 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.fix_l1ss = true,

		.max_tx_ring = DP_TCL_NUM_RING_MAX,

		.hal_params = &ath11k_hw_hal_params_ipq8074,

		.supports_dynamic_smps_6ghz = false,

	},

	{

		.hw_rev = ATH11K_HW_IPQ6018_HW10,
@@ -131,6 +132,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.fix_l1ss = true,

		.max_tx_ring = DP_TCL_NUM_RING_MAX,

		.hal_params = &ath11k_hw_hal_params_ipq8074,

		.supports_dynamic_smps_6ghz = false,

	},

	{

		.name = "qca6390 hw2.0",
@@ -179,6 +181,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.fix_l1ss = true,

		.max_tx_ring = DP_TCL_NUM_RING_MAX_QCA6390,

		.hal_params = &ath11k_hw_hal_params_qca6390,

		.supports_dynamic_smps_6ghz = false,

	},

	{

		.name = "qcn9074 hw1.0",
@@ -227,6 +230,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.fix_l1ss = true,

		.max_tx_ring = DP_TCL_NUM_RING_MAX,

		.hal_params = &ath11k_hw_hal_params_ipq8074,

		.supports_dynamic_smps_6ghz = true,

	},

	{

		.name = "wcn6855 hw2.0",
@@ -275,6 +279,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.fix_l1ss = false,

		.max_tx_ring = DP_TCL_NUM_RING_MAX_QCA6390,

		.hal_params = &ath11k_hw_hal_params_qca6390,

		.supports_dynamic_smps_6ghz = false,

	},

};

drivers/net/wireless/ath/ath11k/hw.h

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ struct ath11k_hw_params { 
	bool fix_l1ss;

	u8 max_tx_ring;

	const struct ath11k_hw_hal_params *hal_params;

	bool supports_dynamic_smps_6ghz;

};



struct ath11k_hw_ops {

drivers/net/wireless/ath/ath11k/mac.c

+2 −1
Original line number Diff line number Diff line
@@ -7672,7 +7672,8 @@ static int __ath11k_mac_register(struct ath11k *ar) 
	 * for each band for a dual band capable radio. It will be tricky to

	 * handle it when the ht capability different for each band.

	 */

	if (ht_cap & WMI_HT_CAP_DYNAMIC_SMPS || ar->supports_6ghz)

	if (ht_cap & WMI_HT_CAP_DYNAMIC_SMPS ||

	    (ar->supports_6ghz && ab->hw_params.supports_dynamic_smps_6ghz))

		ar->hw->wiphy->features |= NL80211_FEATURE_DYNAMIC_SMPS;



	ar->hw->wiphy->max_scan_ssids = WLAN_SCAN_PARAMS_MAX_SSID;