mt76: mt7921: introduce 160 MHz channel bandwidth support

Introduce the basic configuration for BW160 capability in 7922

Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
index 210998f..b23067a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
@@ -264,6 +264,10 @@ int mt7921_register_device(struct mt7921_dev *dev)
                        IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |
                        IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE |
                        (3 << IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT);
+       if (is_mt7922(&dev->mt76))
+               dev->mphy.sband_5g.sband.vht_cap.cap |=
+                       IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ |
+                       IEEE80211_VHT_CAP_SHORT_GI_160;
 
        dev->mphy.hw->wiphy->available_antennas_rx = dev->mphy.chainmask;
        dev->mphy.hw->wiphy->available_antennas_tx = dev->mphy.chainmask;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index b144f54..46d805d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -128,11 +128,23 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band,
                                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;
+
+                       if (is_mt7922(phy->mt76->dev)) {
+                               he_cap_elem->phy_cap_info[0] |=
+                                       IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;
+                               he_cap_elem->phy_cap_info[8] |=
+                                       IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |
+                                       IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU;
+                       }
                        break;
                }
 
                he_mcs->rx_mcs_80 = cpu_to_le16(mcs_map);
                he_mcs->tx_mcs_80 = cpu_to_le16(mcs_map);
+               if (is_mt7922(phy->mt76->dev)) {
+                       he_mcs->rx_mcs_160 = cpu_to_le16(mcs_map);
+                       he_mcs->tx_mcs_160 = cpu_to_le16(mcs_map);
+               }
 
                memset(he_cap->ppe_thres, 0, sizeof(he_cap->ppe_thres));
                if (he_cap_elem->phy_cap_info[6] &