mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 10:32:35 +00:00
rtw89: declare if chip support 160M bandwidth
The new chip can support 160M, so add a chip attribute to indicate the chip support it. Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> Signed-off-by: Kalle Valo <kvalo@kernel.org> Link: https://lore.kernel.org/r/20220211075953.40421-6-pkshih@realtek.com
This commit is contained in:
parent
f76b327606
commit
d221270af3
@ -2236,9 +2236,14 @@ static void rtw89_init_ht_cap(struct rtw89_dev *rtwdev,
|
||||
static void rtw89_init_vht_cap(struct rtw89_dev *rtwdev,
|
||||
struct ieee80211_sta_vht_cap *vht_cap)
|
||||
{
|
||||
static const __le16 highest[RF_PATH_MAX] = {
|
||||
static const __le16 highest_bw80[RF_PATH_MAX] = {
|
||||
cpu_to_le16(433), cpu_to_le16(867), cpu_to_le16(1300), cpu_to_le16(1733),
|
||||
};
|
||||
static const __le16 highest_bw160[RF_PATH_MAX] = {
|
||||
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;
|
||||
struct rtw89_hal *hal = &rtwdev->hal;
|
||||
u16 tx_mcs_map = 0, rx_mcs_map = 0;
|
||||
u8 sts_cap = 3;
|
||||
@ -2267,6 +2272,9 @@ 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)
|
||||
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);
|
||||
vht_cap->vht_mcs.tx_mcs_map = cpu_to_le16(tx_mcs_map);
|
||||
vht_cap->vht_mcs.rx_highest = highest[hal->rx_nss - 1];
|
||||
@ -2339,6 +2347,8 @@ static void rtw89_init_he_cap(struct rtw89_dev *rtwdev,
|
||||
mac_cap_info[5] = IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX;
|
||||
phy_cap_info[0] = IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G |
|
||||
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;
|
||||
@ -2367,6 +2377,9 @@ 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)
|
||||
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 |
|
||||
@ -2377,6 +2390,10 @@ 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) {
|
||||
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);
|
||||
}
|
||||
|
||||
idx++;
|
||||
}
|
||||
|
@ -2218,6 +2218,7 @@ struct rtw89_chip_info {
|
||||
const struct rtw89_dle_mem *dle_mem;
|
||||
u32 rf_base_addr[2];
|
||||
u8 support_bands;
|
||||
bool support_bw160;
|
||||
u8 rf_path_num;
|
||||
u8 tx_nss;
|
||||
u8 rx_nss;
|
||||
|
@ -2024,6 +2024,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = {
|
||||
.dig_table = &rtw89_8852a_phy_dig_table,
|
||||
.support_bands = BIT(NL80211_BAND_2GHZ) |
|
||||
BIT(NL80211_BAND_5GHZ),
|
||||
.support_bw160 = false,
|
||||
.rf_path_num = 2,
|
||||
.tx_nss = 2,
|
||||
.rx_nss = 2,
|
||||
|
Loading…
Reference in New Issue
Block a user