OSDN Git Service

wifi: mt76: add EHT phy type
authorShayne Chen <shayne.chen@mediatek.com>
Tue, 31 Jan 2023 09:35:59 +0000 (17:35 +0800)
committerFelix Fietkau <nbd@nbd.name>
Fri, 3 Feb 2023 13:47:27 +0000 (14:47 +0100)
Extend phy type and phymode bitfields for EHT support.
This is the preliminary patch to add EHT support for mt7996.

Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt76.h
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h

index a82b862..9e1588f 100644 (file)
@@ -264,11 +264,14 @@ enum mt76_phy_type {
        MT_PHY_TYPE_HE_EXT_SU,
        MT_PHY_TYPE_HE_TB,
        MT_PHY_TYPE_HE_MU,
-       __MT_PHY_TYPE_HE_MAX,
+       MT_PHY_TYPE_EHT_SU = 13,
+       MT_PHY_TYPE_EHT_TRIG,
+       MT_PHY_TYPE_EHT_MU,
+       __MT_PHY_TYPE_MAX,
 };
 
 struct mt76_sta_stats {
-       u64 tx_mode[__MT_PHY_TYPE_HE_MAX];
+       u64 tx_mode[__MT_PHY_TYPE_MAX];
        u64 tx_bw[4];           /* 20, 40, 80, 160 */
        u64 tx_nss[4];          /* 1, 2, 3, 4 */
        u64 tx_mcs[16];         /* mcs idx */
index bb92216..ebd64be 100644 (file)
@@ -882,12 +882,16 @@ enum {
 #define PHY_MODE_AX_5G                         BIT(7)
 
 #define PHY_MODE_AX_6G                         BIT(0) /* phymode_ext */
+#define PHY_MODE_BE_24G                                BIT(1)
+#define PHY_MODE_BE_5G                         BIT(2)
+#define PHY_MODE_BE_6G                         BIT(3)
 
 #define MODE_CCK                               BIT(0)
 #define MODE_OFDM                              BIT(1)
 #define MODE_HT                                        BIT(2)
 #define MODE_VHT                               BIT(3)
 #define MODE_HE                                        BIT(4)
+#define MODE_EHT                               BIT(5)
 
 #define STA_CAP_WMM                            BIT(0)
 #define STA_CAP_SGI_20                         BIT(4)