projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c1c5c8a)
mac80211_hwsim: Advertise support for EHT capabilities
authorIlan Peer <ilan.peer@intel.com>
Mon, 14 Feb 2022 16:30:06 +0000 (17:30 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 16 Feb 2022 14:44:45 +0000 (15:44 +0100)
Add EHT capabilities to bands.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Link: https://lore.kernel.org/r/20220214173004.1b710f8e04ce.I11d6911dafc01deb8ceb7828e363e8554701790a@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/mac80211_hwsim.c patch | blob | history

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index fdf7815..b23c6de 100644 (file)
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2008, Jouni Malinen <j@w1.fi>
  * Copyright (c) 2011, Javier Lopez <jlopex@gmail.com>
  * Copyright (c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright (C) 2018 - 2020 Intel Corporation
+ * Copyright (C) 2018 - 2022 Intel Corporation
  */
 
 /*
@@ -2940,7 +2940,7 @@ out_err:
        nlmsg_free(mcast_skb);
 }
 
-static const struct ieee80211_sband_iftype_data he_capa_2ghz[] = {
+static const struct ieee80211_sband_iftype_data sband_capa_2ghz[] = {
        {
                .types_mask = BIT(NL80211_IFTYPE_STATION) |
                              BIT(NL80211_IFTYPE_AP),
@@ -2986,6 +2986,66 @@ static const struct ieee80211_sband_iftype_data he_capa_2ghz[] = {
                                .tx_mcs_80p80 = cpu_to_le16(0xffff),
                        },
                },
+               .eht_cap = {
+                       .has_eht = true,
+                       .eht_cap_elem = {
+                               .mac_cap_info[0] =
+                                       IEEE80211_EHT_MAC_CAP0_NSEP_PRIO_ACCESS |
+                                       IEEE80211_EHT_MAC_CAP0_OM_CONTROL |
+                                       IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE1,
+                               .phy_cap_info[0] =
+                                       IEEE80211_EHT_PHY_CAP0_242_TONE_RU_GT20MHZ |
+                                       IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI |
+                                       IEEE80211_EHT_PHY_CAP0_PARTIAL_BW_UL_MU_MIMO |
+                                       IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER |
+                                       IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE,
+                               .phy_cap_info[3] =
+                                       IEEE80211_EHT_PHY_CAP3_NG_16_SU_FEEDBACK |
+                                       IEEE80211_EHT_PHY_CAP3_NG_16_MU_FEEDBACK |
+                                       IEEE80211_EHT_PHY_CAP3_CODEBOOK_4_2_SU_FDBK |
+                                       IEEE80211_EHT_PHY_CAP3_CODEBOOK_7_5_MU_FDBK |
+                                       IEEE80211_EHT_PHY_CAP3_TRIG_SU_BF_FDBK |
+                                       IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK |
+                                       IEEE80211_EHT_PHY_CAP3_TRIG_CQI_FDBK,
+                               .phy_cap_info[4] =
+                                       IEEE80211_EHT_PHY_CAP4_PART_BW_DL_MU_MIMO |
+                                       IEEE80211_EHT_PHY_CAP4_PSR_SR_SUPP |
+                                       IEEE80211_EHT_PHY_CAP4_POWER_BOOST_FACT_SUPP |
+                                       IEEE80211_EHT_PHY_CAP4_EHT_MU_PPDU_4_EHT_LTF_08_GI |
+                                       IEEE80211_EHT_PHY_CAP4_MAX_NC_MASK,
+                               .phy_cap_info[5] =
+                                       IEEE80211_EHT_PHY_CAP5_NON_TRIG_CQI_FEEDBACK |
+                                       IEEE80211_EHT_PHY_CAP5_TX_LESS_242_TONE_RU_SUPP |
+                                       IEEE80211_EHT_PHY_CAP5_RX_LESS_242_TONE_RU_SUPP |
+                                       IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT |
+                                       IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK |
+                                       IEEE80211_EHT_PHY_CAP5_MAX_NUM_SUPP_EHT_LTF_MASK,
+                               .phy_cap_info[6] =
+                                       IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK |
+                                       IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK,
+                               .phy_cap_info[7] =
+                                       IEEE80211_EHT_PHY_CAP7_20MHZ_STA_RX_NDP_WIDER_BW,
+                       },
+
+                       /* For all MCS and bandwidth, set 8 NSS for both Tx and
+                        * Rx
+                        */
+                       .eht_mcs_nss_supp = {
+                               /*
+                                * Since B0, B1, B2 and B3 are not set in
+                                * the supported channel width set field in the
+                                * HE PHY capabilities information field the
+                                * device is a 20MHz only device on 2.4GHz band.
+                                */
+                               .only_20mhz = {
+                                       .rx_tx_mcs7_max_nss = 0x88,
+                                       .rx_tx_mcs9_max_nss = 0x88,
+                                       .rx_tx_mcs11_max_nss = 0x88,
+                                       .rx_tx_mcs13_max_nss = 0x88,
+                               },
+                       },
+                       /* PPE threshold information is not supported */
+               },
        },
 #ifdef CONFIG_MAC80211_MESH
        {
@@ -3028,7 +3088,7 @@ static const struct ieee80211_sband_iftype_data he_capa_2ghz[] = {
 #endif
 };
 
-static const struct ieee80211_sband_iftype_data he_capa_5ghz[] = {
+static const struct ieee80211_sband_iftype_data sband_capa_5ghz[] = {
        {
                /* TODO: should we support other types, e.g., P2P?*/
                .types_mask = BIT(NL80211_IFTYPE_STATION) |
@@ -3079,6 +3139,81 @@ static const struct ieee80211_sband_iftype_data he_capa_5ghz[] = {
                                .tx_mcs_80p80 = cpu_to_le16(0xfffa),
                        },
                },
+               .eht_cap = {
+                       .has_eht = true,
+                       .eht_cap_elem = {
+                               .mac_cap_info[0] =
+                                       IEEE80211_EHT_MAC_CAP0_NSEP_PRIO_ACCESS |
+                                       IEEE80211_EHT_MAC_CAP0_OM_CONTROL |
+                                       IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE1,
+                               .phy_cap_info[0] =
+                                       IEEE80211_EHT_PHY_CAP0_242_TONE_RU_GT20MHZ |
+                                       IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI |
+                                       IEEE80211_EHT_PHY_CAP0_PARTIAL_BW_UL_MU_MIMO |
+                                       IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER |
+                                       IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE |
+                                       IEEE80211_EHT_PHY_CAP0_BEAMFORMEE_SS_80MHZ_MASK,
+                               .phy_cap_info[1] =
+                                       IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_80MHZ_MASK |
+                                       IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_160MHZ_MASK,
+                               .phy_cap_info[2] =
+                                       IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_80MHZ_MASK |
+                                       IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_160MHZ_MASK,
+                               .phy_cap_info[3] =
+                                       IEEE80211_EHT_PHY_CAP3_NG_16_SU_FEEDBACK |
+                                       IEEE80211_EHT_PHY_CAP3_NG_16_MU_FEEDBACK |
+                                       IEEE80211_EHT_PHY_CAP3_CODEBOOK_4_2_SU_FDBK |
+                                       IEEE80211_EHT_PHY_CAP3_CODEBOOK_7_5_MU_FDBK |
+                                       IEEE80211_EHT_PHY_CAP3_TRIG_SU_BF_FDBK |
+                                       IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK |
+                                       IEEE80211_EHT_PHY_CAP3_TRIG_CQI_FDBK,
+                               .phy_cap_info[4] =
+                                       IEEE80211_EHT_PHY_CAP4_PART_BW_DL_MU_MIMO |
+                                       IEEE80211_EHT_PHY_CAP4_PSR_SR_SUPP |
+                                       IEEE80211_EHT_PHY_CAP4_POWER_BOOST_FACT_SUPP |
+                                       IEEE80211_EHT_PHY_CAP4_EHT_MU_PPDU_4_EHT_LTF_08_GI |
+                                       IEEE80211_EHT_PHY_CAP4_MAX_NC_MASK,
+                               .phy_cap_info[5] =
+                                       IEEE80211_EHT_PHY_CAP5_NON_TRIG_CQI_FEEDBACK |
+                                       IEEE80211_EHT_PHY_CAP5_TX_LESS_242_TONE_RU_SUPP |
+                                       IEEE80211_EHT_PHY_CAP5_RX_LESS_242_TONE_RU_SUPP |
+                                       IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT |
+                                       IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK |
+                                       IEEE80211_EHT_PHY_CAP5_MAX_NUM_SUPP_EHT_LTF_MASK,
+                               .phy_cap_info[6] =
+                                       IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK |
+                                       IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK,
+                               .phy_cap_info[7] =
+                                       IEEE80211_EHT_PHY_CAP7_20MHZ_STA_RX_NDP_WIDER_BW |
+                                       IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ |
+                                       IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_160MHZ |
+                                       IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ |
+                                       IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ,
+                       },
+
+                       /* For all MCS and bandwidth, set 8 NSS for both Tx and
+                        * Rx
+                        */
+                       .eht_mcs_nss_supp = {
+                               /*
+                                * As B1 and B2 are set in the supported
+                                * channel width set field in the HE PHY
+                                * capabilities information field include all
+                                * the following MCS/NSS.
+                                */
+                               .bw._80 = {
+                                       .rx_tx_mcs9_max_nss = 0x88,
+                                       .rx_tx_mcs11_max_nss = 0x88,
+                                       .rx_tx_mcs13_max_nss = 0x88,
+                               },
+                               .bw._160 = {
+                                       .rx_tx_mcs9_max_nss = 0x88,
+                                       .rx_tx_mcs11_max_nss = 0x88,
+                                       .rx_tx_mcs13_max_nss = 0x88,
+                               },
+                       },
+                       /* PPE threshold information is not supported */
+               },
        },
 #ifdef CONFIG_MAC80211_MESH
        {
@@ -3126,7 +3261,7 @@ static const struct ieee80211_sband_iftype_data he_capa_5ghz[] = {
 #endif
 };
 
-static const struct ieee80211_sband_iftype_data he_capa_6ghz[] = {
+static const struct ieee80211_sband_iftype_data sband_capa_6ghz[] = {
        {
                /* TODO: should we support other types, e.g., P2P?*/
                .types_mask = BIT(NL80211_IFTYPE_STATION) |
@@ -3186,6 +3321,93 @@ static const struct ieee80211_sband_iftype_data he_capa_6ghz[] = {
                                .tx_mcs_80p80 = cpu_to_le16(0xfffa),
                        },
                },
+               .eht_cap = {
+                       .has_eht = true,
+                       .eht_cap_elem = {
+                               .mac_cap_info[0] =
+                                       IEEE80211_EHT_MAC_CAP0_NSEP_PRIO_ACCESS |
+                                       IEEE80211_EHT_MAC_CAP0_OM_CONTROL |
+                                       IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE1,
+                               .phy_cap_info[0] =
+                                       IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ |
+                                       IEEE80211_EHT_PHY_CAP0_242_TONE_RU_GT20MHZ |
+                                       IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI |
+                                       IEEE80211_EHT_PHY_CAP0_PARTIAL_BW_UL_MU_MIMO |
+                                       IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER |
+                                       IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE |
+                                       IEEE80211_EHT_PHY_CAP0_BEAMFORMEE_SS_80MHZ_MASK,
+                               .phy_cap_info[1] =
+                                       IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_80MHZ_MASK |
+                                       IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_160MHZ_MASK |
+                                       IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_320MHZ_MASK,
+                               .phy_cap_info[2] =
+                                       IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_80MHZ_MASK |
+                                       IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_160MHZ_MASK |
+                                       IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_320MHZ_MASK,
+                               .phy_cap_info[3] =
+                                       IEEE80211_EHT_PHY_CAP3_NG_16_SU_FEEDBACK |
+                                       IEEE80211_EHT_PHY_CAP3_NG_16_MU_FEEDBACK |
+                                       IEEE80211_EHT_PHY_CAP3_CODEBOOK_4_2_SU_FDBK |
+                                       IEEE80211_EHT_PHY_CAP3_CODEBOOK_7_5_MU_FDBK |
+                                       IEEE80211_EHT_PHY_CAP3_TRIG_SU_BF_FDBK |
+                                       IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK |
+                                       IEEE80211_EHT_PHY_CAP3_TRIG_CQI_FDBK,
+                               .phy_cap_info[4] =
+                                       IEEE80211_EHT_PHY_CAP4_PART_BW_DL_MU_MIMO |
+                                       IEEE80211_EHT_PHY_CAP4_PSR_SR_SUPP |
+                                       IEEE80211_EHT_PHY_CAP4_POWER_BOOST_FACT_SUPP |
+                                       IEEE80211_EHT_PHY_CAP4_EHT_MU_PPDU_4_EHT_LTF_08_GI |
+                                       IEEE80211_EHT_PHY_CAP4_MAX_NC_MASK,
+                               .phy_cap_info[5] =
+                                       IEEE80211_EHT_PHY_CAP5_NON_TRIG_CQI_FEEDBACK |
+                                       IEEE80211_EHT_PHY_CAP5_TX_LESS_242_TONE_RU_SUPP |
+                                       IEEE80211_EHT_PHY_CAP5_RX_LESS_242_TONE_RU_SUPP |
+                                       IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT |
+                                       IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK |
+                                       IEEE80211_EHT_PHY_CAP5_MAX_NUM_SUPP_EHT_LTF_MASK,
+                               .phy_cap_info[6] =
+                                       IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK |
+                                       IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK |
+                                       IEEE80211_EHT_PHY_CAP6_EHT_DUP_6GHZ_SUPP,
+                               .phy_cap_info[7] =
+                                       IEEE80211_EHT_PHY_CAP7_20MHZ_STA_RX_NDP_WIDER_BW |
+                                       IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ |
+                                       IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_160MHZ |
+                                       IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_320MHZ |
+                                       IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ |
+                                       IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ |
+                                       IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ,
+                       },
+
+                       /* For all MCS and bandwidth, set 8 NSS for both Tx and
+                        * Rx
+                        */
+                       .eht_mcs_nss_supp = {
+                               /*
+                                * As B1 and B2 are set in the supported
+                                * channel width set field in the HE PHY
+                                * capabilities information field and 320MHz in
+                                * 6GHz is supported include all the following
+                                * MCS/NSS.
+                                */
+                               .bw._80 = {
+                                       .rx_tx_mcs9_max_nss = 0x88,
+                                       .rx_tx_mcs11_max_nss = 0x88,
+                                       .rx_tx_mcs13_max_nss = 0x88,
+                               },
+                               .bw._160 = {
+                                       .rx_tx_mcs9_max_nss = 0x88,
+                                       .rx_tx_mcs11_max_nss = 0x88,
+                                       .rx_tx_mcs13_max_nss = 0x88,
+                               },
+                               .bw._320 = {
+                                       .rx_tx_mcs9_max_nss = 0x88,
+                                       .rx_tx_mcs11_max_nss = 0x88,
+                                       .rx_tx_mcs13_max_nss = 0x88,
+                               },
+                       },
+                       /* PPE threshold information is not supported */
+               },
        },
 #ifdef CONFIG_MAC80211_MESH
        {
@@ -3242,22 +3464,22 @@ static const struct ieee80211_sband_iftype_data he_capa_6ghz[] = {
 #endif
 };
 
-static void mac80211_hwsim_he_capab(struct ieee80211_supported_band *sband)
+static void mac80211_hwsim_sband_capab(struct ieee80211_supported_band *sband)
 {
        u16 n_iftype_data;
 
        if (sband->band == NL80211_BAND_2GHZ) {
-               n_iftype_data = ARRAY_SIZE(he_capa_2ghz);
+               n_iftype_data = ARRAY_SIZE(sband_capa_2ghz);
                sband->iftype_data =
-                       (struct ieee80211_sband_iftype_data *)he_capa_2ghz;
+                       (struct ieee80211_sband_iftype_data *)sband_capa_2ghz;
        } else if (sband->band == NL80211_BAND_5GHZ) {
-               n_iftype_data = ARRAY_SIZE(he_capa_5ghz);
+               n_iftype_data = ARRAY_SIZE(sband_capa_5ghz);
                sband->iftype_data =
-                       (struct ieee80211_sband_iftype_data *)he_capa_5ghz;
+                       (struct ieee80211_sband_iftype_data *)sband_capa_5ghz;
        } else if (sband->band == NL80211_BAND_6GHZ) {
-               n_iftype_data = ARRAY_SIZE(he_capa_6ghz);
+               n_iftype_data = ARRAY_SIZE(sband_capa_6ghz);
                sband->iftype_data =
-                       (struct ieee80211_sband_iftype_data *)he_capa_6ghz;
+                       (struct ieee80211_sband_iftype_data *)sband_capa_6ghz;
        } else {
                return;
        }
@@ -3582,7 +3804,7 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
                        sband->ht_cap.mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
                }
 
-               mac80211_hwsim_he_capab(sband);
+               mac80211_hwsim_sband_capab(sband);
 
                hw->wiphy->bands[band] = sband;
        }
Domain: System / Kernel;