wifi: mt76: connac: add MBSSID support for mt7996
Subsystems (2)
Shayne Chen
reviewerPATCH 1/9 wifi: mt76: connac: add MBSSID support for mt7996
From: Chank Chen <[email protected]>
Add bss_info_uni_mbssid tag and implement 802.11v MBSSID support for mt7996 chipsets.
--- .../wireless/mediatek/mt76/mt76_connac_mcu.h | 10 +++ .../net/wireless/mediatek/mt76/mt7996/init.c | 2 + .../net/wireless/mediatek/mt76/mt7996/mcu.c | 79 ++++++++++++++++++- 3 files changed, 90 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +10 -0
@@ -1279,6 +1279,7 @@ enum {UNI_BSS_INFO_RLM =2 ,UNI_BSS_INFO_BSS_COLOR =4 ,UNI_BSS_INFO_HE_BASIC =5 , +UNI_BSS_INFO_11V_MBSSID =6 ,UNI_BSS_INFO_BCN_CONTENT =7 ,UNI_BSS_INFO_BCN_CSA =8 , UNI_BSS_INFO_BCN_BCC = 9,
@@ -1549,6 +1550,15 @@ struct bss_info_uni_he {u8 rsv[2 ]; } __packed; +struct bss_info_uni_mbssid { +__le16 tag; +__le16 len; +u8 max_indicator; +u8 mbss_idx; +u8 tx_bss_omac_idx; +u8 rsv; +} __packed; +struct mt76_connac_gtk_rekey_tlv {__le16 tag;__le16 len;
drivers/net/wireless/mediatek/mt76/mt7996/init.c +2 -0
@@ -180,6 +180,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw) wiphy->n_iface_combinations =ARRAY_SIZE (if_comb); wiphy->reg_notifier = mt7996_regd_notifier; wiphy->flags |=WIPHY_FLAG_HAS_CHANNEL_SWITCH ; + wiphy->mbssid_max_interfaces =16 ;wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_BSS_COLOR );wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_VHT_IBSS );
@@ -203,6 +204,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw)ieee80211_hw_set (hw,SUPPORTS_TX_ENCAP_OFFLOAD );ieee80211_hw_set (hw,SUPPORTS_RX_DECAP_OFFLOAD );ieee80211_hw_set (hw,WANT_MONITOR_VIF ); +ieee80211_hw_set (hw,SUPPORTS_MULTI_BSSID ); hw->max_tx_fragments =4 ;
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +78 -1
109 lines not on this page · raw message
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 2/9 wifi: mt76: update beacon size limitation
From: MeiChia Chiu <[email protected]>
To accommodate 11v MBSSID IE and support maximum 16 MBSSIDs, expand the beacon size limitation for beacon and inband discovery commands.
--- .../net/wireless/mediatek/mt76/mt7915/main.c | 8 +-- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 49 +++++++++++-------- .../net/wireless/mediatek/mt76/mt7915/mcu.h | 18 +++---- .../wireless/mediatek/mt76/mt7915/mt7915.h | 2 + .../net/wireless/mediatek/mt76/mt7996/main.c | 4 +- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 38 ++++++++------ .../net/wireless/mediatek/mt76/mt7996/mcu.h | 11 ++--- 7 files changed, 72 insertions(+), 58 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/main.c +5 -3
@@ -646,11 +646,13 @@ static void mt7915_bss_info_changed(struct ieee80211_hw *hw,mt7915_update_bss_color (hw, vif, &info->he_bss_color);if (changed & (BSS_CHANGED_BEACON | -BSS_CHANGED_BEACON_ENABLED | -BSS_CHANGED_UNSOL_BCAST_PROBE_RESP | -BSS_CHANGED_FILS_DISCOVERY )) +BSS_CHANGED_BEACON_ENABLED ))mt7915_mcu_add_beacon (hw, vif, info->enable_beacon, changed); +if (changed & (BSS_CHANGED_UNSOL_BCAST_PROBE_RESP | +BSS_CHANGED_FILS_DISCOVERY )) +mt7915_mcu_add_inband_discov (dev, vif, changed); +if (set_bss_info ==0 )mt7915_mcu_add_bss_info (phy, vif, false);if (set_sta ==0 )
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +29 -20
110 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +8 -10
@@ -495,10 +495,14 @@ enum { SER_RECOVER }; -#define MT7915_MAX_BEACON_SIZE 512 -#define MT7915_MAX_INBAND_FRAME_SIZE 256 -#define MT7915_MAX_BSS_OFFLOAD_SIZE (MT7915_MAX_BEACON_SIZE + \ - MT7915_MAX_INBAND_FRAME_SIZE + \ +#define MT7915_MAX_BEACON_SIZE 1308 +#define MT7915_BEACON_UPDATE_SIZE (sizeof(struct sta_req_hdr) + \ + sizeof(struct bss_info_bcn) + \ + sizeof(struct bss_info_bcn_cntdwn) + \ + sizeof(struct bss_info_bcn_mbss) + \ + MT_TXD_SIZE + \ + sizeof(struct bss_info_bcn_cont)) +#define MT7915_MAX_BSS_OFFLOAD_SIZE (MT7915_MAX_BEACON_SIZE + \ MT7915_BEACON_UPDATE_SIZE)#define MT7915_BSS_UPDATE_MAX_SIZE (sizeof(struct sta_req_hdr) + \
@@ -511,12 +515,6 @@ enum { sizeof(struct bss_info_bmc_rate) +\ sizeof(struct bss_info_ext_bss)) -#define MT7915_BEACON_UPDATE_SIZE (sizeof(struct sta_req_hdr) + \ - sizeof(struct bss_info_bcn_cntdwn) + \ - sizeof(struct bss_info_bcn_mbss) + \ - sizeof(struct bss_info_bcn_cont) + \ - sizeof(struct bss_info_inband_discovery)) -static inline s8 mt7915_get_power_bound (struct mt7915_phy *phy,s8 txpower) {
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +2 -0
@@ -447,6 +447,8 @@ int mt7915_mcu_add_rx_ba(struct mt7915_dev *dev, bool add);int mt7915_mcu_update_bss_color (struct mt7915_dev *dev,struct ieee80211_vif *vif,struct cfg80211_he_bss_color *he_bss_color); +int mt7915_mcu_add_inband_discov (struct mt7915_dev *dev,struct ieee80211_vif *vif, +u32 changed);int mt7915_mcu_add_beacon (struct ieee80211_hw *hw,struct ieee80211_vif *vif,int enable,u32 changed); int mt7915_mcu_add_obss_spr(struct mt7915_phy *phy, struct ieee80211_vif *vif,
drivers/net/wireless/mediatek/mt76/mt7996/main.c +2 -2
@@ -615,8 +615,8 @@ static void mt7996_bss_info_changed(struct ieee80211_hw *hw,mt7996_mcu_add_beacon (hw, vif, info->enable_beacon); } -if (changed &BSS_CHANGED_UNSOL_BCAST_PROBE_RESP || - changed &BSS_CHANGED_FILS_DISCOVERY ) +if (changed & (BSS_CHANGED_UNSOL_BCAST_PROBE_RESP | +BSS_CHANGED_FILS_DISCOVERY ))mt7996_mcu_beacon_inband_discov (dev, vif, changed);if (changed &BSS_CHANGED_MU_GROUPS )
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +22 -16
@@ -2221,7 +2221,7 @@ mt7996_mcu_beacon_cont(struct mt7996_dev *dev, struct ieee80211_vif *vif, bcn->bcc_ie_pos =cpu_to_le16 (offset -3 ); } - buf = (u8 *)bcn +sizeof (*bcn) -MAX_BEACON_SIZE ; + buf = (u8 *)bcn +sizeof (*bcn);mt7996_mac_write_txwi (dev, (__le32 *)buf, skb, wcid,NULL ,0 ,0 ,BSS_CHANGED_BEACON );
@@ -2239,28 +2239,21 @@ int mt7996_mcu_add_beacon(struct ieee80211_hw *hw,struct sk_buff *skb, *rskb;struct tlv *tlv;struct bss_bcn_content_tlv *bcn; +int len;if (vif->bss_conf.nontransmitted)return 0 ; rskb =__mt7996_mcu_alloc_bss_req (&dev->mt76, &mvif->mt76, -MT7996_BEACON_UPDATE_SIZE ); +MT7996_MAX_BSS_OFFLOAD_SIZE );if (IS_ERR (rskb))return PTR_ERR (rskb); - tlv =mt7996_mcu_add_uni_tlv (rskb, -UNI_BSS_INFO_BCN_CONTENT ,sizeof (*bcn)); - bcn = (struct bss_bcn_content_tlv *)tlv; - bcn->enable = en; - -if (!en) - goto out; - skb =ieee80211_beacon_get_template (hw, vif, &offs,0 );if (!skb)return -EINVAL ; -if (skb->len >MAX_BEACON_SIZE -MT_TXD_SIZE ) { +if (skb->len >MT7996_MAX_BEACON_SIZE ) {dev_err (dev->mt76.dev,"Bcn size limit exceed\n" );dev_kfree_skb (skb);return -EINVAL ;
@@ -2269,11 +2262,18 @@ int mt7996_mcu_add_beacon(struct ieee80211_hw *hw, info =IEEE80211_SKB_CB (skb); info->hw_queue |=FIELD_PREP (MT_TX_HW_QUEUE_PHY , phy->mt76->band_idx); + len =sizeof (*bcn) +MT_TXD_SIZE + skb->len; + tlv =mt7996_mcu_add_uni_tlv (rskb,UNI_BSS_INFO_BCN_CONTENT , len); + bcn = (struct bss_bcn_content_tlv *)tlv; + bcn->enable = en; +if (!en) + goto out; +mt7996_mcu_beacon_cont (dev, vif, rskb, skb, bcn, &offs);mt7996_mcu_beacon_mbss (rskb, skb, vif, bcn, &offs);mt7996_mcu_beacon_cntdwn (vif, rskb, skb, &offs); -dev_kfree_skb (skb); out: +dev_kfree_skb (skb);return mt76_mcu_skb_send_msg (&phy->dev->mt76, rskb,MCU_WMWA_UNI_CMD (BSS_INFO_UPDATE ), true); }
@@ -2294,9 +2294,13 @@ int mt7996_mcu_beacon_inband_discov(struct mt7996_dev *dev,struct sk_buff *rskb, *skb =NULL ;struct tlv *tlv;u8 *buf, interval; +int len; + +if (vif->bss_conf.nontransmitted) +return 0 ; rskb =__mt7996_mcu_alloc_bss_req (&dev->mt76, &mvif->mt76, -MT7996_INBAND_FRAME_SIZE ); +MT7996_MAX_BSS_OFFLOAD_SIZE );if (IS_ERR (rskb))return PTR_ERR (rskb);
@@ -2313,7 +2317,7 @@ int mt7996_mcu_beacon_inband_discov(struct mt7996_dev *dev,if (!skb)return -EINVAL ; -if (skb->len >MAX_INBAND_FRAME_SIZE -MT_TXD_SIZE ) { +if (skb->len >MT7996_MAX_BEACON_SIZE ) {dev_err (dev->mt76.dev,"inband discovery size limit exceed\n" );dev_kfree_skb (skb);return -EINVAL ;
@@ -2324,7 +2328,9 @@ int mt7996_mcu_beacon_inband_discov(struct mt7996_dev *dev, info->band = band; info->hw_queue |=FIELD_PREP (MT_TX_HW_QUEUE_PHY , phy->mt76->band_idx); - tlv =mt7996_mcu_add_uni_tlv (rskb,UNI_BSS_INFO_OFFLOAD ,sizeof (*discov)); + len =sizeof (*discov) +MT_TXD_SIZE + skb->len; + + tlv =mt7996_mcu_add_uni_tlv (rskb,UNI_BSS_INFO_OFFLOAD , len); discov = (struct bss_inband_discovery_tlv *)tlv; discov->tx_mode =OFFLOAD_TX_MODE_SU ;
@@ -2335,7 +2341,7 @@ int mt7996_mcu_beacon_inband_discov(struct mt7996_dev *dev, discov->enable = true; discov->wcid =cpu_to_le16 (MT7996_WTBL_RESERVED ); - buf = (u8 *)tlv +sizeof (*discov) -MAX_INBAND_FRAME_SIZE ; + buf = (u8 *)tlv +sizeof (*discov);mt7996_mac_write_txwi (dev, (__le32 *)buf, skb, wcid,NULL ,0 ,0 , changed);
drivers/net/wireless/mediatek/mt76/mt7996/mcu.h +4 -7
@@ -270,8 +270,6 @@ struct bss_inband_discovery_tlv {u8 enable;__le16 wcid;__le16 prob_rsp_len; -#define MAX_INBAND_FRAME_SIZE 512 -u8 pkt[MAX_INBAND_FRAME_SIZE ]; } __packed;struct bss_bcn_content_tlv {
@@ -283,8 +281,6 @@ struct bss_bcn_content_tlv {u8 enable;u8 type;__le16 pkt_len; -#define MAX_BEACON_SIZE 512 -u8 pkt[MAX_BEACON_SIZE ]; } __packed;struct bss_bcn_cntdwn_tlv {
@@ -591,13 +587,14 @@ enum { sizeof(struct sta_rec_hdr_trans) + \ sizeof(struct tlv)) +#define MT7996_MAX_BEACON_SIZE 1342#define MT7996_BEACON_UPDATE_SIZE (sizeof(struct bss_req_hdr) + \ sizeof(struct bss_bcn_content_tlv) + \ + MT_TXD_SIZE + \ sizeof(struct bss_bcn_cntdwn_tlv) + \ sizeof(struct bss_bcn_mbss_tlv)) - -#define MT7996_INBAND_FRAME_SIZE (sizeof(struct bss_req_hdr) + \ - sizeof(struct bss_inband_discovery_tlv)) +#define MT7996_MAX_BSS_OFFLOAD_SIZE (MT7996_MAX_BEACON_SIZE + \ + MT7996_BEACON_UPDATE_SIZE)enum {UNI_BAND_CONFIG_RADIO_ENABLE ,
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 3/9 wifi: mt76: check sta rx control frame to multibss capability
In reply to Shayne ChenFrom: Allen Ye <[email protected]>
Add CAP3_RX_CTRL_FRAME_TO_MULTIBSS check when setting sta_muru_tlv, which is used to get stations's capability of receiving control frames when running OFDMA with MBSSIDs.
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 ++ drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +2 -0
@@ -906,6 +906,8 @@ mt7915_mcu_sta_muru_tlv(struct mt7915_dev *dev, struct sk_buff *skb,HE_MAC (CAP2_MU_CASCADING , elem->mac_cap_info[2 ]); muru->ofdma_ul.uo_ra =HE_MAC (CAP3_OFDMA_RA , elem->mac_cap_info[3 ]); + muru->ofdma_ul.rx_ctrl_frame_to_mbss = +HE_MAC (CAP3_RX_CTRL_FRAME_TO_MULTIBSS , elem->mac_cap_info[3 ]); } static void
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +2 -0
@@ -1173,6 +1173,8 @@ mt7996_mcu_sta_muru_tlv(struct mt7996_dev *dev, struct sk_buff *skb,HE_MAC (CAP2_MU_CASCADING , elem->mac_cap_info[2 ]); muru->ofdma_ul.uo_ra =HE_MAC (CAP3_OFDMA_RA , elem->mac_cap_info[3 ]); + muru->ofdma_ul.rx_ctrl_frame_to_mbss = +HE_MAC (CAP3_RX_CTRL_FRAME_TO_MULTIBSS , elem->mac_cap_info[3 ]); } static inline bool
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 4/9 wifi: mt76: fix potential memory leak of beacon commands
In reply to Shayne ChenFrom: Bo Jiao <[email protected]>
Fix potential memory leak when setting beacon and inband discovery commands.
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 10 ++++++++-- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +8 -2
@@ -1927,8 +1927,10 @@ mt7915_mcu_add_inband_discov(struct mt7915_dev *dev, struct ieee80211_vif *vif, skb =ieee80211_get_unsol_bcast_probe_resp_tmpl (hw, vif); } -if (!skb) +if (!skb) { +dev_kfree_skb (rskb);return -EINVAL ; + } info =IEEE80211_SKB_CB (skb); info->control.vif = vif;
@@ -1940,6 +1942,7 @@ mt7915_mcu_add_inband_discov(struct mt7915_dev *dev, struct ieee80211_vif *vif,if (skb->len >MT7915_MAX_BEACON_SIZE ) {dev_err (dev->mt76.dev,"inband discovery size limit exceed\n" ); +dev_kfree_skb (rskb);dev_kfree_skb (skb);return -EINVAL ; }
@@ -1996,11 +1999,14 @@ int mt7915_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif, goto out; skb =ieee80211_beacon_get_template (hw, vif, &offs,0 ); -if (!skb) +if (!skb) { +dev_kfree_skb (rskb);return -EINVAL ; + }if (skb->len >MT7915_MAX_BEACON_SIZE ) {dev_err (dev->mt76.dev,"Bcn size limit exceed\n" ); +dev_kfree_skb (rskb);dev_kfree_skb (skb);return -EINVAL ; }
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +8 -2
@@ -2252,11 +2252,14 @@ int mt7996_mcu_add_beacon(struct ieee80211_hw *hw,return PTR_ERR (rskb); skb =ieee80211_beacon_get_template (hw, vif, &offs,0 ); -if (!skb) +if (!skb) { +dev_kfree_skb (rskb);return -EINVAL ; + }if (skb->len >MT7996_MAX_BEACON_SIZE ) {dev_err (dev->mt76.dev,"Bcn size limit exceed\n" ); +dev_kfree_skb (rskb);dev_kfree_skb (skb);return -EINVAL ; }
@@ -2316,11 +2319,14 @@ int mt7996_mcu_beacon_inband_discov(struct mt7996_dev *dev, skb =ieee80211_get_unsol_bcast_probe_resp_tmpl (hw, vif); } -if (!skb) +if (!skb) { +dev_kfree_skb (rskb);return -EINVAL ; + }if (skb->len >MT7996_MAX_BEACON_SIZE ) {dev_err (dev->mt76.dev,"inband discovery size limit exceed\n" ); +dev_kfree_skb (rskb);dev_kfree_skb (skb);return -EINVAL ; }
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 5/9 wifi: mt76: get rid of false alamrs of tx emission issues
In reply to Shayne ChenFrom: StanleyYP Wang <[email protected]>
When the set_chan_info command is set with CH_SWITCH_NORMAL reason, even if the action is UNI_CHANNEL_RX_PATH, it'll still generate some unexpected tones, which might confuse DFS CAC tests that there are some tone leakages. To get rid of these kinds of false alarms, always bypass DPD calibration when IEEE80211_CONF_IDLE is set.
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +3 -3
@@ -2742,10 +2742,10 @@ int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd)if (mt76_connac_spe_idx (phy->mt76->antenna_mask)) req.tx_path_num =fls (phy->mt76->antenna_mask); -if (cmd ==MCU_EXT_CMD (SET_RX_PATH ) || - dev->mt76.hw->conf.flags &IEEE80211_CONF_MONITOR ) +if (dev->mt76.hw->conf.flags &IEEE80211_CONF_MONITOR ) req.switch_reason =CH_SWITCH_NORMAL ; -else if (phy->mt76->hw->conf.flags &IEEE80211_CONF_OFFCHANNEL ) +else if (phy->mt76->hw->conf.flags &IEEE80211_CONF_OFFCHANNEL || + phy->mt76->hw->conf.flags &IEEE80211_CONF_IDLE ) req.switch_reason =CH_SWITCH_SCAN_BYPASS_DPD ;else if (!cfg80211_reg_can_beacon (phy->mt76->hw->wiphy, chandef,NL80211_IFTYPE_AP ))
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +3 -3
@@ -3182,10 +3182,10 @@ int mt7996_mcu_set_chan_info(struct mt7996_phy *phy, u16 tag) .channel_band = ch_band[chandef->chan->band], }; -if (tag ==UNI_CHANNEL_RX_PATH || - dev->mt76.hw->conf.flags &IEEE80211_CONF_MONITOR ) +if (dev->mt76.hw->conf.flags &IEEE80211_CONF_MONITOR ) req.switch_reason =CH_SWITCH_NORMAL ; -else if (phy->mt76->hw->conf.flags &IEEE80211_CONF_OFFCHANNEL ) +else if (phy->mt76->hw->conf.flags &IEEE80211_CONF_OFFCHANNEL || + phy->mt76->hw->conf.flags &IEEE80211_CONF_IDLE ) req.switch_reason =CH_SWITCH_SCAN_BYPASS_DPD ;else if (!cfg80211_reg_can_beacon (phy->mt76->hw->wiphy, chandef,NL80211_IFTYPE_AP ))
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 6/9 wifi: mt76: fix per-band IEEE80211_CONF_MONITOR flag comparison
In reply to Shayne ChenUse the correct ieee80211_conf of each band for IEEE80211_CONF_MONITOR comparison.
--- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +1 -1
@@ -2147,7 +2147,7 @@ int mt7615_mcu_set_chan_info(struct mt7615_phy *phy, int cmd) };if (cmd ==MCU_EXT_CMD (SET_RX_PATH ) || - dev->mt76.hw->conf.flags &IEEE80211_CONF_MONITOR ) + phy->mt76->hw->conf.flags &IEEE80211_CONF_MONITOR ) req.switch_reason =CH_SWITCH_NORMAL ;else if (phy->mt76->hw->conf.flags &IEEE80211_CONF_OFFCHANNEL ) req.switch_reason =CH_SWITCH_SCAN_BYPASS_DPD ;
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +1 -1
@@ -2742,7 +2742,7 @@ int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd)if (mt76_connac_spe_idx (phy->mt76->antenna_mask)) req.tx_path_num =fls (phy->mt76->antenna_mask); -if (dev->mt76.hw->conf.flags &IEEE80211_CONF_MONITOR ) +if (phy->mt76->hw->conf.flags &IEEE80211_CONF_MONITOR ) req.switch_reason =CH_SWITCH_NORMAL ;else if (phy->mt76->hw->conf.flags &IEEE80211_CONF_OFFCHANNEL || phy->mt76->hw->conf.flags &IEEE80211_CONF_IDLE )
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +1 -1
@@ -3182,7 +3182,7 @@ int mt7996_mcu_set_chan_info(struct mt7996_phy *phy, u16 tag) .channel_band = ch_band[chandef->chan->band], }; -if (dev->mt76.hw->conf.flags &IEEE80211_CONF_MONITOR ) +if (phy->mt76->hw->conf.flags &IEEE80211_CONF_MONITOR ) req.switch_reason =CH_SWITCH_NORMAL ;else if (phy->mt76->hw->conf.flags &IEEE80211_CONF_OFFCHANNEL || phy->mt76->hw->conf.flags &IEEE80211_CONF_IDLE )
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 7/9 wifi: mt76: check vif type before reporting cca and csa
In reply to Shayne ChenFrom: Peter Chiu <[email protected]>
Do not report cca and csa finish to upper layer on station type vif to prevent warnings caused by setting beacon.
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 8 +++++--- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +5 -3
@@ -225,8 +225,10 @@ int mt7915_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3)static void mt7915_mcu_csa_finish (void *priv,u8 *mac,struct ieee80211_vif *vif) { -if (vif->bss_conf.csa_active) -ieee80211_csa_finish (vif); +if (!vif->bss_conf.csa_active || vif->type ==NL80211_IFTYPE_STATION ) +return ; + +ieee80211_csa_finish (vif); } static void
@@ -326,7 +328,7 @@ mt7915_mcu_rx_log_message(struct mt7915_dev *dev, struct sk_buff *skb)static void mt7915_mcu_cca_finish (void *priv,u8 *mac,struct ieee80211_vif *vif) { -if (!vif->bss_conf.color_change_active) +if (!vif->bss_conf.color_change_active || vif->type ==NL80211_IFTYPE_STATION )return ;ieee80211_color_change_finish (vif);
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +5 -3
@@ -324,8 +324,10 @@ int mt7996_mcu_wa_cmd(struct mt7996_dev *dev, int cmd, u32 a1, u32 a2, u32 a3)static void mt7996_mcu_csa_finish (void *priv,u8 *mac,struct ieee80211_vif *vif) { -if (vif->bss_conf.csa_active) -ieee80211_csa_finish (vif); +if (!vif->bss_conf.csa_active || vif->type ==NL80211_IFTYPE_STATION ) +return ; + +ieee80211_csa_finish (vif); } static void
@@ -399,7 +401,7 @@ mt7996_mcu_rx_log_message(struct mt7996_dev *dev, struct sk_buff *skb)static void mt7996_mcu_cca_finish (void *priv,u8 *mac,struct ieee80211_vif *vif) { -if (!vif->bss_conf.color_change_active) +if (!vif->bss_conf.color_change_active || vif->type ==NL80211_IFTYPE_STATION )return ;ieee80211_color_change_finish (vif);
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 8/9 wifi: mt76: mt7915: update mpdu density capability
In reply to Shayne ChenFrom: Peter Chiu <[email protected]>
Set mpdu density to 2 usec for non-mt7915 Wi-Fi 6 generation chipsets to align to the hardware capability which improves the throughput.
--- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +12 -4
@@ -392,8 +392,12 @@ mt7915_init_wiphy(struct mt7915_phy *phy) phy->mt76->sband_2g.sband.ht_cap.cap |=IEEE80211_HT_CAP_LDPC_CODING |IEEE80211_HT_CAP_MAX_AMSDU ; - phy->mt76->sband_2g.sband.ht_cap.ampdu_density = -IEEE80211_HT_MPDU_DENSITY_4 ; +if (is_mt7915 (&dev->mt76)) + phy->mt76->sband_2g.sband.ht_cap.ampdu_density = +IEEE80211_HT_MPDU_DENSITY_4 ; +else + phy->mt76->sband_2g.sband.ht_cap.ampdu_density = +IEEE80211_HT_MPDU_DENSITY_2 ; }if (phy->mt76->cap.has_5ghz) {
@@ -403,10 +407,11 @@ mt7915_init_wiphy(struct mt7915_phy *phy) phy->mt76->sband_5g.sband.ht_cap.cap |=IEEE80211_HT_CAP_LDPC_CODING |IEEE80211_HT_CAP_MAX_AMSDU ; - phy->mt76->sband_5g.sband.ht_cap.ampdu_density = -IEEE80211_HT_MPDU_DENSITY_4 ;if (is_mt7915 (&dev->mt76)) { + phy->mt76->sband_5g.sband.ht_cap.ampdu_density = +IEEE80211_HT_MPDU_DENSITY_4 ; + vht_cap->cap |=IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 |IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK ;
@@ -416,6 +421,9 @@ mt7915_init_wiphy(struct mt7915_phy *phy)IEEE80211_VHT_CAP_SHORT_GI_160 |FIELD_PREP (IEEE80211_VHT_CAP_EXT_NSS_BW_MASK ,1 ); }else { + phy->mt76->sband_5g.sband.ht_cap.ampdu_density = +IEEE80211_HT_MPDU_DENSITY_2 ; + vht_cap->cap |=IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK ;
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 9/9 wifi: mt76: mt7915: fix beamforming availability check
In reply to Shayne ChenFrom: MeiChia Chiu <[email protected]>
Without this patch, when ap sets the tx stream number to 2, ap won't send any beamforming packet.
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +2 -2
@@ -1019,13 +1019,13 @@ mt7915_is_ebf_supported(struct mt7915_phy *phy, struct ieee80211_vif *vif, struct ieee80211_sta *sta, bool bfee) {struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv; -int tx_ant =hweight8 (phy->mt76->chainmask) -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.he_cap.has_he) {
Signature · 1 line
2.39.2