wifi: rtw89: declare EHT capabilities
Ping-Ke Shih
maintainercover wifi: rtw89: declare EHT capabilities
Adjust initial flow of HE capabilities to add EHT capabilities, and then 8922AE can connect to WiFi 7 AP with EHT rate.
Ping-Ke Shih (4):
wifi: rtw89: adjust init_he_cap() to add EHT cap into iftype_data
wifi: rtw89: change supported bandwidths of chip_info to bit mask
wifi: rtw89: add EHT capabilities for WiFi 7 chips
wifi: rtw89: declare EXT NSS BW of VHT capability
drivers/net/wireless/realtek/rtw89/core.c | 319 ++++++++++++------ drivers/net/wireless/realtek/rtw89/core.h | 2 +- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 4 +- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 4 +- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 4 +- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 5 +- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 4 + 7 files changed, 232 insertions(+), 110 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/4 wifi: rtw89: adjust init_he_cap() to add EHT cap into iftype_data
EHT capabilities are also stored in struct ieee80211_sband_iftype_data, so adjust allocation of iftype_data as common part named init_he_eht_cap(), and then init_eht_cap() can be added later. Don't change logic at all by this patch.
--- drivers/net/wireless/realtek/rtw89/core.c | 216 +++++++++++----------- 1 file changed, 113 insertions(+), 103 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +113 -103
@@ -3649,25 +3649,21 @@ static void rtw89_init_vht_cap(struct rtw89_dev *rtwdev, vht_cap->vht_mcs.tx_highest = highest[hal->tx_nss -1 ]; } -#define RTW89_SBAND_IFTYPES_NR 2 -static void rtw89_init_he_cap (struct rtw89_dev *rtwdev,enum nl80211_band band, -struct ieee80211_supported_band *sband) +enum nl80211_iftype iftype, +struct ieee80211_sband_iftype_data *iftype_data) {const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_hal *hal = &rtwdev->hal; -struct ieee80211_sband_iftype_data *iftype_data;bool no_ng16 = (chip->chip_id ==RTL8852A && hal->cv ==CHIP_CBV ) || (chip->chip_id ==RTL8852B && hal->cv ==CHIP_CAV ); +struct ieee80211_sta_he_cap *he_cap; +int nss = hal->rx_nss; +u8 *mac_cap_info; +u8 *phy_cap_info;u16 mcs_map =0 ;int i; -int nss = hal->rx_nss; -int idx =0 ; - - iftype_data =kcalloc (RTW89_SBAND_IFTYPES_NR ,sizeof (*iftype_data),GFP_KERNEL ); -if (!iftype_data) -return ;for (i =0 ; i <8 ; i++) {if (i < nss)
@@ -3676,12 +3672,109 @@ static void rtw89_init_he_cap(struct rtw89_dev *rtwdev, mcs_map |=IEEE80211_HE_MCS_NOT_SUPPORTED << (i *2 ); } -for (i =0 ; i <NUM_NL80211_IFTYPES ; i++) { -struct ieee80211_sta_he_cap *he_cap; -u8 *mac_cap_info; -u8 *phy_cap_info; + he_cap = &iftype_data->he_cap; + mac_cap_info = he_cap->he_cap_elem.mac_cap_info; + phy_cap_info = he_cap->he_cap_elem.phy_cap_info; + + he_cap->has_he = true; + mac_cap_info[0 ] =IEEE80211_HE_MAC_CAP0_HTC_HE ; +if (iftype ==NL80211_IFTYPE_STATION ) + mac_cap_info[1 ] =IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US ; + mac_cap_info[2 ] =IEEE80211_HE_MAC_CAP2_ALL_ACK | +IEEE80211_HE_MAC_CAP2_BSR ; + mac_cap_info[3 ] =IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2 ; +if (iftype ==NL80211_IFTYPE_AP ) + mac_cap_info[3 ] |=IEEE80211_HE_MAC_CAP3_OMI_CONTROL ; + mac_cap_info[4 ] =IEEE80211_HE_MAC_CAP4_OPS | +IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU ; +if (iftype ==NL80211_IFTYPE_STATION ) + mac_cap_info[5 ] =IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX ; +if (band ==NL80211_BAND_2GHZ ) { + phy_cap_info[0 ] = +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G ; + }else { + phy_cap_info[0 ] = +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G ; +if (chip->support_bw160) + phy_cap_info[0 ] |=IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G ; + } + phy_cap_info[1 ] =IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A | +IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD | +IEEE80211_HE_PHY_CAP1_HE_LTF_AND_GI_FOR_HE_PPDUS_0_8US ; + phy_cap_info[2 ] = IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US | +IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ | +IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ | +IEEE80211_HE_PHY_CAP2_DOPPLER_TX ; + phy_cap_info[3 ] =IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_16_QAM ; +if (iftype ==NL80211_IFTYPE_STATION ) + phy_cap_info[3 ] |=IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_16_QAM | +IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_2 ; +if (iftype ==NL80211_IFTYPE_AP ) + phy_cap_info[3 ] |=IEEE80211_HE_PHY_CAP3_RX_PARTIAL_BW_SU_IN_20MHZ_MU ; + phy_cap_info[4 ] =IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE | +IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4 ; +if (chip->support_bw160) + phy_cap_info[4 ] |=IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4 ; + phy_cap_info[5 ] = no_ng16 ?0 : +IEEE80211_HE_PHY_CAP5_NG16_SU_FEEDBACK | +IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK ; + phy_cap_info[6 ] =IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_42_SU | +IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU | +IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB | +IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE ; + phy_cap_info[7 ] =IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP | +IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI | +IEEE80211_HE_PHY_CAP7_MAX_NC_1 ; + phy_cap_info[8 ] =IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI | +IEEE80211_HE_PHY_CAP8_HE_ER_SU_1XLTF_AND_08_US_GI | +IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_996 ; +if (chip->support_bw160) + phy_cap_info[8 ] |=IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU | +IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU ; + phy_cap_info[9 ] =IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM | +IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU | +IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB | +IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB | +u8_encode_bits (IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US , +IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK ); +if (iftype ==NL80211_IFTYPE_STATION ) + phy_cap_info[9 ] |=IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU ; + he_cap->he_mcs_nss_supp.rx_mcs_80 =cpu_to_le16 (mcs_map); + he_cap->he_mcs_nss_supp.tx_mcs_80 =cpu_to_le16 (mcs_map); +if (chip->support_bw160) { + he_cap->he_mcs_nss_supp.rx_mcs_160 =cpu_to_le16 (mcs_map); + he_cap->he_mcs_nss_supp.tx_mcs_160 =cpu_to_le16 (mcs_map); + } + +if (band ==NL80211_BAND_6GHZ ) { +__le16 capa; -switch (i) { + capa =le16_encode_bits (IEEE80211_HT_MPDU_DENSITY_NONE , +IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START ) | +le16_encode_bits (IEEE80211_VHT_MAX_AMPDU_1024K , +IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP ) | +le16_encode_bits (IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 , +IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN ); + iftype_data->he_6ghz_capa.capa = capa; + } +} + +#define RTW89_SBAND_IFTYPES_NR 2 + +static void rtw89_init_he_eht_cap (struct rtw89_dev *rtwdev, +enum nl80211_band band, +struct ieee80211_supported_band *sband) +{ +struct ieee80211_sband_iftype_data *iftype_data; +enum nl80211_iftype iftype; +int idx =0 ; + + iftype_data =kcalloc (RTW89_SBAND_IFTYPES_NR ,sizeof (*iftype_data),GFP_KERNEL ); +if (!iftype_data) +return ; + +for (iftype =0 ; iftype <NUM_NL80211_IFTYPES ; iftype++) { +switch (iftype) {case NL80211_IFTYPE_STATION :case NL80211_IFTYPE_AP :break ;
@@ -3694,92 +3787,9 @@ static void rtw89_init_he_cap(struct rtw89_dev *rtwdev,break ; } - iftype_data[idx].types_mask =BIT (i); - he_cap = &iftype_data[idx].he_cap; - mac_cap_info = he_cap->he_cap_elem.mac_cap_info; - phy_cap_info = he_cap->he_cap_elem.phy_cap_info; - - he_cap->has_he = true; - mac_cap_info[0 ] =IEEE80211_HE_MAC_CAP0_HTC_HE ; -if (i ==NL80211_IFTYPE_STATION ) - mac_cap_info[1 ] =IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US ; - mac_cap_info[2 ] =IEEE80211_HE_MAC_CAP2_ALL_ACK | -IEEE80211_HE_MAC_CAP2_BSR ; - mac_cap_info[3 ] =IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2 ; -if (i ==NL80211_IFTYPE_AP ) - mac_cap_info[3 ] |=IEEE80211_HE_MAC_CAP3_OMI_CONTROL ; - mac_cap_info[4 ] =IEEE80211_HE_MAC_CAP4_OPS | -IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU ; -if (i ==NL80211_IFTYPE_STATION ) - mac_cap_info[5 ] =IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX ; -if (band ==NL80211_BAND_2GHZ ) { - phy_cap_info[0 ] = -IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G ; - }else { - phy_cap_info[0 ] = -IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G ; -if (chip->support_bw160) - phy_cap_info[0 ] |=IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G ; - } - phy_cap_info[1 ] =IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A | -IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD | -IEEE80211_HE_PHY_CAP1_HE_LTF_AND_GI_FOR_HE_PPDUS_0_8US ; - phy_cap_info[2 ] = IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US | -IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ | -IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ | -IEEE80211_HE_PHY_CAP2_DOPPLER_TX ; - phy_cap_info[3 ] =IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_16_QAM ; -if (i ==NL80211_IFTYPE_STATION ) - phy_cap_info[3 ] |=IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_16_QAM | -IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_2 ; -if (i ==NL80211_IFTYPE_AP ) - phy_cap_info[3 ] |=IEEE80211_HE_PHY_CAP3_RX_PARTIAL_BW_SU_IN_20MHZ_MU ; - phy_cap_info[4 ] =IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE | -IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4 ; -if (chip->support_bw160) - phy_cap_info[4 ] |=IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4 ; - phy_cap_info[5 ] = no_ng16 ?0 : -IEEE80211_HE_PHY_CAP5_NG16_SU_FEEDBACK | -IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK ; - phy_cap_info[6 ] =IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_42_SU | -IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU | -IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB | -IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE ; - phy_cap_info[7 ] =IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP | -IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI | -IEEE80211_HE_PHY_CAP7_MAX_NC_1 ; - phy_cap_info[8 ] =IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI | -IEEE80211_HE_PHY_CAP8_HE_ER_SU_1XLTF_AND_08_US_GI | -IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_996 ; -if (chip->support_bw160) - phy_cap_info[8 ] |=IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU | -IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU ; - phy_cap_info[9 ] =IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM | -IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU | -IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB | -IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB | -u8_encode_bits (IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US , -IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK ); -if (i ==NL80211_IFTYPE_STATION ) - phy_cap_info[9 ] |=IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU ; - he_cap->he_mcs_nss_supp.rx_mcs_80 =cpu_to_le16 (mcs_map); - he_cap->he_mcs_nss_supp.tx_mcs_80 =cpu_to_le16 (mcs_map); -if (chip->support_bw160) { - he_cap->he_mcs_nss_supp.rx_mcs_160 =cpu_to_le16 (mcs_map); - he_cap->he_mcs_nss_supp.tx_mcs_160 =cpu_to_le16 (mcs_map); - } + iftype_data[idx].types_mask =BIT (iftype); -if (band ==NL80211_BAND_6GHZ ) { -__le16 capa; - - capa =le16_encode_bits (IEEE80211_HT_MPDU_DENSITY_NONE , -IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START ) | -le16_encode_bits (IEEE80211_VHT_MAX_AMPDU_1024K , -IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP ) | -le16_encode_bits (IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 , -IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN ); - iftype_data[idx].he_6ghz_capa.capa = capa; - } +rtw89_init_he_cap (rtwdev, band, iftype, &iftype_data[idx]); idx++; }
@@ -3800,7 +3810,7 @@ static int rtw89_core_set_supported_band(struct rtw89_dev *rtwdev)if (!sband_2ghz) goto err;rtw89_init_ht_cap (rtwdev, &sband_2ghz->ht_cap); -rtw89_init_he_cap (rtwdev,NL80211_BAND_2GHZ , sband_2ghz); +rtw89_init_he_eht_cap (rtwdev,NL80211_BAND_2GHZ , sband_2ghz); hw->wiphy->bands[NL80211_BAND_2GHZ ] = sband_2ghz; }
@@ -3810,7 +3820,7 @@ static int rtw89_core_set_supported_band(struct rtw89_dev *rtwdev) goto err;rtw89_init_ht_cap (rtwdev, &sband_5ghz->ht_cap);rtw89_init_vht_cap (rtwdev, &sband_5ghz->vht_cap); -rtw89_init_he_cap (rtwdev,NL80211_BAND_5GHZ , sband_5ghz); +rtw89_init_he_eht_cap (rtwdev,NL80211_BAND_5GHZ , sband_5ghz); hw->wiphy->bands[NL80211_BAND_5GHZ ] = sband_5ghz; }
@@ -3818,7 +3828,7 @@ static int rtw89_core_set_supported_band(struct rtw89_dev *rtwdev) sband_6ghz =kmemdup (&rtw89_sband_6ghz, size,GFP_KERNEL );if (!sband_6ghz) goto err; -rtw89_init_he_cap (rtwdev,NL80211_BAND_6GHZ , sband_6ghz); +rtw89_init_he_eht_cap (rtwdev,NL80211_BAND_6GHZ , sband_6ghz); hw->wiphy->bands[NL80211_BAND_6GHZ ] = sband_6ghz; }
Signature · 1 line
2.25.1
Re: [PATCH 1/4] wifi: rtw89: adjust init_he_cap() to add EHT cap into iftype_data
Quoted 6 lines · Ping-Ke Shih
EHT capabilities are also stored in struct
ieee80211_sband_iftype_data, so adjust allocation ofiftype_dataas common part namedinit_he_eht_cap(), and theninit_eht_cap()can be added later. Don't change logic at all by this patch.Signed-off-by Ping-Ke Shih <[email protected]>
4 patches applied to wireless-next.git, thanks.
c19443700370 wifi: rtw89: adjust init_he_cap() to add EHT cap into iftype_data c5bdcddaa32c wifi: rtw89: change supported bandwidths of chip_info to bit mask 9156181f6274 wifi: rtw89: add EHT capabilities for WiFi 7 chips 4f47e0cf1a84 wifi: rtw89: declare EXT NSS BW of VHT capability
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Ping-Ke Shih
maintainerPATCH 2/4 wifi: rtw89: change supported bandwidths of chip_info to bit mask
In reply to Ping-Ke ShihBasically, all chips can support 20/40/80MHz bandwidth, and 8952C can support 160MHz bandwidth, which is why we introduced support_bw160 before. The coming WiFi 7 chips will support 320MHz optionally, so change it to bit mask instead of adding another support_bw320.
--- drivers/net/wireless/realtek/rtw89/core.c | 13 +++++++------ drivers/net/wireless/realtek/rtw89/core.h | 2 +- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 4 +++- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 4 +++- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 4 +++- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 5 ++++- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 4 ++++ 7 files changed, 25 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +7 -6
@@ -3611,7 +3611,8 @@ static void rtw89_init_vht_cap(struct rtw89_dev *rtwdev, cpu_to_le16(867), cpu_to_le16(1733), cpu_to_le16(2600), cpu_to_le16(3467), };const struct rtw89_chip_info *chip = rtwdev->chip; -const __le16 *highest = chip->support_bw160 ? highest_bw160 : highest_bw80; +const __le16 *highest = chip->support_bandwidths &BIT (NL80211_CHAN_WIDTH_160 ) ? + highest_bw160 : highest_bw80;struct rtw89_hal *hal = &rtwdev->hal;u16 tx_mcs_map =0 , rx_mcs_map =0 ;u8 sts_cap =3 ;
@@ -3640,7 +3641,7 @@ static void rtw89_init_vht_cap(struct rtw89_dev *rtwdev, vht_cap->cap |=IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE |IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE ; vht_cap->cap |= sts_cap <<IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT ; -if (chip->support_bw160) +if (chip->support_bandwidths &BIT (NL80211_CHAN_WIDTH_160 )) vht_cap->cap |=IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ |IEEE80211_VHT_CAP_SHORT_GI_160 ; vht_cap->vht_mcs.rx_mcs_map =cpu_to_le16 (rx_mcs_map);
@@ -3695,7 +3696,7 @@ static void rtw89_init_he_cap(struct rtw89_dev *rtwdev, }else { phy_cap_info[0 ] =IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G ; -if (chip->support_bw160) +if (chip->support_bandwidths &BIT (NL80211_CHAN_WIDTH_160 )) phy_cap_info[0 ] |=IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G ; } phy_cap_info[1] = IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |
@@ -3713,7 +3714,7 @@ static void rtw89_init_he_cap(struct rtw89_dev *rtwdev, phy_cap_info[3 ] |=IEEE80211_HE_PHY_CAP3_RX_PARTIAL_BW_SU_IN_20MHZ_MU ; phy_cap_info[4 ] =IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4 ; -if (chip->support_bw160) +if (chip->support_bandwidths &BIT (NL80211_CHAN_WIDTH_160 )) phy_cap_info[4 ] |=IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4 ; phy_cap_info[5 ] = no_ng16 ?0 : IEEE80211_HE_PHY_CAP5_NG16_SU_FEEDBACK |
@@ -3728,7 +3729,7 @@ static void rtw89_init_he_cap(struct rtw89_dev *rtwdev, phy_cap_info[8 ] =IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI |IEEE80211_HE_PHY_CAP8_HE_ER_SU_1XLTF_AND_08_US_GI |IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_996 ; -if (chip->support_bw160) +if (chip->support_bandwidths &BIT (NL80211_CHAN_WIDTH_160 )) phy_cap_info[8 ] |=IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU ; phy_cap_info[9] = IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM |
@@ -3741,7 +3742,7 @@ static void rtw89_init_he_cap(struct rtw89_dev *rtwdev, phy_cap_info[9 ] |=IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU ; he_cap->he_mcs_nss_supp.rx_mcs_80 =cpu_to_le16 (mcs_map); he_cap->he_mcs_nss_supp.tx_mcs_80 =cpu_to_le16 (mcs_map); -if (chip->support_bw160) { +if (chip->support_bandwidths &BIT (NL80211_CHAN_WIDTH_160 )) { he_cap->he_mcs_nss_supp.rx_mcs_160 =cpu_to_le16 (mcs_map); he_cap->he_mcs_nss_supp.tx_mcs_160 =cpu_to_le16 (mcs_map); }
drivers/net/wireless/realtek/rtw89/core.h +1 -1
@@ -3714,7 +3714,7 @@ struct rtw89_chip_info {u32 rf_base_addr[2 ];u8 support_chanctx_num;u8 support_bands; -bool support_bw160; +u16 support_bandwidths;bool support_unii4;bool ul_tb_waveform_ctrl;bool ul_tb_pwr_diff;
drivers/net/wireless/realtek/rtw89/rtw8851b.c +3 -1
@@ -2394,7 +2394,9 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .support_chanctx_num = 0, .support_bands =BIT (NL80211_BAND_2GHZ ) | BIT(NL80211_BAND_5GHZ), - .support_bw160 = false, + .support_bandwidths =BIT (NL80211_CHAN_WIDTH_20 ) | +BIT (NL80211_CHAN_WIDTH_40 ) | + BIT(NL80211_CHAN_WIDTH_80), .support_unii4 = true, .ul_tb_waveform_ctrl = true, .ul_tb_pwr_diff = false,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +3 -1
@@ -2130,7 +2130,9 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .support_chanctx_num = 1, .support_bands =BIT (NL80211_BAND_2GHZ ) | BIT(NL80211_BAND_5GHZ), - .support_bw160 = false, + .support_bandwidths =BIT (NL80211_CHAN_WIDTH_20 ) | +BIT (NL80211_CHAN_WIDTH_40 ) | + BIT(NL80211_CHAN_WIDTH_80), .support_unii4 = false, .ul_tb_waveform_ctrl = false, .ul_tb_pwr_diff = false,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +3 -1
@@ -2564,7 +2564,9 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .support_chanctx_num = 0, .support_bands =BIT (NL80211_BAND_2GHZ ) | BIT(NL80211_BAND_5GHZ), - .support_bw160 = false, + .support_bandwidths =BIT (NL80211_CHAN_WIDTH_20 ) | +BIT (NL80211_CHAN_WIDTH_40 ) | + BIT(NL80211_CHAN_WIDTH_80), .support_unii4 = true, .ul_tb_waveform_ctrl = true, .ul_tb_pwr_diff = false,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +4 -1
@@ -2902,7 +2902,10 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .support_bands = BIT(NL80211_BAND_2GHZ) |BIT (NL80211_BAND_5GHZ ) | BIT(NL80211_BAND_6GHZ), - .support_bw160 = true, + .support_bandwidths =BIT (NL80211_CHAN_WIDTH_20 ) | +BIT (NL80211_CHAN_WIDTH_40 ) | +BIT (NL80211_CHAN_WIDTH_80 ) | + BIT(NL80211_CHAN_WIDTH_160), .support_unii4 = true, .ul_tb_waveform_ctrl = false, .ul_tb_pwr_diff = true,
drivers/net/wireless/realtek/rtw89/rtw8922a.c +4 -0
@@ -864,6 +864,10 @@ const struct rtw89_chip_info rtw8922a_chip_info = { .support_bands = BIT(NL80211_BAND_2GHZ) |BIT (NL80211_BAND_5GHZ ) | BIT(NL80211_BAND_6GHZ), + .support_bandwidths =BIT (NL80211_CHAN_WIDTH_20 ) | +BIT (NL80211_CHAN_WIDTH_40 ) | +BIT (NL80211_CHAN_WIDTH_80 ) | + BIT(NL80211_CHAN_WIDTH_160), .support_unii4 = true, .ul_tb_waveform_ctrl = false, .ul_tb_pwr_diff = false,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/4 wifi: rtw89: add EHT capabilities for WiFi 7 chips
In reply to Ping-Ke ShihThe coming WiFi 7 chip 8922A will support EHT, so declare EHT along with hardware capabilities.
--- drivers/net/wireless/realtek/rtw89/core.c | 90 +++++++++++++++++++++++ 1 file changed, 90 insertions(+)
drivers/net/wireless/realtek/rtw89/core.c +90 -0
@@ -3760,6 +3760,95 @@ static void rtw89_init_he_cap(struct rtw89_dev *rtwdev, } } +static void rtw89_init_eht_cap (struct rtw89_dev *rtwdev, +enum nl80211_band band, +enum nl80211_iftype iftype, +struct ieee80211_sband_iftype_data *iftype_data) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; +struct ieee80211_eht_cap_elem_fixed *eht_cap_elem; +struct ieee80211_eht_mcs_nss_supp *eht_nss; +struct ieee80211_sta_eht_cap *eht_cap; +struct rtw89_hal *hal = &rtwdev->hal; +bool support_320mhz = false; +int sts =3 ; +u8 val; + +if (chip->chip_gen ==RTW89_CHIP_AX ) +return ; + +if (band ==NL80211_BAND_6GHZ && + chip->support_bandwidths &BIT (NL80211_CHAN_WIDTH_320 )) + support_320mhz = true; + + eht_cap = &iftype_data->eht_cap; + eht_cap_elem = &eht_cap->eht_cap_elem; + eht_nss = &eht_cap->eht_mcs_nss_supp; + + eht_cap->has_eht = true; + + eht_cap_elem->mac_cap_info[0 ] = +u8_encode_bits (IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_7991 , +IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK ); + eht_cap_elem->mac_cap_info[1 ] =0 ; + + eht_cap_elem->phy_cap_info[0 ] = +IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI | +IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE ; +if (support_320mhz) + eht_cap_elem->phy_cap_info[0 ] |= +IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ ; + + eht_cap_elem->phy_cap_info[0 ] |= +u8_encode_bits (u8_get_bits (sts -1 ,BIT (0 )), +IEEE80211_EHT_PHY_CAP0_BEAMFORMEE_SS_80MHZ_MASK ); + eht_cap_elem->phy_cap_info[1 ] = +u8_encode_bits (u8_get_bits (sts -1 ,GENMASK (2 ,1 )), +IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_80MHZ_MASK ) | +u8_encode_bits (sts -1 , +IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_160MHZ_MASK ); +if (support_320mhz) + eht_cap_elem->phy_cap_info[1 ] |= +u8_encode_bits (sts -1 , +IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_320MHZ_MASK ); + + eht_cap_elem->phy_cap_info[2 ] =0 ; + + eht_cap_elem->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_CQI_FDBK ; + + eht_cap_elem->phy_cap_info[4 ] = +IEEE80211_EHT_PHY_CAP4_POWER_BOOST_FACT_SUPP | +u8_encode_bits (1 ,IEEE80211_EHT_PHY_CAP4_MAX_NC_MASK ); + + eht_cap_elem->phy_cap_info[5 ] = +IEEE80211_EHT_PHY_CAP5_NON_TRIG_CQI_FEEDBACK | +u8_encode_bits (IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_20US , +IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK ); + + eht_cap_elem->phy_cap_info[6 ] =0 ; + eht_cap_elem->phy_cap_info[7 ] =0 ; + eht_cap_elem->phy_cap_info[8 ] =0 ; + + val =u8_encode_bits (hal->rx_nss,IEEE80211_EHT_MCS_NSS_RX ) | +u8_encode_bits (hal->tx_nss,IEEE80211_EHT_MCS_NSS_TX ); + eht_nss->bw._80.rx_tx_mcs9_max_nss = val; + eht_nss->bw._80.rx_tx_mcs11_max_nss = val; + eht_nss->bw._80.rx_tx_mcs13_max_nss = val; + eht_nss->bw._160.rx_tx_mcs9_max_nss = val; + eht_nss->bw._160.rx_tx_mcs11_max_nss = val; + eht_nss->bw._160.rx_tx_mcs13_max_nss = val; +if (support_320mhz) { + eht_nss->bw._320.rx_tx_mcs9_max_nss = val; + eht_nss->bw._320.rx_tx_mcs11_max_nss = val; + eht_nss->bw._320.rx_tx_mcs13_max_nss = val; + } +} +#define RTW89_SBAND_IFTYPES_NR 2 static void rtw89_init_he_eht_cap(struct rtw89_dev *rtwdev,
@@ -3791,6 +3880,7 @@ static void rtw89_init_he_eht_cap(struct rtw89_dev *rtwdev, iftype_data[idx].types_mask =BIT (iftype);rtw89_init_he_cap (rtwdev, band, iftype, &iftype_data[idx]); +rtw89_init_eht_cap (rtwdev, band, iftype, &iftype_data[idx]); idx++; }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/4 wifi: rtw89: declare EXT NSS BW of VHT capability
In reply to Ping-Ke ShihAccording to IEEE Std. 802.11, it defines:
Indicates whether the STA is capable of interpreting the Extended NSS BW Support subfield of the VHT Capabilities Information field.
Some AP such as TP-LINK BE19000 would check it for bandwidth settings, so causes 80MHz rate when associating on 160 MHz bandwidth. Declare this capability to yield expected result.
--- drivers/net/wireless/realtek/rtw89/core.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/realtek/rtw89/core.c +8 -0
@@ -3648,6 +3648,10 @@ static void rtw89_init_vht_cap(struct rtw89_dev *rtwdev, vht_cap->vht_mcs.tx_mcs_map =cpu_to_le16 (tx_mcs_map); vht_cap->vht_mcs.rx_highest = highest[hal->rx_nss -1 ]; vht_cap->vht_mcs.tx_highest = highest[hal->tx_nss -1 ]; + +if (ieee80211_hw_check (rtwdev->hw,SUPPORTS_VHT_EXT_NSS_BW )) + vht_cap->vht_mcs.tx_highest |= +cpu_to_le16 (IEEE80211_VHT_EXT_NSS_BW_CAPABLE ); } static void rtw89_init_he_cap(struct rtw89_dev *rtwdev,
@@ -4391,6 +4395,7 @@ EXPORT_SYMBOL(rtw89_chip_info_setup);static int rtw89_core_register_hw (struct rtw89_dev *rtwdev) { +const struct rtw89_chip_info *chip = rtwdev->chip;struct ieee80211_hw *hw = rtwdev->hw;struct rtw89_efuse *efuse = &rtwdev->efuse;struct rtw89_hal *hal = &rtwdev->hal;
@@ -4428,6 +4433,9 @@ static int rtw89_core_register_hw(struct rtw89_dev *rtwdev)/* ref: description of rtw89_mcc_get_tbtt_ofst() in chan.c */ ieee80211_hw_set (hw,TIMING_BEACON_ONLY ); +if (chip->support_bandwidths &BIT (NL80211_CHAN_WIDTH_160 )) +ieee80211_hw_set (hw,SUPPORTS_VHT_EXT_NSS_BW ); +if (RTW89_CHK_FW_FEATURE (BEACON_FILTER , &rtwdev->fw))ieee80211_hw_set (hw,CONNECTION_MONITOR );
Signature · 1 line
2.25.1