mt76: mt7915: add 802.11 encap offload support
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/8 mt76: mt7915: add 802.11 encap offload support
It is currently limited to 3-address mode AP and STA interfaces
--- .../net/wireless/mediatek/mt76/mt7915/init.c | 1 + .../net/wireless/mediatek/mt76/mt7915/mac.c | 227 +++++++++++------- .../net/wireless/mediatek/mt76/mt7915/mac.h | 1 + .../net/wireless/mediatek/mt76/mt7915/mcu.c | 19 ++ .../net/wireless/mediatek/mt76/mt7915/mcu.h | 10 + drivers/net/wireless/mediatek/mt76/tx.c | 1 + 6 files changed, 176 insertions(+), 83 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +1 -0
@@ -261,6 +261,7 @@ mt7915_init_wiphy(struct ieee80211_hw *hw)wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_VHT_IBSS );ieee80211_hw_set (hw,HAS_RATE_CONTROL ); +ieee80211_hw_set (hw,SUPPORTS_TX_ENCAP_OFFLOAD ); hw->max_tx_fragments =4 ; }
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +144 -83
296 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/mac.h +1 -0
@@ -176,6 +176,7 @@ enum tx_mcu_port_q_idx {#define MT_TXD1_HDR_PAD GENMASK(19, 18)#define MT_TXD1_HDR_FORMAT GENMASK(17, 16)#define MT_TXD1_HDR_INFO GENMASK(15, 11) +#define MT_TXD1_ETH_802_3 BIT(15)#define MT_TXD1_VTA BIT(10)#define MT_TXD1_WLAN_IDX GENMASK(9, 0)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +19 -0
@@ -1688,6 +1688,24 @@ mt7915_mcu_wtbl_ht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,mt7915_mcu_wtbl_smps_tlv (skb, sta, sta_wtbl, wtbl_tlv); } +static void +mt7915_mcu_wtbl_hdr_trans_tlv (struct sk_buff *skb,struct ieee80211_vif *vif, +struct ieee80211_sta *sta, +void *sta_wtbl,void *wtbl_tlv) +{ +struct wtbl_hdr_trans *htr =NULL ; +struct tlv *tlv; + + tlv =mt7915_mcu_add_nested_tlv (skb,WTBL_HDR_TRANS ,sizeof (*htr), + wtbl_tlv, sta_wtbl); + htr = (struct wtbl_hdr_trans *)tlv; + htr->no_rx_trans = true; +if (vif->type ==NL80211_IFTYPE_STATION ) + htr->to_ds = true; +else + htr->from_ds = true; +} +int mt7915_mcu_add_smps (struct mt7915_dev *dev,struct ieee80211_vif *vif,struct ieee80211_sta *sta) {
@@ -2277,6 +2295,7 @@ int mt7915_mcu_add_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif, sta_wtbl, &skb);if (enable) {mt7915_mcu_wtbl_generic_tlv (skb, vif, sta, sta_wtbl, wtbl_hdr); +mt7915_mcu_wtbl_hdr_trans_tlv (skb, vif, sta, sta_wtbl, wtbl_hdr);if (sta)mt7915_mcu_wtbl_ht_tlv (skb, sta, sta_wtbl, wtbl_hdr); }
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +10 -0
@@ -551,6 +551,15 @@ struct wtbl_vht {u8 rsv[4 ]; } __packed; +struct wtbl_hdr_trans { +__le16 tag; +__le16 len; +u8 to_ds; +u8 from_ds; +u8 no_rx_trans; +u8 _rsv; +}; +enum {MT_BA_TYPE_INVALID ,MT_BA_TYPE_ORIGINATOR ,
@@ -972,6 +981,7 @@ enum {sizeof (struct wtbl_rx ) + \sizeof (struct wtbl_ht ) + \sizeof (struct wtbl_vht ) + \ +sizeof (struct wtbl_hdr_trans ) +\sizeof (struct wtbl_ba ) + \ sizeof(struct wtbl_smps))
drivers/net/wireless/mediatek/mt76/tx.c +1 -0
@@ -272,6 +272,7 @@ mt76_tx(struct mt76_phy *phy, struct ieee80211_sta *sta, }if ((dev->drv->drv_flags &MT_DRV_HW_MGMT_TXQ ) && + !(info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP ) && !ieee80211_is_data (hdr->frame_control) && !ieee80211_is_bufferable_mmpdu (hdr->frame_control)) { qid =MT_TXQ_PSD ;
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 2/8 mt76: mt7915: add encap offload for 4-address mode stations
Enable MWDS mode in firmware as well and fix txp->rept_wds_wcid for wcid >= 255
--- drivers/net/wireless/mediatek/mt76/mt76.h | 1 + .../net/wireless/mediatek/mt76/mt7915/mac.c | 7 ++- .../net/wireless/mediatek/mt76/mt7915/mac.h | 4 +- .../net/wireless/mediatek/mt76/mt7915/main.c | 19 ++++++++ .../net/wireless/mediatek/mt76/mt7915/mcu.c | 47 ++++++++++++++++++- .../net/wireless/mediatek/mt76/mt7915/mcu.h | 2 + .../wireless/mediatek/mt76/mt7915/mt7915.h | 3 ++ 7 files changed, 78 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +1 -0
@@ -185,6 +185,7 @@ struct mt76_queue_ops {enum mt76_wcid_flags {MT_WCID_FLAG_CHECK_PS ,MT_WCID_FLAG_PS , +MT_WCID_FLAG_4ADDR , };#define MT76_N_WCIDS 288
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +5 -2
@@ -799,7 +799,7 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, tx_info->buf[1 ].skip_unmap = true; tx_info->nbuf =MT_CT_DMA_BUF_NUM ; - txp->flags =cpu_to_le16 (MT_CT_INFO_APPLY_TXD ); + txp->flags =cpu_to_le16 (MT_CT_INFO_APPLY_TXD |MT_CT_INFO_FROM_HOST );if (!key) txp->flags |=cpu_to_le16 (MT_CT_INFO_NONE_CIPHER_FRAME );
@@ -824,7 +824,10 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,return id; txp->token =cpu_to_le16 (id); - txp->rept_wds_wcid =0xff ; +if (test_bit (MT_WCID_FLAG_4ADDR , &wcid->flags)) + txp->rept_wds_wcid =cpu_to_le16 (wcid->idx); +else + txp->rept_wds_wcid =cpu_to_le16 (0x3ff ); tx_info->skb =DMA_DUMMY_DATA ;return 0 ;
drivers/net/wireless/mediatek/mt76/mt7915/mac.h +2 -2
@@ -160,6 +160,7 @@ enum tx_mcu_port_q_idx {#define MT_CT_INFO_MGMT_FRAME BIT(2)#define MT_CT_INFO_NONE_CIPHER_FRAME BIT(3)#define MT_CT_INFO_HSR2_TX BIT(4) +#define MT_CT_INFO_FROM_HOST BIT(7)#define MT_TXD_SIZE (8 * 4)
@@ -255,8 +256,7 @@ struct mt7915_txp {__le16 flags;__le16 token;u8 bss_idx; -u8 rept_wds_wcid; -u8 rsv; +__le16 rept_wds_wcid;u8 nbuf;__le32 buf[MT_TXP_MAX_BUF_NUM ];__le16 len[MT_TXP_MAX_BUF_NUM ];
drivers/net/wireless/mediatek/mt76/mt7915/main.c +19 -0
@@ -173,6 +173,8 @@ static int mt7915_add_interface(struct ieee80211_hw *hw, mtxq->wcid = &mvif->sta.wcid; } + vif->offload_flags |=IEEE80211_OFFLOAD_ENCAP_4ADDR ; + out:mutex_unlock (&dev->mt76.mutex);
@@ -804,6 +806,22 @@ mt7915_sta_rc_update(struct ieee80211_hw *hw,ieee80211_queue_work (hw, &dev->rc_work); } +static void mt7915_sta_set_4addr (struct ieee80211_hw *hw, +struct ieee80211_vif *vif, +struct ieee80211_sta *sta, +bool enabled) +{ +struct mt7915_dev *dev =mt7915_hw_dev (hw); +struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv; + +if (enabled) +set_bit (MT_WCID_FLAG_4ADDR , &msta->wcid.flags); +else +clear_bit (MT_WCID_FLAG_4ADDR , &msta->wcid.flags); + +mt7915_mcu_sta_update_hdr_trans (dev, vif, sta); +} +const struct ieee80211_ops mt7915_ops = { .tx = mt7915_tx, .start = mt7915_start,
@@ -835,6 +853,7 @@ const struct ieee80211_ops mt7915_ops = { .set_antenna = mt7915_set_antenna, .set_coverage_class = mt7915_set_coverage_class, .sta_statistics = mt7915_sta_statistics, + .sta_set_4addr = mt7915_sta_set_4addr,#ifdef CONFIG_MAC80211_DEBUGFS .sta_add_debugfs = mt7915_sta_add_debugfs,#endif
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +46 -1
77 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +2 -0
@@ -201,6 +201,7 @@ enum {MCU_EXT_CMD_EDCA_UPDATE =0x27 ,MCU_EXT_CMD_DEV_INFO_UPDATE =0x2A ,MCU_EXT_CMD_THERMAL_CTRL =0x2c , +MCU_EXT_CMD_WTBL_UPDATE =0x32 ,MCU_EXT_CMD_SET_DRR_CTRL =0x36 ,MCU_EXT_CMD_SET_RDD_CTRL =0x3a , MCU_EXT_CMD_PROTECT_CTRL = 0x3e,
@@ -208,6 +209,7 @@ enum {MCU_EXT_CMD_RX_HDR_TRANS =0x47 ,MCU_EXT_CMD_SET_RX_PATH =0x4e ,MCU_EXT_CMD_TX_POWER_FEATURE_CTRL =0x58 , +MCU_EXT_CMD_MWDS_SUPPORT =0x80 ,MCU_EXT_CMD_SET_SER_TRIGGER =0x81 ,MCU_EXT_CMD_SCS_CTRL =0x82 , MCU_EXT_CMD_RATE_CTRL = 0x87,
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +3 -0
@@ -289,6 +289,9 @@ int mt7915_mcu_add_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif, struct ieee80211_sta *sta, bool enable);int mt7915_mcu_add_sta_adv (struct mt7915_dev *dev,struct ieee80211_vif *vif,struct ieee80211_sta *sta,bool enable); +int mt7915_mcu_sta_update_hdr_trans (struct mt7915_dev *dev, +struct ieee80211_vif *vif, +struct ieee80211_sta *sta);int mt7915_mcu_add_tx_ba (struct mt7915_dev *dev,struct ieee80211_ampdu_params *params,bool add);
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 3/8 mt76: use ieee80211_rx_list to pass frames to the network stack as a batch
In reply to Felix FietkauImproves icache footprint
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +13 -2
@@ -932,7 +932,8 @@ void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames, {struct ieee80211_sta *sta;struct ieee80211_hw *hw; -struct sk_buff *skb; +struct sk_buff *skb, *tmp; +LIST_HEAD (list);spin_lock (&dev->rx_lock);while ((skb =__skb_dequeue (frames)) !=NULL ) {
@@ -942,9 +943,19 @@ void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames, }mt76_rx_convert (dev, skb, &hw, &sta); -ieee80211_rx_napi (hw, sta, skb, napi); +ieee80211_rx_list (hw, sta, skb, &list); }spin_unlock (&dev->rx_lock); + +if (!napi) { +netif_receive_skb_list (&list); +return ; + } + +list_for_each_entry_safe (skb, tmp, &list, list) { +skb_list_del_init (skb); +napi_gro_receive (napi, skb); + } } void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q,
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 4/8 mt76: mt7615: add debugfs knob for setting extended local mac addresses
In reply to Felix FietkauThis is primarily for testing and can be used in combination with monitor mode to make the card respond to packets sent to a specific MAC address. For now this is only exposed as a debug/testing feature, later on the approach might be used to support more concurrent station interfaces
--- .../wireless/mediatek/mt76/mt7615/debugfs.c | 87 +++++++++++++++++++ .../wireless/mediatek/mt76/mt7615/mt7615.h | 2 + .../net/wireless/mediatek/mt76/mt7615/regs.h | 11 +++ 3 files changed, 100 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c +87 -0
@@ -365,6 +365,92 @@ mt7615_rf_reg_get(void *data, u64 *val)DEFINE_DEBUGFS_ATTRIBUTE (fops_rf_reg, mt7615_rf_reg_get, mt7615_rf_reg_set,"0x%08llx\n" ); +static ssize_t +mt7615_ext_mac_addr_read (struct file *file,char __user *userbuf, +size_t count,loff_t *ppos) +{ +struct mt7615_dev *dev = file->private_data; +char buf[32 * ((ETH_ALEN *3 ) +4 ) +1 ]; +u8 addr[ETH_ALEN ]; +int ofs =0 ; +int i; + +for (i =0 ; i <32 ; i++) { +if (!(dev->muar_mask &BIT (i))) +continue ; + +mt76_wr (dev,MT_WF_RMAC_MAR1 , +FIELD_PREP (MT_WF_RMAC_MAR1_IDX , i *2 ) | +MT_WF_RMAC_MAR1_START ); +put_unaligned_le32 (mt76_rr (dev,MT_WF_RMAC_MAR0 ), addr); +put_unaligned_le16 ((mt76_rr (dev,MT_WF_RMAC_MAR1 ) & +MT_WF_RMAC_MAR1_ADDR ), addr +4 ); + ofs +=snprintf (buf + ofs,sizeof (buf) - ofs,"%d=%pM\n" , i, addr); + } + +return simple_read_from_buffer (userbuf, count, ppos, buf, ofs); +} + +static ssize_t +mt7615_ext_mac_addr_write (struct file *file,const char __user *userbuf, +size_t count,loff_t *ppos) +{ +struct mt7615_dev *dev = file->private_data; +unsigned long idx =0 ; +u8 addr[ETH_ALEN ]; +char buf[32 ]; +char *p; + +if (count >sizeof (buf)) +return -EINVAL ; + +if (copy_from_user (buf, userbuf, count)) +return -EFAULT ; + + buf[sizeof (buf) -1 ] ='\0' ; + + p =strchr (buf,'=' ); +if (p) { + *p =0 ; + p++; + +if (kstrtoul (buf,0 , &idx) || idx >31 ) +return -EINVAL ; + }else { + idx =0 ; + p = buf; + } + +if (!mac_pton (p, addr)) +return -EINVAL ; + +if (is_valid_ether_addr (addr)) { + dev->muar_mask |=BIT (idx); + }else { +memset (addr,0 ,sizeof (addr)); + dev->muar_mask &= ~BIT (idx); + } + +mt76_rmw_field (dev,MT_WF_RMAC_MORE (0 ),MT_WF_RMAC_MORE_MUAR_MODE ,1 ); +mt76_wr (dev,MT_WF_RMAC_MAR0 ,get_unaligned_le32 (addr)); +mt76_wr (dev,MT_WF_RMAC_MAR1 , +get_unaligned_le16 (addr +4 ) | +FIELD_PREP (MT_WF_RMAC_MAR1_IDX , idx *2 ) | +MT_WF_RMAC_MAR1_START | +MT_WF_RMAC_MAR1_WRITE ); + +mt76_rmw_field (dev,MT_WF_RMAC_MORE (0 ),MT_WF_RMAC_MORE_MUAR_MODE , !!dev->muar_mask); + +return count; +} + +static const struct file_operations fops_ext_mac_addr = { + .open = simple_open, + .llseek = generic_file_llseek, + .read = mt7615_ext_mac_addr_read, + .write = mt7615_ext_mac_addr_write, +}; +int mt7615_init_debugfs (struct mt7615_dev *dev) {struct dentry *dir;
@@ -406,6 +492,7 @@ int mt7615_init_debugfs(struct mt7615_dev *dev) &fops_reset_test);debugfs_create_devm_seqfile (dev->mt76.dev,"temperature" , dir, mt7615_read_temperature); +debugfs_create_file ("ext_mac_addr" ,0600 , dir, dev, &fops_ext_mac_addr);debugfs_create_u32 ("rf_wfidx" ,0600 , dir, &dev->debugfs_rf_wf);debugfs_create_u32 ("rf_regidx" ,0600 , dir, &dev->debugfs_rf_reg);
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +2 -0
@@ -295,6 +295,8 @@ struct mt7615_dev {u32 debugfs_rf_wf;u32 debugfs_rf_reg; +u32 muar_mask; + #ifdef CONFIG_NL80211_TESTMODE struct { u32 *reg_backup;
drivers/net/wireless/mediatek/mt76/mt7615/regs.h +11 -0
@@ -333,6 +333,9 @@ enum mt7615_reg_base {#define MT_WF_RFCR_DROP_NDPA BIT(20)#define MT_WF_RFCR_DROP_UNWANTED_CTL BIT(21) +#define MT_WF_RMAC_MORE (_band) MT_WF_RMAC((_band) ? 0x124 : 0x024) +#define MT_WF_RMAC_MORE_MUAR_MODE GENMASK(31, 30) +#define MT_WF_RFCR1 (_band) MT_WF_RMAC((_band) ? 0x104 : 0x004)#define MT_WF_RFCR1_DROP_ACK BIT(4)#define MT_WF_RFCR1_DROP_BF_POLL BIT(5)
@@ -342,6 +345,14 @@ enum mt7615_reg_base {#define MT_CHFREQ (_band) MT_WF_RMAC((_band) ? 0x130 : 0x030) +#define MT_WF_RMAC_MAR0 MT_WF_RMAC(0x025c) +#define MT_WF_RMAC_MAR1 MT_WF_RMAC(0x0260) +#define MT_WF_RMAC_MAR1_ADDR GENMASK(15, 0) +#define MT_WF_RMAC_MAR1_START BIT(16) +#define MT_WF_RMAC_MAR1_WRITE BIT(17) +#define MT_WF_RMAC_MAR1_IDX GENMASK(29, 24) +#define MT_WF_RMAC_MAR1_GROUP GENMASK(31, 30) +#define MT_WF_RMAC_MIB_TIME0 MT_WF_RMAC(0x03c4)#define MT_WF_RMAC_MIB_RXTIME_CLR BIT(31)#define MT_WF_RMAC_MIB_RXTIME_EN BIT(30)
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 5/8 mt76: do not set NEEDS_UNIQUE_STA_ADDR for 7615 and 7915
In reply to Felix FietkauThe newer chipsets can deal with the same STA on multiple interfaces Preparation for supporting more station interfaces
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 1 - drivers/net/wireless/mediatek/mt76/mt7603/init.c | 1 + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +0 -1
@@ -314,7 +314,6 @@ mt76_phy_init(struct mt76_dev *dev, struct ieee80211_hw *hw)ieee80211_hw_set (hw,MFP_CAPABLE );ieee80211_hw_set (hw,AP_LINK_PS );ieee80211_hw_set (hw,REPORTS_TX_ACK_STATUS ); -ieee80211_hw_set (hw,NEEDS_UNIQUE_STA_ADDR ); wiphy->flags |=WIPHY_FLAG_IBSS_RSN ; wiphy->interface_modes =
drivers/net/wireless/mediatek/mt76/mt7603/init.c +1 -0
@@ -557,6 +557,7 @@ int mt7603_register_device(struct mt7603_dev *dev)ieee80211_hw_set (hw,TX_STATUS_NO_AMPDU_LEN );ieee80211_hw_set (hw,HOST_BROADCAST_PS_BUFFERING ); +ieee80211_hw_set (hw,NEEDS_UNIQUE_STA_ADDR );/* init led callbacks */ if (IS_ENABLED (CONFIG_MT76_LEDS )) {
drivers/net/wireless/mediatek/mt76/mt76x02_util.c +1 -0
@@ -186,6 +186,7 @@ void mt76x02_init_device(struct mt76x02_dev *dev)ieee80211_hw_set (hw,SUPPORTS_HT_CCK_RATES );ieee80211_hw_set (hw,HOST_BROADCAST_PS_BUFFERING ); +ieee80211_hw_set (hw,NEEDS_UNIQUE_STA_ADDR ); dev->mt76.global_wcid.idx =255 ; dev->mt76.global_wcid.hw_key_idx =-1 ;
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 6/8 mt76: mt7915: support 32 station interfaces
In reply to Felix FietkauWhen looking for a MAC address slot, start by using main BSSID slots 1-3, afterwards use 16 repeater mode BSSID slots, then start using the slots usually used for AP mode.
This search order should prevent unnecessary conflicts with AP mode interfaces on the same PHY
--- .../net/wireless/mediatek/mt76/mt7915/init.c | 10 ++-- .../net/wireless/mediatek/mt76/mt7915/main.c | 56 ++++++++++++++----- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 53 ++++++++++++++++-- .../net/wireless/mediatek/mt76/mt7915/mcu.h | 1 + .../wireless/mediatek/mt76/mt7915/mt7915.h | 27 +++------ 5 files changed, 105 insertions(+), 42 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +6 -4
@@ -195,12 +195,14 @@ static const struct ieee80211_iface_limit if_limits[] = { .max = 1, .types = BIT(NL80211_IFTYPE_ADHOC) }, { - .max = MT7915_MAX_INTERFACES, + .max = 16, .types = BIT(NL80211_IFTYPE_AP) | #ifdef CONFIG_MAC80211_MESH - BIT(NL80211_IFTYPE_MESH_POINT) | + BIT(NL80211_IFTYPE_MESH_POINT) #endif - BIT(NL80211_IFTYPE_STATION) + }, { + .max = MT7915_MAX_INTERFACES, + .types = BIT(NL80211_IFTYPE_STATION) } };
@@ -208,7 +210,7 @@ static const struct ieee80211_iface_combination if_comb[] = { { .limits = if_limits, .n_limits = ARRAY_SIZE(if_limits), - .max_interfaces = 4, + .max_interfaces = MT7915_MAX_INTERFACES, .num_different_channels = 1, .beacon_int_infra_match = true, .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
drivers/net/wireless/mediatek/mt76/mt7915/main.c +41 -15
94 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +49 -4
86 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +1 -0
@@ -207,6 +207,7 @@ enum {MCU_EXT_CMD_PROTECT_CTRL =0x3e ,MCU_EXT_CMD_MAC_INIT_CTRL =0x46 ,MCU_EXT_CMD_RX_HDR_TRANS =0x47 , +MCU_EXT_CMD_MUAR_UPDATE =0x48 ,MCU_EXT_CMD_SET_RX_PATH =0x4e ,MCU_EXT_CMD_TX_POWER_FEATURE_CTRL =0x58 , MCU_EXT_CMD_MWDS_SUPPORT = 0x80,
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +8 -19
@@ -9,7 +9,7 @@#include "../mt76.h" #include "regs.h" -#define MT7915_MAX_INTERFACES 4 +#define MT7915_MAX_INTERFACES 32#define MT7915_MAX_WMM_SETS 4#define MT7915_WTBL_SIZE 288#define MT7915_WTBL_RESERVED (MT7915_WTBL_SIZE - 1)
@@ -113,7 +113,7 @@ struct mt7915_phy {struct ieee80211_sband_iftype_data iftype[2 ][NUM_NL80211_IFTYPES ];u32 rxfilter; -u32 omac_mask; +u64 omac_mask;u16 noise;u16 chainmask;
@@ -171,24 +171,13 @@ enum {HW_BSSID_1 ,HW_BSSID_2 ,HW_BSSID_3 , -HW_BSSID_MAX , +HW_BSSID_MAX =HW_BSSID_3 ,EXT_BSSID_START =0x10 ,EXT_BSSID_1 , -EXT_BSSID_2 , -EXT_BSSID_3 , -EXT_BSSID_4 , -EXT_BSSID_5 , -EXT_BSSID_6 , -EXT_BSSID_7 , -EXT_BSSID_8 , -EXT_BSSID_9 , -EXT_BSSID_10 , -EXT_BSSID_11 , -EXT_BSSID_12 , -EXT_BSSID_13 , -EXT_BSSID_14 , -EXT_BSSID_15 , -EXT_BSSID_END +EXT_BSSID_15 =0x1f , +EXT_BSSID_MAX =EXT_BSSID_15 , +REPEATER_BSSID_START =0x20 , + REPEATER_BSSID_MAX = 0x3f, }; enum {
@@ -281,7 +270,7 @@ int mt7915_dma_init(struct mt7915_dev *dev);void mt7915_dma_prefetch (struct mt7915_dev *dev);void mt7915_dma_cleanup (struct mt7915_dev *dev);int mt7915_mcu_init (struct mt7915_dev *dev); -int mt7915_mcu_add_dev_info (struct mt7915_dev *dev, +int mt7915_mcu_add_dev_info (struct mt7915_phy *phy,struct ieee80211_vif *vif,bool enable);int mt7915_mcu_add_bss_info (struct mt7915_phy *phy,struct ieee80211_vif *vif,int enable);
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 7/8 mt76: mt7915: fix processing txfree events
In reply to Felix FietkauIn the MT7915 info, the fields for the WLAN index / queue overlap with the token id, and the MT_TX_FREE_PAIR bit indicates, which one is present.
If MT_TX_FREE_PAIR is set, skip processing the token index, since the data will not be valid.
This fixes accidentally freeing tokens which are still in use by the hardware with a wrong station pointer.
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +1 -0
@@ -972,6 +972,7 @@ void mt7915_mac_tx_free(struct mt7915_dev *dev, struct sk_buff *skb)if (list_empty (&msta->poll_list))list_add_tail (&msta->poll_list, &dev->sta_poll_list);spin_unlock_bh (&dev->sta_poll_lock); +continue ; } msdu =FIELD_GET (MT_TX_FREE_MSDU_ID , info);
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 8/8 mt76: mt7915: use napi_consume_skb to bulk-free tx skbs
In reply to Felix FietkauSlightly improves performance
--- .../net/wireless/mediatek/mt76/mt7915/mac.c | 52 ++++++++----------- 1 file changed, 21 insertions(+), 31 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +21 -31
@@ -858,17 +858,19 @@ mt7915_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi)ieee80211_start_tx_ba_session (sta, tid,0 ); } -static inline void -mt7915_tx_status (struct ieee80211_sta *sta,struct ieee80211_hw *hw, -struct ieee80211_tx_info *info,struct sk_buff *skb) +static void +mt7915_tx_complete_status (struct mt76_dev *mdev,struct sk_buff *skb, +struct ieee80211_sta *sta,u8 stat, +struct list_head *free_list) { +struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);struct ieee80211_tx_status status = { .sta = sta, .info = info, + .skb = skb, + .free_list = free_list, }; - -if (skb) - status.skb = skb; +struct ieee80211_hw *hw;if (sta) {struct mt7915_sta *msta;
@@ -877,17 +879,6 @@ mt7915_tx_status(struct ieee80211_sta *sta, struct ieee80211_hw *hw, status.rate = &msta->stats.tx_rate; } -/* use status_ext to report HE rate */ -ieee80211_tx_status_ext (hw, &status); -} - -static void -mt7915_tx_complete_status (struct mt76_dev *mdev,struct sk_buff *skb, -struct ieee80211_sta *sta,u8 stat) -{ -struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); -struct ieee80211_hw *hw; - hw =mt76_tx_status_get_hw (mdev, skb);if (info->flags &IEEE80211_TX_CTL_AMPDU )
@@ -900,17 +891,7 @@ mt7915_tx_complete_status(struct mt76_dev *mdev, struct sk_buff *skb, info->flags |=IEEE80211_TX_STAT_ACK ; info->status.tx_time =0 ; - -if (info->flags & (IEEE80211_TX_CTL_REQ_TX_STATUS | -IEEE80211_TX_CTL_HW_80211_ENCAP )) { -mt7915_tx_status (sta, hw, info, skb); -return ; - } - -if (sta || !(info->flags &IEEE80211_TX_CTL_NO_ACK )) -mt7915_tx_status (sta, hw, info,NULL ); - -ieee80211_free_txskb (hw, skb); +ieee80211_tx_status_ext (hw, &status); } void mt7915_txp_skb_unmap(struct mt76_dev *dev,
@@ -931,6 +912,8 @@ void mt7915_mac_tx_free(struct mt7915_dev *dev, struct sk_buff *skb)struct mt76_dev *mdev = &dev->mt76;struct mt76_txwi_cache *txwi;struct ieee80211_sta *sta =NULL ; +LIST_HEAD (free_list); +struct sk_buff *tmp;u8 i, count;/* clean DMA queues and unmap buffers first */
@@ -1002,16 +985,22 @@ void mt7915_mac_tx_free(struct mt7915_dev *dev, struct sk_buff *skb)atomic_cmpxchg (&wcid->non_aql_packets, pending,0 ); } -mt7915_tx_complete_status (mdev, txwi->skb, sta, stat); +mt7915_tx_complete_status (mdev, txwi->skb, sta, stat, &free_list); txwi->skb =NULL ; }mt76_put_txwi (mdev, txwi); } -dev_kfree_skb (skb);mt7915_mac_sta_poll (dev);mt76_worker_schedule (&dev->mt76.tx_worker); + +napi_consume_skb (skb,1 ); + +list_for_each_entry_safe (skb, tmp, &free_list, list) { +skb_list_del_init (skb); +napi_consume_skb (skb,1 ); + } }void mt7915_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue_entry *e)
@@ -1044,7 +1033,8 @@ void mt7915_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e) wcid =rcu_dereference (dev->mt76.wcid[cb->wcid]); -mt7915_tx_complete_status (mdev, e->skb,wcid_to_sta (wcid),0 ); +mt7915_tx_complete_status (mdev, e->skb,wcid_to_sta (wcid),0 , +NULL ); } }
Signature · 1 line
2.28.0