Add EHT support for mt7996
Subsystems (2)
Shayne Chen
reviewerv2 cover Add EHT support for mt7996
This series adds initial EHT support for mt7996 driver, which currently covers features of EHT SU mode. More EHT features are work in progress and will be introduced in further patches.
This series is based on the following series:
- wifi: mt76: mt7996: fix chainmask calculation in mt7996_set_antenna()
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/
v2:
- add eth param to mt76_ethtool_worker() to prevent from breaking HE stats
MeiChia Chiu (1):
wifi: mt76: mt7996: add EHT beamforming support
Shayne Chen (12):
wifi: mt76: add EHT phy type
wifi: mt76: connac: add CMD_CBW_320MHZ
wifi: mt76: connac: add helpers for EHT capability
wifi: mt76: connac: add cmd id related to EHT support
wifi: mt76: increase wcid size to 1088
wifi: mt76: add EHT rate stats for ethtool
wifi: mt76: mt7996: add variants support
wifi: mt76: mt7996: add helpers for wtbl and interface limit
wifi: mt76: mt7996: rework capability init
wifi: mt76: mt7996: add EHT capability init
wifi: mt76: mt7996: add support for EHT rate report
wifi: mt76: mt7996: enable EHT support in firmware
drivers/net/wireless/mediatek/mt76/mac80211.c | 11 +- drivers/net/wireless/mediatek/mt76/mt76.h | 13 +- .../net/wireless/mediatek/mt76/mt76_connac.h | 2 + .../wireless/mediatek/mt76/mt76_connac_mcu.c | 46 ++ .../wireless/mediatek/mt76/mt76_connac_mcu.h | 12 +- .../net/wireless/mediatek/mt76/mt7915/main.c | 2 +- .../net/wireless/mediatek/mt76/mt7921/main.c | 2 +- .../wireless/mediatek/mt76/mt7996/debugfs.c | 8 +- .../wireless/mediatek/mt76/mt7996/eeprom.c | 27 ++ .../net/wireless/mediatek/mt76/mt7996/init.c | 400 +++++++++++------- .../net/wireless/mediatek/mt76/mt7996/mac.c | 36 +- .../net/wireless/mediatek/mt76/mt7996/main.c | 12 +- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 186 +++++++- .../net/wireless/mediatek/mt76/mt7996/mcu.h | 16 + .../wireless/mediatek/mt76/mt7996/mt7996.h | 25 +- 15 files changed, 603 insertions(+), 195 deletions(-)
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH v2 1/13 wifi: mt76: add EHT phy type
Extend phy type and phymode bitfields for EHT support. This is the preliminary patch to add EHT support for mt7996.
--- drivers/net/wireless/mediatek/mt76/mt76.h | 7 +++++-- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +5 -2
@@ -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 */
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +4 -0
@@ -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)
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH v2 2/13 wifi: mt76: connac: add CMD_CBW_320MHZ
In reply to Shayne ChenAdd CMD_CBW_320MHZ for setting bandwidth 320 MHz to firmware. This is the preliminary patch to add EHT support for mt7996.
--- drivers/net/wireless/mediatek/mt76/mt76_connac.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/mediatek/mt76/mt76_connac.h +2 -0
@@ -42,6 +42,7 @@ enum {CMD_CBW_10MHZ ,CMD_CBW_5MHZ ,CMD_CBW_8080MHZ , +CMD_CBW_320MHZ ,CMD_HE_MCS_BW80 =0 , CMD_HE_MCS_BW160,
@@ -239,6 +240,7 @@ static inline u8 mt76_connac_chan_bw(struct cfg80211_chan_def *chandef) [NL80211_CHAN_WIDTH_10] = CMD_CBW_10MHZ, [NL80211_CHAN_WIDTH_20] = CMD_CBW_20MHZ, [NL80211_CHAN_WIDTH_20_NOHT] = CMD_CBW_20MHZ, + [NL80211_CHAN_WIDTH_320] = CMD_CBW_320MHZ, };if (chandef->width >=ARRAY_SIZE (width_to_bw))
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH v2 3/13 wifi: mt76: connac: add helpers for EHT capability
In reply to Shayne ChenAdd helpers to get eht cap and phymode on different bands and vifs. This is the preliminary patch to add EHT support for mt7996.
--- .../wireless/mediatek/mt76/mt76_connac_mcu.c | 46 +++++++++++++++++++ .../wireless/mediatek/mt76/mt76_connac_mcu.h | 4 ++ 2 files changed, 50 insertions(+)
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +46 -0
@@ -1329,6 +1329,40 @@ u8 mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif, }EXPORT_SYMBOL_GPL (mt76_connac_get_phy_mode); +u8 mt76_connac_get_phy_mode_ext (struct mt76_phy *phy,struct ieee80211_vif *vif, +enum nl80211_band band) +{ +const struct ieee80211_sta_eht_cap *eht_cap; +struct ieee80211_supported_band *sband; +u8 mode =0 ; + +if (band ==NL80211_BAND_6GHZ ) + mode |=PHY_MODE_AX_6G ; + + sband = phy->hw->wiphy->bands[band]; + eht_cap =ieee80211_get_eht_iftype_cap (sband, vif->type); + +if (!eht_cap || !eht_cap->has_eht) +return mode; + +switch (band) { +case NL80211_BAND_6GHZ : + mode |=PHY_MODE_BE_6G ; +break ; +case NL80211_BAND_5GHZ : + mode |=PHY_MODE_BE_5G ; +break ; +case NL80211_BAND_2GHZ : + mode |=PHY_MODE_BE_24G ; +break ; +default : +break ; + } + +return mode; +} +EXPORT_SYMBOL_GPL (mt76_connac_get_phy_mode_ext); +const struct ieee80211_sta_he_cap *mt76_connac_get_he_phy_cap (struct mt76_phy *phy,struct ieee80211_vif *vif) {
@@ -1341,6 +1375,18 @@ mt76_connac_get_he_phy_cap(struct mt76_phy *phy, struct ieee80211_vif *vif) }EXPORT_SYMBOL_GPL (mt76_connac_get_he_phy_cap); +const struct ieee80211_sta_eht_cap * +mt76_connac_get_eht_phy_cap (struct mt76_phy *phy,struct ieee80211_vif *vif) +{ +enum nl80211_band band = phy->chandef.chan->band; +struct ieee80211_supported_band *sband; + + sband = phy->hw->wiphy->bands[band]; + +return ieee80211_get_eht_iftype_cap (sband, vif->type); +} +EXPORT_SYMBOL_GPL (mt76_connac_get_eht_phy_cap); +#define DEFAULT_HE_PE_DURATION 4#define DEFAULT_HE_DURATION_RTS_THRES 1023 static void
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +4 -0
@@ -1872,8 +1872,12 @@ void mt76_connac_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val);const struct ieee80211_sta_he_cap *mt76_connac_get_he_phy_cap (struct mt76_phy *phy,struct ieee80211_vif *vif); +const struct ieee80211_sta_eht_cap * +mt76_connac_get_eht_phy_cap (struct mt76_phy *phy,struct ieee80211_vif *vif);u8 mt76_connac_get_phy_mode (struct mt76_phy *phy,struct ieee80211_vif *vif,enum nl80211_band band,struct ieee80211_sta *sta); +u8 mt76_connac_get_phy_mode_ext (struct mt76_phy *phy,struct ieee80211_vif *vif, +enum nl80211_band band); int mt76_connac_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif, struct mt76_connac_sta_key_conf *sta_key_conf,
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH v2 4/13 wifi: mt76: connac: add cmd id related to EHT support
In reply to Shayne ChenThis is the preliminary patch to add EHT support for mt7996.
--- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +2 -0
@@ -793,6 +793,7 @@ enum {STA_REC_PHY =0x15 ,STA_REC_HE_6G =0x17 ,STA_REC_HE_V2 =0x19 , +STA_REC_EHT =0x22 ,STA_REC_HDRT =0x28 ,STA_REC_HDR_TRANS =0x2B ,STA_REC_MAX_NUM
@@ -1203,6 +1204,7 @@ enum {MCU_UNI_CMD_REPT_MUAR =0x09 ,MCU_UNI_CMD_WSYS_CONFIG =0x0b ,MCU_UNI_CMD_REG_ACCESS =0x0d , +MCU_UNI_CMD_CHIP_CONFIG =0x0e ,MCU_UNI_CMD_POWER_CTRL =0x0f ,MCU_UNI_CMD_RX_HDR_TRANS =0x12 , MCU_UNI_CMD_SER = 0x13,
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH v2 5/13 wifi: mt76: increase wcid size to 1088
In reply to Shayne ChenIncrease wcid size to support up to 1024 station hw entries and 64 bcast/mcast hw entries.
This is the preliminary patch to add EHT support for mt7996.
--- drivers/net/wireless/mediatek/mt76/mt76.h | 2 +- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +1 -1
@@ -294,7 +294,7 @@ enum mt76_wcid_flags { MT_WCID_FLAG_HDR_TRANS, }; -#define MT76_N_WCIDS 544 +#define MT76_N_WCIDS 1088/* stored in ieee80211_tx_info::hw_queue */ #define MT_TX_HW_QUEUE_PHY GENMASK(3, 2)
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +1 -1
@@ -1738,7 +1738,7 @@ mt76_connac_mcu_gen_dl_mode(struct mt76_dev *dev, u8 feature_set, bool is_wa) }#define to_wcid_lo (id) FIELD_GET(GENMASK(7, 0), (u16)id) -#define to_wcid_hi (id) FIELD_GET(GENMASK(9, 8), (u16)id) +#define to_wcid_hi (id) FIELD_GET(GENMASK(10, 8), (u16)id) static inline void mt76_connac_mcu_get_wlan_idx(struct mt76_dev *dev, struct mt76_wcid *wcid,
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH v2 6/13 wifi: mt76: add EHT rate stats for ethtool
In reply to Shayne ChenAdd support to get EHT rate stats from ethtool. This is the preliminary patch to add EHT support for mt7996.
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 11 ++++++++--- drivers/net/wireless/mediatek/mt76/mt76.h | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7915/main.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7921/main.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7996/main.c | 8 +++++++- 5 files changed, 19 insertions(+), 8 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +8 -3
@@ -1700,7 +1700,7 @@ u16 mt76_calculate_default_rate(struct mt76_phy *phy, int rateidx)EXPORT_SYMBOL_GPL (mt76_calculate_default_rate);void mt76_ethtool_worker (struct mt76_ethtool_worker_info *wi, -struct mt76_sta_stats *stats) +struct mt76_sta_stats *stats,bool eht) {int i, ei = wi->initial_stat_idx;u64 *data = wi->data;
@@ -1716,11 +1716,16 @@ void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi, data[ei++] += stats->tx_mode[MT_PHY_TYPE_HE_EXT_SU ]; data[ei++] += stats->tx_mode[MT_PHY_TYPE_HE_TB ]; data[ei++] += stats->tx_mode[MT_PHY_TYPE_HE_MU ]; +if (eht) { + data[ei++] += stats->tx_mode[MT_PHY_TYPE_EHT_SU ]; + data[ei++] += stats->tx_mode[MT_PHY_TYPE_EHT_TRIG ]; + data[ei++] += stats->tx_mode[MT_PHY_TYPE_EHT_MU ]; + } -for (i =0 ; i <ARRAY_SIZE (stats->tx_bw); i++) +for (i =0 ; i < (ARRAY_SIZE (stats->tx_bw) - !eht); i++) data[ei++] += stats->tx_bw[i]; -for (i =0 ; i <12 ; i++) +for (i =0 ; i < (eht ?14 :12 ); i++) data[ei++] += stats->tx_mcs[i]; wi->worker_stat_count = ei - wi->initial_stat_idx;
drivers/net/wireless/mediatek/mt76/mt76.h +2 -2
@@ -272,7 +272,7 @@ enum mt76_phy_type {struct mt76_sta_stats {u64 tx_mode[__MT_PHY_TYPE_MAX]; -u64 tx_bw[4 ];/* 20, 40, 80, 160 */ +u64 tx_bw[5 ];/* 20, 40, 80, 160, 320 */ u64 tx_nss[4 ];/* 1, 2, 3, 4 */ u64 tx_mcs[16 ];/* mcs idx */ u64 tx_bytes;
@@ -1318,7 +1318,7 @@ mt76u_bulk_msg(struct mt76_dev *dev, void *data, int len, int *actual_len,void mt76_ethtool_page_pool_stats (struct mt76_dev *dev,u64 *data,int *index);void mt76_ethtool_worker (struct mt76_ethtool_worker_info *wi, -struct mt76_sta_stats *stats); +struct mt76_sta_stats *stats,bool eht);int mt76_skb_adjust_pad (struct sk_buff *skb,int pad);int __mt76u_vendor_request (struct mt76_dev *dev,u8 req,u8 req_type,u16 val,u16 offset,void *buf,size_t len);
drivers/net/wireless/mediatek/mt76/mt7915/main.c +1 -1
@@ -1317,7 +1317,7 @@ static void mt7915_ethtool_worker(void *wi_data, struct ieee80211_sta *sta)if (msta->vif->mt76.idx != wi->idx)return ; -mt76_ethtool_worker (wi, &msta->wcid.stats); +mt76_ethtool_worker (wi, &msta->wcid.stats, false); } static
drivers/net/wireless/mediatek/mt76/mt7921/main.c +1 -1
@@ -1129,7 +1129,7 @@ mt7921_ethtool_worker(void *wi_data, struct ieee80211_sta *sta)if (msta->vif->mt76.idx != wi->idx)return ; -mt76_ethtool_worker (wi, &msta->wcid.stats); +mt76_ethtool_worker (wi, &msta->wcid.stats, false); } static
drivers/net/wireless/mediatek/mt76/mt7996/main.c +7 -1
@@ -1084,10 +1084,14 @@ static const char mt7996_gstrings_stats[][ETH_GSTRING_LEN] = {"v_tx_mode_he_ext_su" ,"v_tx_mode_he_tb" ,"v_tx_mode_he_mu" , +"v_tx_mode_eht_su" , +"v_tx_mode_eht_trig" , +"v_tx_mode_eht_mu" ,"v_tx_bw_20" ,"v_tx_bw_40" ,"v_tx_bw_80" ,"v_tx_bw_160" , +"v_tx_bw_320" ,"v_tx_mcs_0" ,"v_tx_mcs_1" , "v_tx_mcs_2",
@@ -1100,6 +1104,8 @@ static const char mt7996_gstrings_stats[][ETH_GSTRING_LEN] = {"v_tx_mcs_9" ,"v_tx_mcs_10" ,"v_tx_mcs_11" , +"v_tx_mcs_12" , + "v_tx_mcs_13", };#define MT7996_SSTATS_LEN ARRAY_SIZE(mt7996_gstrings_stats)
@@ -1133,7 +1139,7 @@ static void mt7996_ethtool_worker(void *wi_data, struct ieee80211_sta *sta)if (msta->vif->mt76.idx != wi->idx)return ; -mt76_ethtool_worker (wi, &msta->stats); +mt76_ethtool_worker (wi, &msta->stats, true); } static
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH v2 7/13 wifi: mt76: mt7996: add variants support
In reply to Shayne ChenThere are variants of mt7996 which are different from eht supported and wtbl size limit. Get the hw caps with CHIP_CONFIG command.
--- .../wireless/mediatek/mt76/mt7996/eeprom.c | 27 +++++++++++ .../net/wireless/mediatek/mt76/mt7996/mcu.c | 46 +++++++++++++++++++ .../wireless/mediatek/mt76/mt7996/mt7996.h | 4 ++ 3 files changed, 77 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c +27 -0
@@ -87,6 +87,28 @@ static int mt7996_eeprom_load(struct mt7996_dev *dev)return mt7996_check_eeprom (dev); } +static int mt7996_eeprom_parse_efuse_hw_cap (struct mt7996_dev *dev) +{ +#define MODE_HE_ONLY BIT(0) +#define WTBL_SIZE_GROUP GENMASK(31, 28) +u32 cap =0 ; +int ret; + + ret =mt7996_mcu_get_chip_config (dev, &cap); +if (ret) +return ret; + +if (cap) { + dev->has_eht = !(cap &MODE_HE_ONLY ); + dev->wtbl_size_group =u32_get_bits (cap,WTBL_SIZE_GROUP ); + } + +if (dev->wtbl_size_group <2 || dev->wtbl_size_group >4 ) + dev->wtbl_size_group =2 ;/* set default */ + +return 0 ; +} +static int mt7996_eeprom_parse_band_config (struct mt7996_phy *phy) {u8 *eeprom = phy->dev->mt76.eeprom.data;
@@ -133,6 +155,7 @@ int mt7996_eeprom_parse_hw_cap(struct mt7996_dev *dev, struct mt7996_phy *phy)u8 path, nss, band_idx = phy->mt76->band_idx;u8 *eeprom = dev->mt76.eeprom.data;struct mt76_phy *mphy = phy->mt76; +int ret;switch (band_idx) {case MT_BAND1 :
@@ -167,6 +190,10 @@ int mt7996_eeprom_parse_hw_cap(struct mt7996_dev *dev, struct mt7996_phy *phy) dev->chainshift[band_idx +1 ] = dev->chainshift[band_idx] +hweight16 (mphy->chainmask); + ret =mt7996_eeprom_parse_efuse_hw_cap (dev); +if (ret) +return ret; +return mt7996_eeprom_parse_band_config (phy); }
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +46 -0
52 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +4 -0
@@ -264,6 +264,7 @@ struct mt7996_dev { bool dbdc_support:1; bool tbtc_support:1; bool flash_mode:1; + bool has_eht:1;bool ibf;u8 fw_debug_wm;
@@ -281,6 +282,8 @@ struct mt7996_dev {u32 reg_l1_backup;u32 reg_l2_backup; + +u8 wtbl_size_group; };enum {
@@ -419,6 +422,7 @@ int mt7996_mcu_set_fixed_rate_ctrl(struct mt7996_dev *dev,int mt7996_mcu_set_eeprom (struct mt7996_dev *dev);int mt7996_mcu_get_eeprom (struct mt7996_dev *dev,u32 offset);int mt7996_mcu_get_eeprom_free_block (struct mt7996_dev *dev,u8 *block_num); +int mt7996_mcu_get_chip_config (struct mt7996_dev *dev,u32 *cap);int mt7996_mcu_set_ser (struct mt7996_dev *dev,u8 action,u8 set,u8 band);int mt7996_mcu_set_txbf (struct mt7996_dev *dev,u8 action);int mt7996_mcu_set_fcc5_lpn (struct mt7996_dev *dev,int val);
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH v2 8/13 wifi: mt76: mt7996: add helpers for wtbl and interface limit
In reply to Shayne ChenAdd helpers to get the maximum wtbl size and interface num based on hw caps.
--- .../net/wireless/mediatek/mt76/mt7996/init.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 2 +- .../net/wireless/mediatek/mt76/mt7996/main.c | 2 +- .../net/wireless/mediatek/mt76/mt7996/mt7996.h | 17 +++++++++++++---- 4 files changed, 16 insertions(+), 7 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/init.c +1 -1
@@ -256,7 +256,7 @@ static void mt7996_mac_init(struct mt7996_dev *dev)mt76_clear (dev,MT_MDP_DCR2 ,MT_MDP_DCR2_RX_TRANS_SHORT ); -for (i =0 ; i <MT7996_WTBL_SIZE ; i++) +for (i =0 ; i <mt7996_wtbl_size (dev); i++)mt7996_mac_wtbl_update (dev, i,MT_WTBL_UPDATE_ADM_COUNT_CLEAR );
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +1 -1
@@ -1486,7 +1486,7 @@ static void mt7996_mac_add_txs(struct mt7996_dev *dev, void *data)if (pid <MT_PACKET_ID_FIRST )return ; -if (wcidx >=MT7996_WTBL_SIZE ) +if (wcidx >=mt7996_wtbl_size (dev))return ;rcu_read_lock ();
drivers/net/wireless/mediatek/mt76/mt7996/main.c +1 -1
@@ -170,7 +170,7 @@ static int mt7996_add_interface(struct ieee80211_hw *hw, phy->monitor_vif = vif; mvif->mt76.idx =__ffs64 (~dev->mt76.vif_mask); -if (mvif->mt76.idx >= (MT7996_MAX_INTERFACES << dev->dbdc_support)) { +if (mvif->mt76.idx >=mt7996_max_interface_num (dev)) { ret = -ENOSPC ; goto out; }
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +13 -4
@@ -11,12 +11,11 @@#include "../mt76_connac.h" #include "regs.h" -#define MT7996_MAX_INTERFACES 19 +#define MT7996_MAX_INTERFACES 19/* per-band */ #define MT7996_MAX_WMM_SETS 4 -#define MT7996_WTBL_SIZE 544 -#define MT7996_WTBL_RESERVED (MT7996_WTBL_SIZE - 1) +#define MT7996_WTBL_RESERVED (mt7996_wtbl_size(dev) - 1)#define MT7996_WTBL_STA (MT7996_WTBL_RESERVED - \ - MT7996_MAX_INTERFACES) + mt7996_max_interface_num(dev))#define MT7996_WATCHDOG_TIME (HZ / 10)#define MT7996_RESET_TIMEOUT (30 * HZ)
@@ -447,6 +446,16 @@ int mt7996_mcu_fw_dbg_ctrl(struct mt7996_dev *dev, u32 module, u8 level);void mt7996_mcu_rx_event (struct mt7996_dev *dev,struct sk_buff *skb);void mt7996_mcu_exit (struct mt7996_dev *dev); +static inline u8 mt7996_max_interface_num (struct mt7996_dev *dev) +{ +return MT7996_MAX_INTERFACES * (1 + dev->dbdc_support + dev->tbtc_support); +} + +static inline u16 mt7996_wtbl_size (struct mt7996_dev *dev) +{ +return (dev->wtbl_size_group <<8 ) +64 ; +} +void mt7996_dual_hif_set_irq_mask (struct mt7996_dev *dev,bool write_reg,u32 clear,u32 set);
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH v2 9/13 wifi: mt76: mt7996: rework capability init
In reply to Shayne ChenRework and extract common code of capability init for the preparation of adding EHT capability.
--- .../net/wireless/mediatek/mt76/mt7996/init.c | 296 ++++++++---------- 1 file changed, 139 insertions(+), 157 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/init.c +139 -157
@@ -37,8 +37,7 @@ static const struct ieee80211_iface_combination if_comb[] = { BIT(NL80211_CHAN_WIDTH_20) | BIT(NL80211_CHAN_WIDTH_40) | BIT(NL80211_CHAN_WIDTH_80) | - BIT(NL80211_CHAN_WIDTH_160) | - BIT(NL80211_CHAN_WIDTH_80P80), + BIT(NL80211_CHAN_WIDTH_160), } };
@@ -572,11 +571,15 @@ mt7996_gen_ppe_thresh(u8 *he_ppet, int nss) (0xff >> (8 - (ppet_bits -1 ) %8 )); } -static int +static void mt7996_init_he_caps (struct mt7996_phy *phy,enum nl80211_band band, -struct ieee80211_sband_iftype_data *data) +struct ieee80211_sband_iftype_data *data, +enum nl80211_iftype iftype) { -int i, idx =0 , nss =hweight8 (phy->mt76->antenna_mask); +struct ieee80211_sta_he_cap *he_cap = &data->he_cap; +struct ieee80211_he_cap_elem *he_cap_elem = &he_cap->he_cap_elem; +struct ieee80211_he_mcs_nss_supp *he_mcs = &he_cap->he_mcs_nss_supp; +int i, nss =hweight8 (phy->mt76->antenna_mask);u16 mcs_map =0 ;for (i =0 ; i <8 ; i++) {
@@ -586,179 +589,158 @@ mt7996_init_he_caps(struct mt7996_phy *phy, enum nl80211_band band, mcs_map |= (IEEE80211_HE_MCS_NOT_SUPPORTED << (i *2 )); } -for (i =0 ; i <NUM_NL80211_IFTYPES ; i++) { -struct ieee80211_sta_he_cap *he_cap = &data[idx].he_cap; -struct ieee80211_he_cap_elem *he_cap_elem = - &he_cap->he_cap_elem; -struct ieee80211_he_mcs_nss_supp *he_mcs = - &he_cap->he_mcs_nss_supp; - -switch (i) { -case NL80211_IFTYPE_STATION : -case NL80211_IFTYPE_AP : -#ifdef CONFIG_MAC80211_MESH -case NL80211_IFTYPE_MESH_POINT : -#endif -break ; -default : -continue ; - } + he_cap->has_he = true; - data[idx].types_mask =BIT (i); - he_cap->has_he = true; + he_cap_elem->mac_cap_info[0 ] =IEEE80211_HE_MAC_CAP0_HTC_HE ; + he_cap_elem->mac_cap_info[3 ] =IEEE80211_HE_MAC_CAP3_OMI_CONTROL | +IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3 ; + he_cap_elem->mac_cap_info[4 ] =IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU ; - he_cap_elem->mac_cap_info[0 ] = -IEEE80211_HE_MAC_CAP0_HTC_HE ; - he_cap_elem->mac_cap_info[3 ] = -IEEE80211_HE_MAC_CAP3_OMI_CONTROL | -IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3 ; - he_cap_elem->mac_cap_info[4 ] = -IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU ; +if (band ==NL80211_BAND_2GHZ ) + he_cap_elem->phy_cap_info[0 ] = +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G ; +else + he_cap_elem->phy_cap_info[0 ] = +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G | +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G ; + + he_cap_elem->phy_cap_info[1 ] =IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD ; + he_cap_elem->phy_cap_info[2 ] =IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ | +IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ ; + +switch (iftype) { +case NL80211_IFTYPE_AP : + he_cap_elem->mac_cap_info[0 ] |=IEEE80211_HE_MAC_CAP0_TWT_RES ; + he_cap_elem->mac_cap_info[2 ] |=IEEE80211_HE_MAC_CAP2_BSR ; + he_cap_elem->mac_cap_info[4 ] |=IEEE80211_HE_MAC_CAP4_BQR ; + he_cap_elem->mac_cap_info[5 ] |= +IEEE80211_HE_MAC_CAP5_OM_CTRL_UL_MU_DATA_DIS_RX ; + he_cap_elem->phy_cap_info[3 ] |= +IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK | +IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK ; + he_cap_elem->phy_cap_info[6 ] |= +IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE | +IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT ; + he_cap_elem->phy_cap_info[9 ] |= +IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU | +IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU ; +break ; +case NL80211_IFTYPE_STATION : + he_cap_elem->mac_cap_info[1 ] |= +IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US ;if (band ==NL80211_BAND_2GHZ ) - he_cap_elem->phy_cap_info[0 ] = -IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G ; + he_cap_elem->phy_cap_info[0 ] |= +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_2G ;else - he_cap_elem->phy_cap_info[0 ] = -IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G | -IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G | -IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G ; + he_cap_elem->phy_cap_info[0 ] |= +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_5G ; + + he_cap_elem->phy_cap_info[1 ] |= +IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A | +IEEE80211_HE_PHY_CAP1_HE_LTF_AND_GI_FOR_HE_PPDUS_0_8US ; + he_cap_elem->phy_cap_info[3 ] |= +IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK | +IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK ; + he_cap_elem->phy_cap_info[6 ] |= +IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB | +IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE | +IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT ; + he_cap_elem->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 ; + he_cap_elem->phy_cap_info[8 ] |= +IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G | +IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU | +IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU | +IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_484 ; + he_cap_elem->phy_cap_info[9 ] |= +IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM | +IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK | +IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU | +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 ; +break ; +default : +break ; + } - he_cap_elem->phy_cap_info[1 ] = -IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD ; - he_cap_elem->phy_cap_info[2 ] = -IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ | -IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ ; + he_mcs->rx_mcs_80 =cpu_to_le16 (mcs_map); + he_mcs->tx_mcs_80 =cpu_to_le16 (mcs_map); + he_mcs->rx_mcs_160 =cpu_to_le16 (mcs_map); + he_mcs->tx_mcs_160 =cpu_to_le16 (mcs_map); + +mt7996_set_stream_he_txbf_caps (phy, he_cap, iftype); + +memset (he_cap->ppe_thres,0 ,sizeof (he_cap->ppe_thres)); +if (he_cap_elem->phy_cap_info[6 ] & +IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT ) { +mt7996_gen_ppe_thresh (he_cap->ppe_thres, nss); + }else { + he_cap_elem->phy_cap_info[9 ] |= +u8_encode_bits (IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US , +IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK ); + } -switch (i) { -case NL80211_IFTYPE_AP : - he_cap_elem->mac_cap_info[0 ] |= -IEEE80211_HE_MAC_CAP0_TWT_RES ; - he_cap_elem->mac_cap_info[2 ] |= -IEEE80211_HE_MAC_CAP2_BSR ; - he_cap_elem->mac_cap_info[4 ] |= -IEEE80211_HE_MAC_CAP4_BQR ; - he_cap_elem->mac_cap_info[5 ] |= -IEEE80211_HE_MAC_CAP5_OM_CTRL_UL_MU_DATA_DIS_RX ; - he_cap_elem->phy_cap_info[3 ] |= -IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK | -IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK ; - he_cap_elem->phy_cap_info[6 ] |= -IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE | -IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT ; - he_cap_elem->phy_cap_info[9 ] |= -IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU | -IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU ; -break ; -case NL80211_IFTYPE_STATION : - he_cap_elem->mac_cap_info[1 ] |= -IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US ; - -if (band ==NL80211_BAND_2GHZ ) - he_cap_elem->phy_cap_info[0 ] |= -IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_2G ; -else - he_cap_elem->phy_cap_info[0 ] |= -IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_5G ; - - he_cap_elem->phy_cap_info[1 ] |= -IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A | -IEEE80211_HE_PHY_CAP1_HE_LTF_AND_GI_FOR_HE_PPDUS_0_8US ; - he_cap_elem->phy_cap_info[3 ] |= -IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK | -IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK ; - he_cap_elem->phy_cap_info[6 ] |= -IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB | -IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE | -IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT ; - he_cap_elem->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 ; - he_cap_elem->phy_cap_info[8 ] |= -IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G | -IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU | -IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU | -IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_484 ; - he_cap_elem->phy_cap_info[9 ] |= -IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM | -IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK | -IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU | -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 ; -break ; - } +if (band ==NL80211_BAND_6GHZ ) { +u16 cap =IEEE80211_HE_6GHZ_CAP_TX_ANTPAT_CONS | +IEEE80211_HE_6GHZ_CAP_RX_ANTPAT_CONS ; - he_mcs->rx_mcs_80 =cpu_to_le16 (mcs_map); - he_mcs->tx_mcs_80 =cpu_to_le16 (mcs_map); - he_mcs->rx_mcs_160 =cpu_to_le16 (mcs_map); - he_mcs->tx_mcs_160 =cpu_to_le16 (mcs_map); - he_mcs->rx_mcs_80p80 =cpu_to_le16 (mcs_map); - he_mcs->tx_mcs_80p80 =cpu_to_le16 (mcs_map); - -mt7996_set_stream_he_txbf_caps (phy, he_cap, i); - -memset (he_cap->ppe_thres,0 ,sizeof (he_cap->ppe_thres)); -if (he_cap_elem->phy_cap_info[6 ] & -IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT ) { -mt7996_gen_ppe_thresh (he_cap->ppe_thres, nss); - }else { - he_cap_elem->phy_cap_info[9 ] |= -IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US ; - } + cap |=u16_encode_bits (IEEE80211_HT_MPDU_DENSITY_2 , +IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START ) | +u16_encode_bits (IEEE80211_VHT_MAX_AMPDU_1024K , +IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP ) | +u16_encode_bits (IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 , +IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN ); -if (band ==NL80211_BAND_6GHZ ) { -u16 cap =IEEE80211_HE_6GHZ_CAP_TX_ANTPAT_CONS | -IEEE80211_HE_6GHZ_CAP_RX_ANTPAT_CONS ; + data->he_6ghz_capa.capa =cpu_to_le16 (cap); + } +} - cap |=u16_encode_bits (IEEE80211_HT_MPDU_DENSITY_2 , -IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START ) | -u16_encode_bits (IEEE80211_VHT_MAX_AMPDU_1024K , -IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP ) | -u16_encode_bits (IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 , -IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN ); +static void +__mt7996_set_stream_he_caps (struct mt7996_phy *phy, +struct ieee80211_supported_band *sband, +enum nl80211_band band) +{ +struct ieee80211_sband_iftype_data *data = phy->iftype[band]; +int i, n =0 ; - data[idx].he_6ghz_capa.capa =cpu_to_le16 (cap); +for (i =0 ; i <NUM_NL80211_IFTYPES ; i++) { +switch (i) { +case NL80211_IFTYPE_STATION : +case NL80211_IFTYPE_AP : +#ifdef CONFIG_MAC80211_MESH +case NL80211_IFTYPE_MESH_POINT : +#endif +break ; +default : +continue ; } - idx++; + data[n].types_mask =BIT (i); +mt7996_init_he_caps (phy, band, &data[n], i); + + n++; } -return idx; + sband->iftype_data = data; + sband->n_iftype_data = n; }void mt7996_set_stream_he_caps (struct mt7996_phy *phy) { -struct ieee80211_sband_iftype_data *data; -struct ieee80211_supported_band *band; -int n; - -if (phy->mt76->cap.has_2ghz) { - data = phy->iftype[NL80211_BAND_2GHZ ]; - n =mt7996_init_he_caps (phy,NL80211_BAND_2GHZ , data); - - band = &phy->mt76->sband_2g.sband; - band->iftype_data = data; - band->n_iftype_data = n; - } - -if (phy->mt76->cap.has_5ghz) { - data = phy->iftype[NL80211_BAND_5GHZ ]; - n =mt7996_init_he_caps (phy,NL80211_BAND_5GHZ , data); - - band = &phy->mt76->sband_5g.sband; - band->iftype_data = data; - band->n_iftype_data = n; - } +if (phy->mt76->cap.has_2ghz) +__mt7996_set_stream_he_caps (phy, &phy->mt76->sband_2g.sband, +NL80211_BAND_2GHZ ); -if (phy->mt76->cap.has_6ghz) { - data = phy->iftype[NL80211_BAND_6GHZ ]; - n =mt7996_init_he_caps (phy,NL80211_BAND_6GHZ , data); +if (phy->mt76->cap.has_5ghz) +__mt7996_set_stream_he_caps (phy, &phy->mt76->sband_5g.sband, +NL80211_BAND_5GHZ ); - band = &phy->mt76->sband_6g.sband; - band->iftype_data = data; - band->n_iftype_data = n; - } +if (phy->mt76->cap.has_6ghz) +__mt7996_set_stream_he_caps (phy, &phy->mt76->sband_6g.sband, +NL80211_BAND_6GHZ ); }int mt7996_register_device (struct mt7996_dev *dev)
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH v2 10/13 wifi: mt76: mt7996: add EHT capability init
In reply to Shayne ChenAdd EHT mac and phy capability init for mt7996 chipsets.
--- .../net/wireless/mediatek/mt76/mt7996/init.c | 124 ++++++++++++++++-- .../net/wireless/mediatek/mt76/mt7996/main.c | 2 +- .../wireless/mediatek/mt76/mt7996/mt7996.h | 2 +- 3 files changed, 113 insertions(+), 15 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/init.c +111 -13
@@ -152,10 +152,12 @@ mt7996_init_wiphy(struct ieee80211_hw *hw)struct mt7996_phy *phy =mt7996_hw_phy (hw);struct mt76_dev *mdev = &phy->dev->mt76;struct wiphy *wiphy = hw->wiphy; +u16 max_subframes = phy->dev->has_eht ?IEEE80211_MAX_AMPDU_BUF_EHT : +IEEE80211_MAX_AMPDU_BUF_HE ; hw->queues =4 ; - hw->max_rx_aggregation_subframes =IEEE80211_MAX_AMPDU_BUF_HE ; - hw->max_tx_aggregation_subframes =IEEE80211_MAX_AMPDU_BUF_HE ; + hw->max_rx_aggregation_subframes = max_subframes; + hw->max_tx_aggregation_subframes = max_subframes; hw->netdev_features =NETIF_F_RXCSUM ; hw->radiotap_timestamp.units_pos =
@@ -213,7 +215,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw)mt76_set_stream_caps (phy->mt76, true);mt7996_set_stream_vht_txbf_caps (phy); -mt7996_set_stream_he_caps (phy); +mt7996_set_stream_he_eht_caps (phy); wiphy->available_antennas_rx = phy->mt76->antenna_mask; wiphy->available_antennas_tx = phy->mt76->antenna_mask;
@@ -699,9 +701,104 @@ mt7996_init_he_caps(struct mt7996_phy *phy, enum nl80211_band band, }static void -__mt7996_set_stream_he_caps (struct mt7996_phy *phy, -struct ieee80211_supported_band *sband, -enum nl80211_band band) +mt7996_init_eht_caps (struct mt7996_phy *phy,enum nl80211_band band, +struct ieee80211_sband_iftype_data *data, +enum nl80211_iftype iftype) +{ +struct ieee80211_sta_eht_cap *eht_cap = &data->eht_cap; +struct ieee80211_eht_cap_elem_fixed *eht_cap_elem = &eht_cap->eht_cap_elem; +struct ieee80211_eht_mcs_nss_supp *eht_nss = &eht_cap->eht_mcs_nss_supp; +enum nl80211_chan_width width = phy->mt76->chandef.width; +int nss =hweight8 (phy->mt76->antenna_mask); +int sts =hweight16 (phy->mt76->chainmask); +u8 val; + +if (!phy->dev->has_eht) +return ; + + eht_cap->has_eht = true; + + eht_cap_elem->mac_cap_info[0 ] = +IEEE80211_EHT_MAC_CAP0_EPCS_PRIO_ACCESS | +IEEE80211_EHT_MAC_CAP0_OM_CONTROL ; + + eht_cap_elem->phy_cap_info[0 ] = +IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ | +IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI | +IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER | +IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE ; + + 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 ) | +u8_encode_bits (sts -1 , +IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_320MHZ_MASK ); + + eht_cap_elem->phy_cap_info[2 ] = +u8_encode_bits (sts -1 ,IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_80MHZ_MASK ) | +u8_encode_bits (sts -1 ,IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_160MHZ_MASK ) | +u8_encode_bits (sts -1 ,IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_320MHZ_MASK ); + + 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_SU_BF_FDBK | +IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK | +IEEE80211_EHT_PHY_CAP3_TRIG_CQI_FDBK ; + + eht_cap_elem->phy_cap_info[4 ] = +u8_encode_bits (min_t (int, sts -1 ,2 ), +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_16US , +IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK ) | +u8_encode_bits (u8_get_bits (0x11 ,GENMASK (1 ,0 )), +IEEE80211_EHT_PHY_CAP5_MAX_NUM_SUPP_EHT_LTF_MASK ); + + val = width ==NL80211_CHAN_WIDTH_320 ?0xf : + width ==NL80211_CHAN_WIDTH_160 ?0x7 : + width ==NL80211_CHAN_WIDTH_80 ?0x3 :0x1 ; + eht_cap_elem->phy_cap_info[6 ] = +u8_encode_bits (u8_get_bits (0x11 ,GENMASK (4 ,2 )), +IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK ) | +u8_encode_bits (val,IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK ); + + eht_cap_elem->phy_cap_info[7 ] = +IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ | +IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_160MHZ | +IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_320MHZ | +IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ | +IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ | +IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ ; + + val =u8_encode_bits (nss,IEEE80211_EHT_MCS_NSS_RX ) | +u8_encode_bits (nss,IEEE80211_EHT_MCS_NSS_TX ); +#define SET_EHT_MAX_NSS (_bw, _val) do { \ + eht_nss->bw._##_bw.rx_tx_mcs9_max_nss = _val; \ + eht_nss->bw._##_bw.rx_tx_mcs11_max_nss = _val; \ + eht_nss->bw._##_bw.rx_tx_mcs13_max_nss = _val; \ + } while (0) + +SET_EHT_MAX_NSS (80 , val); +SET_EHT_MAX_NSS (160 , val); +SET_EHT_MAX_NSS (320 , val); +#undef SET_EHT_MAX_NSS +} + +static void +__mt7996_set_stream_he_eht_caps (struct mt7996_phy *phy, +struct ieee80211_supported_band *sband, +enum nl80211_band band) {struct ieee80211_sband_iftype_data *data = phy->iftype[band];int i, n =0 ;
@@ -720,6 +817,7 @@ __mt7996_set_stream_he_caps(struct mt7996_phy *phy, data[n].types_mask =BIT (i);mt7996_init_he_caps (phy, band, &data[n], i); +mt7996_init_eht_caps (phy, band, &data[n], i); n++; }
@@ -728,19 +826,19 @@ __mt7996_set_stream_he_caps(struct mt7996_phy *phy, sband->n_iftype_data = n; } -void mt7996_set_stream_he_caps (struct mt7996_phy *phy) +void mt7996_set_stream_he_eht_caps (struct mt7996_phy *phy) {if (phy->mt76->cap.has_2ghz) -__mt7996_set_stream_he_caps (phy, &phy->mt76->sband_2g.sband, -NL80211_BAND_2GHZ ); +__mt7996_set_stream_he_eht_caps (phy, &phy->mt76->sband_2g.sband, +NL80211_BAND_2GHZ );if (phy->mt76->cap.has_5ghz) -__mt7996_set_stream_he_caps (phy, &phy->mt76->sband_5g.sband, -NL80211_BAND_5GHZ ); +__mt7996_set_stream_he_eht_caps (phy, &phy->mt76->sband_5g.sband, +NL80211_BAND_5GHZ );if (phy->mt76->cap.has_6ghz) -__mt7996_set_stream_he_caps (phy, &phy->mt76->sband_6g.sband, -NL80211_BAND_6GHZ ); +__mt7996_set_stream_he_eht_caps (phy, &phy->mt76->sband_6g.sband, +NL80211_BAND_6GHZ ); }int mt7996_register_device (struct mt7996_dev *dev)
drivers/net/wireless/mediatek/mt76/mt7996/main.c +1 -1
@@ -890,7 +890,7 @@ mt7996_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)mt76_set_stream_caps (phy->mt76, true);mt7996_set_stream_vht_txbf_caps (phy); -mt7996_set_stream_he_caps (phy); +mt7996_set_stream_he_eht_caps (phy);mutex_unlock (&dev->mt76.mutex);
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +1 -1
@@ -515,7 +515,7 @@ void mt7996_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps);void mt7996_stats_work (struct work_struct *work);int mt76_dfs_start_rdd (struct mt7996_dev *dev,bool force);int mt7996_dfs_init_radar_detector (struct mt7996_phy *phy); -void mt7996_set_stream_he_caps (struct mt7996_phy *phy); +void mt7996_set_stream_he_eht_caps (struct mt7996_phy *phy);void mt7996_set_stream_vht_txbf_caps (struct mt7996_phy *phy);void mt7996_update_channel (struct mt76_phy *mphy);int mt7996_init_debugfs (struct mt7996_phy *phy);
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH v2 11/13 wifi: mt76: mt7996: add support for EHT rate report
In reply to Shayne ChenCurrenly only EHT TX rate report is supported. EHT RX rate is temporally reported with HE rate.
--- .../wireless/mediatek/mt76/mt7996/debugfs.c | 8 ++--- .../net/wireless/mediatek/mt76/mt7996/mac.c | 34 ++++++++++++++++++- 2 files changed, 37 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c +4 -4
@@ -791,10 +791,10 @@ static ssize_t mt7996_sta_fixed_rate_set(struct file *file,else buf[count] ='\0' ; -/* mode - cck: 0, ofdm: 1, ht: 2, gf: 3, vht: 4, he_su: 8, he_er: 9 -* bw - bw20: 0, bw40: 1, bw80: 2, bw160: 3 -* nss - vht: 1~4, he: 1~4, others: ignore -* mcs - cck: 0~4, ofdm: 0~7, ht: 0~32, vht: 0~9, he_su: 0~11, he_er: 0~2 +/* mode - cck: 0, ofdm: 1, ht: 2, gf: 3, vht: 4, he_su: 8, he_er: 9 EHT: 15 +* bw - bw20: 0, bw40: 1, bw80: 2, bw160: 3, BW320: 4 +* nss - vht: 1~4, he: 1~4, eht: 1~4, others: ignore +* mcs - cck: 0~4, ofdm: 0~7, ht: 0~32, vht: 0~9, he_su: 0~11, he_er: 0~2, eht: 0~13 * gi - (ht/vht) lgi: 0, sgi: 1; (he) 0.8us: 0, 1.6us: 1, 3.2us: 2 * preamble - short: 1, long: 0 * ldpc - off: 0, on: 1
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +33 -1
@@ -189,6 +189,9 @@ static void mt7996_mac_sta_poll(struct mt7996_dev *dev) rate = &msta->wcid.rate;switch (rate->bw) { +case RATE_INFO_BW_320 : + bw =IEEE80211_STA_RX_BW_320 ; +break ;case RATE_INFO_BW_160 : bw =IEEE80211_STA_RX_BW_160 ;break ;
@@ -205,7 +208,11 @@ static void mt7996_mac_sta_poll(struct mt7996_dev *dev) addr =mt7996_mac_wtbl_lmac_addr (dev, idx,6 ); val =mt76_rr (dev, addr); -if (rate->flags &RATE_INFO_FLAGS_HE_MCS ) { +if (rate->flags &RATE_INFO_FLAGS_EHT_MCS ) { + addr =mt7996_mac_wtbl_lmac_addr (dev, idx,5 ); + val =mt76_rr (dev, addr); + rate->eht_gi =FIELD_GET (GENMASK (25 ,24 ), val); + }else if (rate->flags &RATE_INFO_FLAGS_HE_MCS ) {u8 offs =24 +2 * bw; rate->he_gi = (val & (0x3 << offs)) >> offs;
@@ -560,6 +567,15 @@ mt7996_mac_fill_rx_rate(struct mt7996_dev *dev, status->he_dcm = dcm;break ; +case MT_PHY_TYPE_EHT_SU : +case MT_PHY_TYPE_EHT_TRIG : +case MT_PHY_TYPE_EHT_MU : +/* TODO: currently report rx rate with HE rate */ + status->nss = nss; + status->encoding =RX_ENC_HE ; + bw =min_t (int, bw,IEEE80211_STA_RX_BW_160 ); + i =min_t (int, i &0xf ,11 ); +break ;default :return -EINVAL ; }
@@ -584,6 +600,9 @@ mt7996_mac_fill_rx_rate(struct mt7996_dev *dev,case IEEE80211_STA_RX_BW_160 : status->bw =RATE_INFO_BW_160 ;break ; +case IEEE80211_STA_RX_BW_320 : + status->bw =RATE_INFO_BW_320 ; +break ;default :return -EINVAL ; }
@@ -1434,6 +1453,15 @@ mt7996_mac_add_txs_skb(struct mt7996_dev *dev, struct mt76_wcid *wcid, int pid, rate.he_dcm =FIELD_GET (MT_TX_RATE_DCM , txrate); rate.flags =RATE_INFO_FLAGS_HE_MCS ;break ; +case MT_PHY_TYPE_EHT_SU : +case MT_PHY_TYPE_EHT_TRIG : +case MT_PHY_TYPE_EHT_MU : +if (rate.mcs >13 ) + goto out; + + rate.eht_gi = wcid->rate.eht_gi; + rate.flags =RATE_INFO_FLAGS_EHT_MCS ; +break ;default : goto out; }
@@ -1441,6 +1469,10 @@ mt7996_mac_add_txs_skb(struct mt7996_dev *dev, struct mt76_wcid *wcid, int pid, stats->tx_mode[mode]++;switch (FIELD_GET (MT_TXS0_BW , txs)) { +case IEEE80211_STA_RX_BW_320 : + rate.bw =RATE_INFO_BW_320 ; + stats->tx_bw[4 ]++; +break ;case IEEE80211_STA_RX_BW_160 : rate.bw =RATE_INFO_BW_160 ; stats->tx_bw[3 ]++;
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH v2 12/13 wifi: mt76: mt7996: enable EHT support in firmware
In reply to Shayne ChenAdd sta_rec_eht command and extend phymode setting.
--- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 41 ++++++++++++++++--- .../net/wireless/mediatek/mt76/mt7996/mcu.h | 16 ++++++++ 2 files changed, 52 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +36 -5
@@ -771,9 +771,8 @@ mt7996_mcu_bss_basic_tlv(struct sk_buff *skb, bss->dtim_period = vif->bss_conf.dtim_period; bss->phymode =mt76_connac_get_phy_mode (phy, vif, chandef->chan->band,NULL ); - -if (chandef->chan->band ==NL80211_BAND_6GHZ ) - bss->phymode_ext |=PHY_MODE_AX_6G ; + bss->phymode_ext =mt76_connac_get_phy_mode_ext (phy, vif, + chandef->chan->band);return 0 ; }
@@ -951,6 +950,35 @@ mt7996_mcu_sta_he_6g_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) he_6g->capa = sta->deflink.he_6ghz_capa.capa; } +static void +mt7996_mcu_sta_eht_tlv (struct sk_buff *skb,struct ieee80211_sta *sta) +{ +struct ieee80211_eht_mcs_nss_supp *mcs_map; +struct ieee80211_eht_cap_elem_fixed *elem; +struct sta_rec_eht *eht; +struct tlv *tlv; + +if (!sta->deflink.eht_cap.has_eht) +return ; + + mcs_map = &sta->deflink.eht_cap.eht_mcs_nss_supp; + elem = &sta->deflink.eht_cap.eht_cap_elem; + + tlv =mt76_connac_mcu_add_tlv (skb,STA_REC_EHT ,sizeof (*eht)); + + eht = (struct sta_rec_eht *)tlv; + eht->tid_bitmap =0xff ; + eht->mac_cap =cpu_to_le16 (*(u16 *)elem->mac_cap_info); + eht->phy_cap =cpu_to_le64 (*(u64 *)elem->phy_cap_info); + eht->phy_cap_ext =cpu_to_le64 (elem->phy_cap_info[8 ]); + +if (sta->deflink.bandwidth ==IEEE80211_STA_RX_BW_20 ) +memcpy (eht->mcs_map_bw20, &mcs_map->only_20mhz,sizeof (eht->mcs_map_bw20)); +memcpy (eht->mcs_map_bw80, &mcs_map->bw._80,sizeof (eht->mcs_map_bw80)); +memcpy (eht->mcs_map_bw160, &mcs_map->bw._160,sizeof (eht->mcs_map_bw160)); +memcpy (eht->mcs_map_bw320, &mcs_map->bw._320,sizeof (eht->mcs_map_bw320)); +} +static void mt7996_mcu_sta_ht_tlv (struct sk_buff *skb,struct ieee80211_sta *sta) {
@@ -1436,8 +1464,9 @@ mt7996_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7996_dev *dev, ra->auto_rate = true; ra->phy_mode =mt76_connac_get_phy_mode (mphy, vif, band, sta); ra->channel = chandef->chan->hw_value; - ra->bw = sta->deflink.bandwidth; - ra->phy.bw = sta->deflink.bandwidth; + ra->bw = (sta->deflink.bandwidth ==IEEE80211_STA_RX_BW_320 ) ? +CMD_CBW_320MHZ : sta->deflink.bandwidth; + ra->phy.bw = ra->bw; ra->mmps_mode =mt7996_mcu_get_mmps_mode (sta->deflink.smps_mode);if (supp_rate) {
@@ -1619,6 +1648,8 @@ int mt7996_mcu_add_sta(struct mt7996_dev *dev, struct ieee80211_vif *vif,mt7996_mcu_sta_he_tlv (skb, sta);/* starec he 6g*/ mt7996_mcu_sta_he_6g_tlv (skb, sta); +/* starec eht */ +mt7996_mcu_sta_eht_tlv (skb, sta);/* TODO: starec muru */ /* starec bfee */ mt7996_mcu_sta_bfee_tlv (dev, skb, vif, sta);
drivers/net/wireless/mediatek/mt76/mt7996/mcu.h +16 -0
@@ -347,6 +347,21 @@ struct sta_rec_ba_uni {u8 __rsv[3 ]; } __packed; +struct sta_rec_eht { +__le16 tag; +__le16 len; +u8 tid_bitmap; +u8 _rsv; +__le16 mac_cap; +__le64 phy_cap; +__le64 phy_cap_ext; +u8 mcs_map_bw20[4 ]; +u8 mcs_map_bw80[3 ]; +u8 mcs_map_bw160[3 ]; +u8 mcs_map_bw320[3 ]; +u8 _rsv2[3 ]; +} __packed; +struct sec_key_uni {__le16 wlan_idx;u8 mgmt_prot;
@@ -554,6 +569,7 @@ enum {sizeof (struct sta_rec_sec ) + \sizeof (struct sta_rec_ra_fixed ) + \sizeof (struct sta_rec_he_6g_capa ) + \ +sizeof (struct sta_rec_eht ) + \sizeof (struct sta_rec_hdrt ) + \sizeof (struct sta_rec_hdr_trans ) + \ sizeof(struct tlv))
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH v2 13/13 wifi: mt76: mt7996: add EHT beamforming support
In reply to Shayne ChenFrom: MeiChia Chiu <[email protected]>
Add mt7996_mcu_sta_bfer_eht() and related capability checks.
--- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 99 ++++++++++++++++++- .../wireless/mediatek/mt76/mt7996/mt7996.h | 2 + 2 files changed, 96 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +94 -5
@@ -70,6 +70,7 @@ struct mt7996_fw_region {#define HE_PHY (p, c) u8_get_bits(c, IEEE80211_HE_PHY_##p)#define HE_MAC (m, c) u8_get_bits(c, IEEE80211_HE_MAC_##m) +#define EHT_PHY (p, c) u8_get_bits(c, IEEE80211_EHT_PHY_##p)static bool sr_scene_detect = true;module_param (sr_scene_detect, bool,0644 );
@@ -1053,15 +1054,27 @@ mt7996_is_ebf_supported(struct mt7996_phy *phy, struct ieee80211_vif *vif, struct ieee80211_sta *sta, bool bfee) {struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv; -int tx_ant =hweight8 (phy->mt76->antenna_mask) -1 ; +int sts =hweight16 (phy->mt76->chainmask);if (vif->type !=NL80211_IFTYPE_STATION && vif->type !=NL80211_IFTYPE_AP )return false; -if (!bfee && tx_ant <2 ) +if (!bfee && sts <2 )return false; +if (sta->deflink.eht_cap.has_eht) { +struct ieee80211_sta_eht_cap *pc = &sta->deflink.eht_cap; +struct ieee80211_eht_cap_elem_fixed *pe = &pc->eht_cap_elem; + +if (bfee) +return mvif->cap.eht_su_ebfee && +EHT_PHY (CAP0_SU_BEAMFORMEE , pe->phy_cap_info[0 ]); +else +return mvif->cap.eht_su_ebfer && +EHT_PHY (CAP0_SU_BEAMFORMER , pe->phy_cap_info[0 ]); + } +if (sta->deflink.he_cap.has_he) {struct ieee80211_he_cap_elem *pe = &sta->deflink.he_cap.he_cap_elem;
@@ -1218,13 +1231,69 @@ mt7996_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif, bf->nrow_gt_bw80 =min_t (int, snd_dim, sts); } +static void +mt7996_mcu_sta_bfer_eht (struct ieee80211_sta *sta,struct ieee80211_vif *vif, +struct mt7996_phy *phy,struct sta_rec_bf *bf) +{ +struct ieee80211_sta_eht_cap *pc = &sta->deflink.eht_cap; +struct ieee80211_eht_cap_elem_fixed *pe = &pc->eht_cap_elem; +struct ieee80211_eht_mcs_nss_supp *eht_nss = &pc->eht_mcs_nss_supp; +const struct ieee80211_sta_eht_cap *vc = +mt76_connac_get_eht_phy_cap (phy->mt76, vif); +const struct ieee80211_eht_cap_elem_fixed *ve = &vc->eht_cap_elem; +u8 nss_mcs =u8_get_bits (eht_nss->bw._80.rx_tx_mcs9_max_nss, +IEEE80211_EHT_MCS_NSS_RX ) -1 ; +u8 snd_dim, sts; + + bf->tx_mode =MT_PHY_TYPE_EHT_MU ; + +mt7996_mcu_sta_sounding_rate (bf); + + bf->trigger_su =EHT_PHY (CAP3_TRIG_SU_BF_FDBK , pe->phy_cap_info[3 ]); + bf->trigger_mu =EHT_PHY (CAP3_TRIG_MU_BF_PART_BW_FDBK , pe->phy_cap_info[3 ]); + snd_dim =EHT_PHY (CAP2_SOUNDING_DIM_80MHZ_MASK , ve->phy_cap_info[2 ]); + sts =EHT_PHY (CAP0_BEAMFORMEE_SS_80MHZ_MASK , pe->phy_cap_info[0 ]) + + (EHT_PHY (CAP1_BEAMFORMEE_SS_80MHZ_MASK , pe->phy_cap_info[1 ]) <<1 ); + bf->nrow =min_t (u8, snd_dim, sts); + bf->ncol =min_t (u8, nss_mcs, bf->nrow); + bf->ibf_ncol = bf->ncol; + +if (sta->deflink.bandwidth <IEEE80211_STA_RX_BW_160 ) +return ; + +switch (sta->deflink.bandwidth) { +case IEEE80211_STA_RX_BW_160 : + snd_dim =EHT_PHY (CAP2_SOUNDING_DIM_160MHZ_MASK , ve->phy_cap_info[2 ]); + sts =EHT_PHY (CAP1_BEAMFORMEE_SS_160MHZ_MASK , pe->phy_cap_info[1 ]); + nss_mcs =u8_get_bits (eht_nss->bw._160.rx_tx_mcs9_max_nss, +IEEE80211_EHT_MCS_NSS_RX ) -1 ; + + bf->nrow_gt_bw80 =min_t (u8, snd_dim, sts); + bf->ncol_gt_bw80 = nss_mcs; +break ; +case IEEE80211_STA_RX_BW_320 : + snd_dim =EHT_PHY (CAP2_SOUNDING_DIM_320MHZ_MASK , ve->phy_cap_info[2 ]) + + (EHT_PHY (CAP3_SOUNDING_DIM_320MHZ_MASK , + ve->phy_cap_info[3 ]) <<1 ); + sts =EHT_PHY (CAP1_BEAMFORMEE_SS_320MHZ_MASK , pe->phy_cap_info[1 ]); + nss_mcs =u8_get_bits (eht_nss->bw._320.rx_tx_mcs9_max_nss, +IEEE80211_EHT_MCS_NSS_RX ) -1 ; + + bf->nrow_gt_bw80 =min_t (u8, snd_dim, sts) <<4 ; + bf->ncol_gt_bw80 = nss_mcs <<4 ; +break ; +default : +break ; + } +} +static void mt7996_mcu_sta_bfer_tlv (struct mt7996_dev *dev,struct sk_buff *skb,struct ieee80211_vif *vif,struct ieee80211_sta *sta) {struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;struct mt7996_phy *phy = mvif->phy; -int tx_ant =hweight8 (phy->mt76->antenna_mask) -1 ; +int tx_ant =hweight8 (phy->mt76->chainmask) -1 ;struct sta_rec_bf *bf;struct tlv *tlv;const u8 matrix[4 ][4 ] = {
@@ -1245,11 +1314,13 @@ mt7996_mcu_sta_bfer_tlv(struct mt7996_dev *dev, struct sk_buff *skb, tlv =mt76_connac_mcu_add_tlv (skb,STA_REC_BF ,sizeof (*bf)); bf = (struct sta_rec_bf *)tlv; -/* he: eBF only, in accordance with spec +/* he/eht: eBF only, in accordance with spec * vht: support eBF and iBF * ht: iBF only, since mac80211 lacks of eBF support */ -if (sta->deflink.he_cap.has_he && ebf) +if (sta->deflink.eht_cap.has_eht && ebf) +mt7996_mcu_sta_bfer_eht (sta, vif, phy, bf); +else if (sta->deflink.he_cap.has_he && ebf)mt7996_mcu_sta_bfer_he (sta, vif, phy, bf);else if (sta->deflink.vht_cap.vht_supported)mt7996_mcu_sta_bfer_vht (sta, phy, bf, ebf);
@@ -1846,6 +1917,7 @@ mt7996_mcu_beacon_check_caps(struct mt7996_phy *phy, struct ieee80211_vif *vif, {struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;struct mt7996_vif_cap *vc = &mvif->cap; +const struct ieee80211_eht_cap_elem_fixed *eht;const struct ieee80211_he_cap_elem *he;const struct ieee80211_vht_cap *vht;const struct ieee80211_ht_cap *ht;
@@ -1916,6 +1988,23 @@ mt7996_mcu_beacon_check_caps(struct mt7996_phy *phy, struct ieee80211_vif *vif,HE_PHY (CAP4_MU_BEAMFORMER , he->phy_cap_info[4 ]) &&HE_PHY (CAP4_MU_BEAMFORMER , pe->phy_cap_info[4 ]); } + + ie =cfg80211_find_ext_ie (WLAN_EID_EXT_EHT_CAPABILITY , + mgmt->u.beacon.variable, len); +if (ie && ie[1 ] >=sizeof (*eht) +1 ) { +const struct ieee80211_sta_eht_cap *pc = +mt76_connac_get_eht_phy_cap (phy->mt76, vif); +const struct ieee80211_eht_cap_elem_fixed *pe = &pc->eht_cap_elem; + + eht = (void *)(ie +3 ); + + vc->eht_su_ebfer = +EHT_PHY (CAP0_SU_BEAMFORMER , eht->phy_cap_info[0 ]) && +EHT_PHY (CAP0_SU_BEAMFORMER , pe->phy_cap_info[0 ]); + vc->eht_su_ebfee = +EHT_PHY (CAP0_SU_BEAMFORMEE , eht->phy_cap_info[0 ]) && +EHT_PHY (CAP0_SU_BEAMFORMEE , pe->phy_cap_info[0 ]); + } } int mt7996_mcu_add_beacon(struct ieee80211_hw *hw,
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +2 -0
@@ -123,6 +123,8 @@ struct mt7996_vif_cap { bool he_su_ebfer:1; bool he_su_ebfee:1; bool he_mu_ebfer:1; + bool eht_su_ebfer:1; + bool eht_su_ebfee:1; };struct mt7996_vif {
Signature · 1 line
2.25.1