From: Kalle Valo <kvalo@codeaurora.org>
To: Jouni Malinen <jouni@codeaurora.org>
Cc: ath11k@lists.infradead.org, linux-wireless@vger.kernel.org,
Wen Gong <wgong@codeaurora.org>
Subject: Re: [PATCH 3/3] ath11k: set correct NL80211_FEATURE_DYNAMIC_SMPS for WCN6855
Date: Thu, 28 Oct 2021 13:07:11 +0300 [thread overview]
Message-ID: <87a6it5upc.fsf@codeaurora.org> (raw)
In-Reply-To: <20210914163726.38604-3-jouni@codeaurora.org> (Jouni Malinen's message of "Tue, 14 Sep 2021 19:37:26 +0300")
Jouni Malinen <jouni@codeaurora.org> writes:
> From: Wen Gong <wgong@codeaurora.org>
>
> Commit "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.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1
>
> Signed-off-by: Wen Gong <wgong@codeaurora.org>
> Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
> ---
> drivers/net/wireless/ath/ath11k/core.c | 1 +
> drivers/net/wireless/ath/ath11k/hw.h | 1 +
> drivers/net/wireless/ath/ath11k/mac.c | 3 ++-
> 3 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
> index 265ff225bd81..2bae8c5184d4 100644
> --- a/drivers/net/wireless/ath/ath11k/core.c
> +++ b/drivers/net/wireless/ath/ath11k/core.c
> @@ -279,6 +279,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
> .sram_dump = &sram_dump_wcn6855,
> .max_tx_ring = DP_TCL_NUM_RING_MAX_QCA6390,
> .hal_params = &ath11k_hal_params_qca6390,
> + .check_dynamic_smps = true,
> },
> };
>
> diff --git a/drivers/net/wireless/ath/ath11k/hw.h b/drivers/net/wireless/ath/ath11k/hw.h
> index c6831fb110ba..7463b96770b7 100644
> --- a/drivers/net/wireless/ath/ath11k/hw.h
> +++ b/drivers/net/wireless/ath/ath11k/hw.h
> @@ -180,6 +180,7 @@ struct ath11k_hw_params {
> const struct ath11k_hw_sram_dump *sram_dump;
> u8 max_tx_ring;
> const struct hal_param *hal_params;
> + bool check_dynamic_smps;
> };
>
> struct ath11k_hw_ops {
> diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
> index 1f4765e43546..97a2c92b7b9b 100644
> --- a/drivers/net/wireless/ath/ath11k/mac.c
> +++ b/drivers/net/wireless/ath/ath11k/mac.c
> @@ -7570,7 +7570,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.check_dynamic_smps))
> ar->hw->wiphy->features |= NL80211_FEATURE_DYNAMIC_SMPS;
Instead of a "negative" flag I reverted the test and renamed the flag to
supports_dynamic_smps_6ghz. AFAIK QCN9074 is the only device supporting
6 GHz band so I enabled the flag only for it.
Please review my changes in the pending branch:
https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=cc692cfb9f2981691b39b601b37e4544ecf01136
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2021-10-28 10:07 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 16:37 [PATCH 1/3] ath11k: Change number of TCL rings to one for QCA6390 Jouni Malinen
2021-09-14 16:37 ` [PATCH 2/3] ath11k: change return buffer manager " Jouni Malinen
2021-09-16 10:02 ` Kalle Valo
2021-09-28 15:09 ` Kalle Valo
2021-09-28 15:14 ` Kalle Valo
2021-09-29 2:42 ` bqiang
2021-10-01 6:26 ` Kalle Valo
2021-10-05 14:10 ` Kalle Valo
2021-10-25 13:02 ` Kalle Valo
2021-10-25 13:03 ` Kalle Valo
2021-09-14 16:37 ` [PATCH 3/3] ath11k: set correct NL80211_FEATURE_DYNAMIC_SMPS for WCN6855 Jouni Malinen
2021-09-16 10:08 ` Kalle Valo
2021-09-16 14:09 ` Wen Gong
2021-09-16 15:15 ` Kalle Valo
2021-10-28 10:07 ` Kalle Valo [this message]
2021-10-29 2:30 ` Wen Gong
2021-11-01 14:13 ` Kalle Valo
2021-09-28 15:12 ` [PATCH 1/3] ath11k: Change number of TCL rings to one for QCA6390 Kalle Valo
2021-09-29 2:15 ` bqiang
2021-10-05 14:06 ` Kalle Valo
2021-10-11 15:12 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a6it5upc.fsf@codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=ath11k@lists.infradead.org \
--cc=jouni@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=wgong@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).