lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0152/1039] ath11k: set correct NL80211_FEATURE_DYNAMIC_SMPS for WCN6855
    Date
    From: Wen Gong <wgong@codeaurora.org>

    [ Upstream commit 82c434c103408842a87404e873992b7698b6df2b ]

    Commit 6f4d70308e5e ("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: Wen Gong <wgong@codeaurora.org>
    Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/20210914163726.38604-3-jouni@codeaurora.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/ath/ath11k/core.c | 5 +++++
    drivers/net/wireless/ath/ath11k/hw.h | 1 +
    drivers/net/wireless/ath/ath11k/mac.c | 3 ++-
    3 files changed, 8 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
    index b5a2af3ffc3e1..7ee2ccc49c747 100644
    --- a/drivers/net/wireless/ath/ath11k/core.c
    +++ b/drivers/net/wireless/ath/ath11k/core.c
    @@ -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,
    },
    };

    diff --git a/drivers/net/wireless/ath/ath11k/hw.h b/drivers/net/wireless/ath/ath11k/hw.h
    index 19223d36846e8..6dcac596e3fe5 100644
    --- a/drivers/net/wireless/ath/ath11k/hw.h
    +++ b/drivers/net/wireless/ath/ath11k/hw.h
    @@ -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 {
    diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
    index 9ed7eb09bdb70..821332cbeb5de 100644
    --- a/drivers/net/wireless/ath/ath11k/mac.c
    +++ b/drivers/net/wireless/ath/ath11k/mac.c
    @@ -7674,7 +7674,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;
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 23:10    [W:2.174 / U:1.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site