mt76: connac: set 6G phymode in mt76_connac_get_phy_mode{,v2}

This is a preliminary patch to support 6GHz band on mt7921 devices.

Tested-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index 9c0f86eefd75e5630658857db9df1f619c7f03d7..8b72ed77881cab9a155dac9706e6cd4dadee38f8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -691,7 +691,7 @@ mt76_connac_get_phy_mode_v2(struct mt76_phy *mphy, struct ieee80211_vif *vif,
 
                if (he_cap->has_he)
                        mode |= PHY_TYPE_BIT_HE;
-       } else if (band == NL80211_BAND_5GHZ) {
+       } else if (band == NL80211_BAND_5GHZ || band == NL80211_BAND_6GHZ) {
                mode |= PHY_TYPE_BIT_OFDM;
 
                if (ht_cap->ht_supported)
@@ -1154,7 +1154,7 @@ mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif,
 
                if (he_cap->has_he)
                        mode |= PHY_MODE_AX_24G;
-       } else if (band == NL80211_BAND_5GHZ) {
+       } else if (band == NL80211_BAND_5GHZ || band == NL80211_BAND_6GHZ) {
                mode |= PHY_MODE_A;
 
                if (ht_cap->ht_supported)
@@ -1163,8 +1163,12 @@ mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif,
                if (vht_cap->vht_supported)
                        mode |= PHY_MODE_AC;
 
-               if (he_cap->has_he)
-                       mode |= PHY_MODE_AX_5G;
+               if (he_cap->has_he) {
+                       if (band == NL80211_BAND_6GHZ)
+                               mode |= PHY_MODE_AX_6G;
+                       else
+                               mode |= PHY_MODE_AX_5G;
+               }
        }
 
        return mode;