wifi: mt76: remove mt76_calculate_default_rate()
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/14 wifi: mt76: remove mt76_calculate_default_rate()
It is only used in mt76_connac2_mac_tx_rate_val, inline it there.
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 24 ------------------- drivers/net/wireless/mediatek/mt76/mt76.h | 2 -- .../wireless/mediatek/mt76/mt76_connac_mac.c | 14 ++++++++++- 3 files changed, 13 insertions(+), 27 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +0 -24
@@ -1808,30 +1808,6 @@ mt76_init_queue(struct mt76_dev *dev, int qid, int idx, int n_desc, }EXPORT_SYMBOL_GPL (mt76_init_queue); -u16 mt76_calculate_default_rate (struct mt76_phy *phy, -struct ieee80211_vif *vif,int rateidx) -{ -struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv; -struct cfg80211_chan_def *chandef = mvif->ctx ? - &mvif->ctx->def : - &phy->chandef; -int offset =0 ; - -if (chandef->chan->band !=NL80211_BAND_2GHZ ) - offset =4 ; - -/* pick the lowest rate for hidden nodes */ -if (rateidx <0 ) - rateidx =0 ; - - rateidx += offset; -if (rateidx >=ARRAY_SIZE (mt76_rates)) - rateidx = offset; - -return mt76_rates[rateidx].hw_value; -} -EXPORT_SYMBOL_GPL (mt76_calculate_default_rate); -void mt76_ethtool_worker (struct mt76_ethtool_worker_info *wi,struct mt76_sta_stats *stats,bool eht) {
drivers/net/wireless/mediatek/mt76/mt76.h +0 -2
@@ -1192,8 +1192,6 @@ int mt76_get_of_data_from_nvmem(struct mt76_dev *dev, void *eep,struct mt76_queue *mt76_init_queue (struct mt76_dev *dev,int qid,int idx,int n_desc,int ring_base,void *wed,u32 flags); -u16 mt76_calculate_default_rate (struct mt76_phy *phy, -struct ieee80211_vif *vif,int rateidx);static inline int mt76_init_tx_queue (struct mt76_phy *phy,int qid,int idx,int n_desc,int ring_base,void *wed,u32 flags)
drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c +13 -1
@@ -299,6 +299,7 @@ u16 mt76_connac2_mac_tx_rate_val(struct mt76_phy *mphy, &mvif->ctx->def : &mphy->chandef;u8 nss =0 , mode =0 , band = chandef->chan->band;int rateidx =0 , mcast_rate; +int offset =0 ;if (!vif) goto legacy;
@@ -330,7 +331,18 @@ u16 mt76_connac2_mac_tx_rate_val(struct mt76_phy *mphy, rateidx =ffs (vif->bss_conf.basic_rates) -1 ; legacy: - rateidx =mt76_calculate_default_rate (mphy, vif, rateidx); +if (band !=NL80211_BAND_2GHZ ) + offset =4 ; + +/* pick the lowest rate for hidden nodes */ +if (rateidx <0 ) + rateidx =0 ; + + rateidx += offset; +if (rateidx >=ARRAY_SIZE (mt76_rates)) + rateidx = offset; + + rateidx = mt76_rates[rateidx].hw_value; mode = rateidx >>8 ; rateidx &=GENMASK (7 ,0 ); out:
Signature · 1 line
2.47.1
Felix Fietkau
maintainerPATCH 2/14 wifi: mt76: mt7996: remove phy->monitor_vif
It is unused
--- drivers/net/wireless/mediatek/mt76/mt7996/main.c | 8 -------- drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 2 -- 2 files changed, 10 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/main.c +0 -8
@@ -188,10 +188,6 @@ static int mt7996_add_interface(struct ieee80211_hw *hw,mutex_lock (&dev->mt76.mutex); -if (vif->type ==NL80211_IFTYPE_MONITOR && -is_zero_ether_addr (vif->addr)) - phy->monitor_vif = vif; - mvif->mt76.idx =__ffs64 (~dev->mt76.vif_mask);if (mvif->mt76.idx >=mt7996_max_interface_num (dev)) { ret = -ENOSPC ;
@@ -270,10 +266,6 @@ static void mt7996_remove_interface(struct ieee80211_hw *hw,mt7996_mcu_add_sta (dev, vif,NULL , false, false);mt7996_mcu_add_bss_info (phy, vif, false); - -if (vif == phy->monitor_vif) - phy->monitor_vif =NULL ; -mt7996_mcu_add_dev_info (phy, vif, false);rcu_assign_pointer (dev->mt76.wcid[idx],NULL );
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +0 -2
@@ -246,8 +246,6 @@ struct mt7996_phy {struct ieee80211_sband_iftype_data iftype[NUM_NL80211_BANDS ][NUM_NL80211_IFTYPES ]; -struct ieee80211_vif *monitor_vif; -struct thermal_cooling_device *cdev;u8 cdev_state;u8 throttle_state;
Signature · 1 line
2.47.1
Felix Fietkau
maintainerPATCH 3/14 wifi: mt76: mt7915: fix slot time for 5/6GHz
In reply to Felix FietkauIt should only be set to 20 for long slot time on 2.4 GHz
--- drivers/net/wireless/mediatek/mt76/mt7915/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/main.c +5 -1
@@ -634,7 +634,11 @@ static void mt7915_bss_info_changed(struct ieee80211_hw *hw,mt7915_mac_enable_rtscts (dev, vif, info->use_cts_prot);if (changed &BSS_CHANGED_ERP_SLOT ) { -int slottime = info->use_short_slot ?9 :20 ; +int slottime =9 ; + +if (phy->mt76->chandef.chan->band ==NL80211_BAND_2GHZ && + !info->use_short_slot) + slottime =20 ;if (slottime != phy->slottime) { phy->slottime = slottime;
Signature · 1 line
2.47.1
Felix Fietkau
maintainerPATCH 4/14 wifi: mt76: mt7915: fix eifs value on older chipsets
In reply to Felix FietkauUse the default firmware values
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +1 -1
@@ -1163,7 +1163,7 @@ void mt7915_mac_set_timing(struct mt7915_phy *phy)u32 ofdm =FIELD_PREP (MT_TIMEOUT_VAL_PLCP ,60 ) |FIELD_PREP (MT_TIMEOUT_VAL_CCA ,28 );u8 band = phy->mt76->band_idx; -int eifs_ofdm =360 , sifs =10 , offset; +int eifs_ofdm =84 , sifs =10 , offset;bool a_band = !(phy->mt76->chandef.chan->band ==NL80211_BAND_2GHZ );if (!test_bit (MT76_STATE_RUNNING , &phy->mt76->state))
Signature · 1 line
2.47.1
Felix Fietkau
maintainerPATCH 5/14 wifi: mt76: mt7996: fix rx filter setting for bfee functionality
In reply to Felix FietkauFix rx filter setting to prevent dropping NDPA frames. Without this change, bfee functionality may behave abnormally.
--- drivers/net/wireless/mediatek/mt76/mt7996/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/main.c +1 -2
@@ -488,8 +488,7 @@ static void mt7996_configure_filter(struct ieee80211_hw *hw,MT76_FILTER (CONTROL ,MT_WF_RFCR_DROP_CTS |MT_WF_RFCR_DROP_RTS | -MT_WF_RFCR_DROP_CTL_RSV | -MT_WF_RFCR_DROP_NDPA ); +MT_WF_RFCR_DROP_CTL_RSV ); *total_flags = flags;mt76_wr (dev,MT_WF_RFCR (phy->mt76->band_idx), phy->rxfilter);
Signature · 1 line
2.47.1
Felix Fietkau
maintainerPATCH 6/14 wifi: mt76: mt7915: reduce the number of command retries
In reply to Felix FietkauThe need to retry a command is really uncommon. Reduce the retries to 1 to speed up recovery from firmware issues.
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +1 -1
@@ -2388,7 +2388,7 @@ int mt7915_mcu_init_firmware(struct mt7915_dev *dev)int mt7915_mcu_init (struct mt7915_dev *dev) {static const struct mt76_mcu_ops mt7915_mcu_ops = { - .max_retry =3 , + .max_retry =1 , .headroom =sizeof (struct mt76_connac2_mcu_txd ), .mcu_skb_prepare_msg = mt76_connac2_mcu_fill_message, .mcu_skb_send_msg = mt7915_mcu_send_message,
Signature · 1 line
2.47.1
Felix Fietkau
maintainerPATCH 7/14 wifi: mt76: mt7915: decrease timeout for commonly issued MCU commands
In reply to Felix FietkauThis allows faster recovery from firmware issues
--- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +21 -0
@@ -194,6 +194,25 @@ mt7915_mcu_parse_response(struct mt76_dev *mdev, int cmd,return ret; } +static void +mt7915_mcu_set_timeout (struct mt76_dev *mdev,int cmd) +{ +if ((cmd & __MCU_CMD_FIELD_ID) !=MCU_CMD_EXT_CID ) +return ; + +switch (FIELD_GET (__MCU_CMD_FIELD_EXT_ID, cmd)) { +case MCU_EXT_CMD_THERMAL_CTRL : +case MCU_EXT_CMD_GET_MIB_INFO : +case MCU_EXT_CMD_PHY_STAT_INFO : +case MCU_EXT_CMD_STA_REC_UPDATE : +case MCU_EXT_CMD_BSS_INFO_UPDATE : + mdev->mcu.timeout =2 *HZ ; +return ; +default : +break ; + } +} +static int mt7915_mcu_send_message (struct mt76_dev *mdev,struct sk_buff *skb,int cmd,int *wait_seq)
@@ -208,6 +227,8 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,else qid =MT_MCUQ_WM ; +mt7915_mcu_set_timeout (mdev, cmd); +return mt76_tx_queue_skb_raw (dev, mdev->q_mcu[qid], skb,0 ); }
Signature · 1 line
2.47.1
Felix Fietkau
maintainerPATCH 8/14 wifi: mt76: only enable tx worker after setting the channel
In reply to Felix FietkauAvoids sending packets too early
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +1 -1
@@ -958,11 +958,11 @@ int mt76_set_channel(struct mt76_phy *phy, struct cfg80211_chan_def *chandef,if (chandef->chan != phy->main_chan)memset (phy->chan_state,0 ,sizeof (*phy->chan_state)); -mt76_worker_enable (&dev->tx_worker); ret = dev->drv->set_channel (phy);clear_bit (MT76_RESET , &phy->state); +mt76_worker_enable (&dev->tx_worker);mt76_worker_schedule (&dev->tx_worker);mutex_unlock (&dev->mutex);
Signature · 1 line
2.47.1
Felix Fietkau
maintainerPATCH 9/14 wifi: mt76: mt7915: ensure that only one sta entry is active per mac address
In reply to Felix FietkauWhen a client is roaming to a different AP interface, a duplicate wtbl entry can be created. This can lead to lost packets or aggregation issues until the old entry expires.
In order to fix this issue, delete any conflicting entries from WTBL whenever a station is authorized.
--- .../net/wireless/mediatek/mt76/mt7915/main.c | 58 ++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/main.c +57 -1
@@ -368,8 +368,12 @@ static int mt7915_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,int idx = key->keyidx;int err =0 ; -if (sta && !wcid->sta) +if (sta && !wcid->sta) { +if (cmd !=SET_KEY ) +return 0 ; +return -EOPNOTSUPP ; + }/* The hardware does not support per-STA RX GTK, fallback * to software mode for these.
@@ -765,6 +769,57 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,return 0 ; } +struct drop_sta_iter { +struct mt7915_dev *dev; +struct ieee80211_hw *hw; +struct ieee80211_vif *vif; +u8 sta_addr[ETH_ALEN ]; +}; + +static void +__mt7915_drop_sta (void *ptr,u8 *mac,struct ieee80211_vif *vif) +{ +struct drop_sta_iter *data = ptr; +struct ieee80211_sta *sta; +struct mt7915_sta *msta; + +if (vif == data->vif || vif->type !=NL80211_IFTYPE_AP ) +return ; + + sta =ieee80211_find_sta_by_ifaddr (data->hw, data->sta_addr, mac); +if (!sta) +return ; + + msta = (struct mt7915_sta *)sta->drv_priv; +mt7915_mcu_add_sta (data->dev, vif, sta,CONN_STATE_DISCONNECT , false); + msta->wcid.sta_disabled =1 ; + msta->wcid.sta =0 ; +} + +static void +mt7915_drop_other_sta (struct mt7915_dev *dev,struct ieee80211_vif *vif, +struct ieee80211_sta *sta) +{ +struct mt76_phy *ext_phy = dev->mt76.phys[MT_BAND1 ]; +struct drop_sta_iter data = { + .dev = dev, + .hw = dev->mphy.hw, + .vif = vif, + }; + +if (vif->type !=NL80211_IFTYPE_AP ) +return ; + +memcpy (data.sta_addr, sta->addr,ETH_ALEN ); +ieee80211_iterate_active_interfaces (data.hw,0 , __mt7915_drop_sta, &data); + +if (!ext_phy) +return ; + + data.hw = ext_phy->hw; +ieee80211_iterate_active_interfaces (data.hw,0 , __mt7915_drop_sta, &data); +} +int mt7915_mac_sta_event (struct mt76_dev *mdev,struct ieee80211_vif *vif,struct ieee80211_sta *sta,enum mt76_sta_event ev) {
@@ -793,6 +848,7 @@ int mt7915_mac_sta_event(struct mt76_dev *mdev, struct ieee80211_vif *vif,return 0 ;case MT76_STA_EVENT_AUTHORIZE : +mt7915_drop_other_sta (dev, vif, sta);return mt7915_mcu_add_sta (dev, vif, sta,CONN_STATE_PORT_SECURE , false);case MT76_STA_EVENT_DISASSOC :
Signature · 1 line
2.47.1
Felix Fietkau
maintainerPATCH 10/14 wifi: mt76: mt7915: hold dev->mutex while interacting with the thermal state
In reply to Felix FietkauAvoid issuing MCU calls during a hardware restart
--- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +5 -2
@@ -53,7 +53,9 @@ static ssize_t mt7915_thermal_temp_show(struct device *dev,switch (i) {case 0 : +mutex_lock (&phy->dev->mt76.mutex); temperature =mt7915_mcu_get_temperature (phy); +mutex_unlock (&phy->dev->mt76.mutex);if (temperature <0 )return temperature;/* display in millidegree celcius */
@@ -95,9 +97,8 @@ static ssize_t mt7915_thermal_temp_store(struct device *dev, } phy->throttle_temp[i -1 ] = val; -mutex_unlock (&phy->dev->mt76.mutex); - ret =mt7915_mcu_set_thermal_protect (phy); +mutex_unlock (&phy->dev->mt76.mutex);if (ret)return ret;
@@ -159,7 +160,9 @@ mt7915_thermal_set_cur_throttle_state(struct thermal_cooling_device *cdev,* cooling_device convention: 0 = no cooling, more = more cooling * mcu convention: 1 = max cooling, more = less cooling */ +mutex_lock (&phy->dev->mt76.mutex); ret =mt7915_mcu_set_thermal_throttling (phy, throttling); +mutex_unlock (&phy->dev->mt76.mutex);if (ret)return ret;
Signature · 1 line
2.47.1
Felix Fietkau
maintainerPATCH 11/14 wifi: mt76: mt7915: firmware restart on devices with a second pcie link
In reply to Felix FietkauIt seems that the firmware checks the register used for detecting matching PCIe links in order to figure out if a secondary PCIe link is enabled. Write the register again just before starting the firmware on hw reset, in order to fix an issue that left the second band unusable after restart.
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 2 ++ drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 1 + drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 1 + 3 files changed, 4 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +2 -0
@@ -1388,6 +1388,8 @@ mt7915_mac_restart(struct mt7915_dev *dev)if (dev_is_pci (mdev->dev)) {mt76_wr (dev,MT_PCIE_MAC_INT_ENABLE ,0xff );if (dev->hif2) { +mt76_wr (dev,MT_PCIE_RECOG_ID , + dev->hif2->index |MT_PCIE_RECOG_ID_SEM );if (is_mt7915 (mdev))mt76_wr (dev,MT_PCIE1_MAC_INT_ENABLE ,0xff );else
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +1 -0
@@ -191,6 +191,7 @@ struct mt7915_hif {struct device *dev;void __iomem *regs;int irq; +u32 index; };struct mt7915_phy {
drivers/net/wireless/mediatek/mt76/mt7915/pci.c +1 -0
@@ -42,6 +42,7 @@ static struct mt7915_hif *mt7915_pci_get_hif2(u32 idx)continue ;get_device (hif->dev); + hif->index = idx; goto out; } hif =NULL ;
Signature · 1 line
2.47.1
Felix Fietkau
maintainerPATCH 12/14 wifi: mt76: mt7915: fix omac index assignment after hardware reset
In reply to Felix FietkauReset per-phy mac address slot mask in order to avoid leaking entries.
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +5 -0
@@ -1444,9 +1444,11 @@ static void mt7915_mac_full_reset(struct mt7915_dev *dev) {struct mt76_phy *ext_phy; +struct mt7915_phy *phy2;int i; ext_phy = dev->mt76.phys[MT_BAND1 ]; + phy2 = ext_phy ? ext_phy->priv :NULL ; dev->recovery.hw_full_reset = true;
@@ -1476,6 +1478,9 @@ mt7915_mac_full_reset(struct mt7915_dev *dev)memset (dev->mt76.wcid_mask,0 ,sizeof (dev->mt76.wcid_mask)); dev->mt76.vif_mask =0 ; + dev->phy.omac_mask =0 ; +if (phy2) + phy2->omac_mask =0 ; i =mt76_wcid_alloc (dev->mt76.wcid_mask,MT7915_WTBL_STA ); dev->mt76.global_wcid.idx = i;
Signature · 1 line
2.47.1
Felix Fietkau
maintainerPATCH 13/14 wifi: mt76: mt7996: use mac80211 .sta_state op
In reply to Felix FietkauAllows adding stations before assoc, though they are not passed to the firmware yet at that point.
--- .../net/wireless/mediatek/mt76/mt7996/main.c | 89 ++++++++++++------- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 6 +- .../net/wireless/mediatek/mt76/mt7996/mmio.c | 1 + .../wireless/mediatek/mt76/mt7996/mt7996.h | 4 +- 4 files changed, 61 insertions(+), 39 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/main.c +55 -34
@@ -246,7 +246,7 @@ static int mt7996_add_interface(struct ieee80211_hw *hw,* interface, since firmware only records BSSID when the entry is new */ if (vif->type !=NL80211_IFTYPE_STATION ) -mt7996_mcu_add_sta (dev, vif,NULL , true, true); +mt7996_mcu_add_sta (dev, vif,NULL ,CONN_STATE_PORT_SECURE , true);rcu_assign_pointer (dev->mt76.wcid[idx], &mvif->sta.wcid); out:
@@ -264,7 +264,7 @@ static void mt7996_remove_interface(struct ieee80211_hw *hw,struct mt7996_phy *phy =mt7996_hw_phy (hw);int idx = msta->wcid.idx; -mt7996_mcu_add_sta (dev, vif,NULL , false, false); +mt7996_mcu_add_sta (dev, vif,NULL ,CONN_STATE_DISCONNECT , false);mt7996_mcu_add_bss_info (phy, vif, false);mt7996_mcu_add_dev_info (phy, vif, false);
@@ -333,6 +333,9 @@ static int mt7996_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))return -EOPNOTSUPP ; +if (sta && !wcid->sta) +return -EOPNOTSUPP ; +/* fall back to sw encryption for unsupported ciphers */ switch (key->cipher) {case WLAN_CIPHER_SUITE_TKIP :
@@ -592,7 +595,7 @@ static void mt7996_bss_info_changed(struct ieee80211_hw *hw, (changed & BSS_CHANGED_ASSOC && vif->cfg.assoc) || (changed & BSS_CHANGED_BEACON_ENABLED && info->enable_beacon)) {mt7996_mcu_add_bss_info (phy, vif, true); -mt7996_mcu_add_sta (dev, vif,NULL , true, +mt7996_mcu_add_sta (dev, vif,NULL ,CONN_STATE_PORT_SECURE , !!(changed &BSS_CHANGED_BSSID )); }
@@ -663,7 +666,7 @@ int mt7996_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv;struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;u8 band_idx = mvif->phy->mt76->band_idx; -int ret, idx; +int idx; idx =mt76_wcid_alloc (dev->mt76.wcid_mask,MT7996_WTBL_STA );if (idx <0 )
@@ -675,18 +678,53 @@ int mt7996_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif, msta->wcid.sta =1 ; msta->wcid.idx = idx; msta->wcid.phy_idx = band_idx; - msta->wcid.tx_info |=MT_WCID_TX_INFO_SET ;ewma_avg_signal_init (&msta->avg_ack_signal);mt7996_mac_wtbl_update (dev, idx,MT_WTBL_UPDATE_ADM_COUNT_CLEAR ); +mt7996_mcu_add_sta (dev, vif, sta,CONN_STATE_DISCONNECT , true); - ret =mt7996_mcu_add_sta (dev, vif, sta, true, true); -if (ret) -return ret; +return 0 ; +} -return mt7996_mcu_add_rate_ctrl (dev, vif, sta, false); +int mt7996_mac_sta_event (struct mt76_dev *mdev,struct ieee80211_vif *vif, +struct ieee80211_sta *sta,enum mt76_sta_event ev) +{ + struct mt7996_dev *dev = container_of(mdev, struct mt7996_dev, mt76); +struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv; +int i, ret; + +switch (ev) { +case MT76_STA_EVENT_ASSOC : + ret =mt7996_mcu_add_sta (dev, vif, sta,CONN_STATE_CONNECT , true); +if (ret) +return ret; + + ret =mt7996_mcu_add_rate_ctrl (dev, vif, sta, false); +if (ret) +return ret; + + msta->wcid.tx_info |=MT_WCID_TX_INFO_SET ; + msta->wcid.sta =1 ; + +return 0 ; + +case MT76_STA_EVENT_AUTHORIZE : +return mt7996_mcu_add_sta (dev, vif, sta,CONN_STATE_PORT_SECURE , false); + +case MT76_STA_EVENT_DISASSOC : +for (i =0 ; i <ARRAY_SIZE (msta->twt.flow); i++) +mt7996_mac_twt_teardown_flow (dev, msta, i); + +mt7996_mcu_add_sta (dev, vif, sta,CONN_STATE_DISCONNECT , false); + msta->wcid.sta_disabled =1 ; + msta->wcid.sta =0 ; + +return 0 ; + } + +return 0 ; } void mt7996_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
@@ -694,16 +732,10 @@ void mt7996_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif, { struct mt7996_dev *dev = container_of(mdev, struct mt7996_dev, mt76);struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv; -int i; - -mt7996_mcu_add_sta (dev, vif, sta, false, false);mt7996_mac_wtbl_update (dev, msta->wcid.idx,MT_WTBL_UPDATE_ADM_COUNT_CLEAR ); -for (i =0 ; i <ARRAY_SIZE (msta->twt.flow); i++) -mt7996_mac_twt_teardown_flow (dev, msta, i); -spin_lock_bh (&mdev->sta_poll_lock);if (!list_empty (&msta->wcid.poll_list))list_del_init (&msta->wcid.poll_list);
@@ -808,22 +840,6 @@ mt7996_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,return ret; } -static int -mt7996_sta_add (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -struct ieee80211_sta *sta) -{ -return mt76_sta_state (hw, vif, sta,IEEE80211_STA_NOTEXIST , -IEEE80211_STA_NONE ); -} - -static int -mt7996_sta_remove (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -struct ieee80211_sta *sta) -{ -return mt76_sta_state (hw, vif, sta,IEEE80211_STA_NONE , -IEEE80211_STA_NOTEXIST ); -} -static int mt7996_get_stats (struct ieee80211_hw *hw,struct ieee80211_low_level_stats *stats)
@@ -1100,6 +1116,9 @@ static void mt7996_sta_set_4addr(struct ieee80211_hw *hw,else clear_bit (MT_WCID_FLAG_4ADDR , &msta->wcid.flags); +if (!msta->wcid.sta) +return ; +mt7996_mcu_wtbl_update_hdr_trans (dev, vif, sta); }
@@ -1116,6 +1135,9 @@ static void mt7996_sta_set_decap_offload(struct ieee80211_hw *hw,else clear_bit (MT_WCID_FLAG_HDR_TRANS , &msta->wcid.flags); +if (!msta->wcid.sta) +return ; +mt7996_mcu_wtbl_update_hdr_trans (dev, vif, sta); }
@@ -1429,7 +1451,7 @@ mt7996_net_fill_forward_path(struct ieee80211_hw *hw,if (!mtk_wed_device_active (wed))return -ENODEV ; -if (msta->wcid.idx >MT7996_WTBL_STA ) +if (!msta->wcid.sta || msta->wcid.idx >MT7996_WTBL_STA )return -EIO ; path->type =DEV_PATH_MTK_WDMA ;
@@ -1461,8 +1483,7 @@ const struct ieee80211_ops mt7996_ops = { .conf_tx = mt7996_conf_tx, .configure_filter = mt7996_configure_filter, .bss_info_changed = mt7996_bss_info_changed, - .sta_add = mt7996_sta_add, - .sta_remove = mt7996_sta_remove, + .sta_state = mt76_sta_state, .sta_pre_rcu_remove = mt76_sta_pre_rcu_remove, .link_sta_rc_update = mt7996_sta_rc_update, .set_key = mt7996_set_key,
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +2 -4
@@ -2169,13 +2169,12 @@ mt7996_mcu_add_group(struct mt7996_dev *dev, struct ieee80211_vif *vif, }int mt7996_mcu_add_sta (struct mt7996_dev *dev,struct ieee80211_vif *vif, -struct ieee80211_sta *sta,bool enable,bool newly) +struct ieee80211_sta *sta,int conn_state,bool newly) {struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;struct ieee80211_link_sta *link_sta;struct mt7996_sta *msta;struct sk_buff *skb; -int conn_state;int ret; msta = sta ? (struct mt7996_sta *)sta->drv_priv : &mvif->sta;
@@ -2188,11 +2187,10 @@ int mt7996_mcu_add_sta(struct mt7996_dev *dev, struct ieee80211_vif *vif,return PTR_ERR (skb);/* starec basic */ - conn_state = enable ?CONN_STATE_PORT_SECURE :CONN_STATE_DISCONNECT ;mt76_connac_mcu_sta_basic_tlv (&dev->mt76, skb, vif, link_sta, conn_state, newly); -if (!enable) +if (conn_state ==CONN_STATE_DISCONNECT ) goto out;/* starec hdr trans */
drivers/net/wireless/mediatek/mt76/mt7996/mmio.c +1 -0
@@ -618,6 +618,7 @@ struct mt7996_dev *mt7996_mmio_probe(struct device *pdev, .rx_check = mt7996_rx_check, .rx_poll_complete = mt7996_rx_poll_complete, .sta_add = mt7996_mac_sta_add, + .sta_event = mt7996_mac_sta_event, .sta_remove = mt7996_mac_sta_remove, .update_survey = mt7996_update_channel, .set_channel = mt7996_set_channel,
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +3 -1
@@ -502,7 +502,7 @@ int mt7996_mcu_add_dev_info(struct mt7996_phy *phy,int mt7996_mcu_add_bss_info (struct mt7996_phy *phy,struct ieee80211_vif *vif,int enable);int mt7996_mcu_add_sta (struct mt7996_dev *dev,struct ieee80211_vif *vif, -struct ieee80211_sta *sta,bool enable,bool newly); +struct ieee80211_sta *sta,int conn_state,bool newly);int mt7996_mcu_add_tx_ba (struct mt7996_dev *dev,struct ieee80211_ampdu_params *params,bool add);
@@ -626,6 +626,8 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi,void mt7996_mac_set_coverage_class (struct mt7996_phy *phy);int mt7996_mac_sta_add (struct mt76_dev *mdev,struct ieee80211_vif *vif,struct ieee80211_sta *sta); +int mt7996_mac_sta_event (struct mt76_dev *mdev,struct ieee80211_vif *vif, +struct ieee80211_sta *sta,enum mt76_sta_event ev);void mt7996_mac_sta_remove (struct mt76_dev *mdev,struct ieee80211_vif *vif,struct ieee80211_sta *sta);void mt7996_mac_work (struct work_struct *work);
Signature · 1 line
2.47.1
Felix Fietkau
maintainerPATCH 14/14 wifi: mt76: do not add wcid entries to sta poll list during MCU reset
In reply to Felix FietkauFixes linked list management issues during restart, where sta entries can be recreated and reinitialized while still in the poll list, triggering kernel warnings.
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 12 ++++++++++++ drivers/net/wireless/mediatek/mt76/mt76.h | 1 + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 7 +------ drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 12 ++---------- .../wireless/mediatek/mt76/mt76_connac_mac.c | 6 +----- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 17 +++-------------- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 17 +++-------------- drivers/net/wireless/mediatek/mt76/mt7925/mac.c | 17 +++-------------- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 17 +++-------------- 9 files changed, 29 insertions(+), 77 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +12 -0
@@ -1595,6 +1595,18 @@ void mt76_wcid_cleanup(struct mt76_dev *dev, struct mt76_wcid *wcid) }EXPORT_SYMBOL_GPL (mt76_wcid_cleanup); +void mt76_wcid_add_poll (struct mt76_dev *dev,struct mt76_wcid *wcid) +{ +if (test_bit (MT76_MCU_RESET , &dev->phy.state)) +return ; + +spin_lock_bh (&dev->sta_poll_lock); +if (list_empty (&wcid->poll_list)) +list_add_tail (&wcid->poll_list, &dev->sta_poll_list); +spin_unlock_bh (&dev->sta_poll_lock); +} +EXPORT_SYMBOL_GPL (mt76_wcid_add_poll); +int mt76_get_txpower (struct ieee80211_hw *hw,struct ieee80211_vif *vif,unsigned int link_id,int *dbm) {
drivers/net/wireless/mediatek/mt76/mt76.h +1 -0
@@ -1735,5 +1735,6 @@ mt76_token_put(struct mt76_dev *dev, int token)void mt76_wcid_init (struct mt76_wcid *wcid);void mt76_wcid_cleanup (struct mt76_dev *dev,struct mt76_wcid *wcid); +void mt76_wcid_add_poll (struct mt76_dev *dev,struct mt76_wcid *wcid);#endif
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +1 -6
@@ -1277,12 +1277,7 @@ void mt7603_mac_add_txs(struct mt7603_dev *dev, void *data) msta = container_of(wcid, struct mt7603_sta, wcid); sta =wcid_to_sta (wcid); - -if (list_empty (&msta->wcid.poll_list)) { -spin_lock_bh (&dev->mt76.sta_poll_lock); -list_add_tail (&msta->wcid.poll_list, &dev->mt76.sta_poll_list); -spin_unlock_bh (&dev->mt76.sta_poll_lock); - } +mt76_wcid_add_poll (&dev->mt76, &msta->wcid);if (mt7603_mac_add_txs_skb (dev, msta, pid, txs_data)) goto out;
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +2 -10
@@ -387,11 +387,7 @@ static int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)struct mt7615_sta *msta; msta = container_of(status->wcid, struct mt7615_sta, wcid); -spin_lock_bh (&dev->mt76.sta_poll_lock); -if (list_empty (&msta->wcid.poll_list)) -list_add_tail (&msta->wcid.poll_list, - &dev->mt76.sta_poll_list); -spin_unlock_bh (&dev->mt76.sta_poll_lock); +mt76_wcid_add_poll (&dev->mt76, &msta->wcid); } if (mt76_is_mmio(&dev->mt76) && (rxd0 & csum_mask) == csum_mask &&
@@ -1514,11 +1510,7 @@ static void mt7615_mac_add_txs(struct mt7615_dev *dev, void *data) msta = container_of(wcid, struct mt7615_sta, wcid); sta =wcid_to_sta (wcid); - -spin_lock_bh (&dev->mt76.sta_poll_lock); -if (list_empty (&msta->wcid.poll_list)) -list_add_tail (&msta->wcid.poll_list, &dev->mt76.sta_poll_list); -spin_unlock_bh (&dev->mt76.sta_poll_lock); +mt76_wcid_add_poll (&dev->mt76, &msta->wcid);if (mt7615_mac_add_txs_skb (dev, msta, pid, txs_data)) goto out;
drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c +1 -5
@@ -1174,11 +1174,7 @@ void mt76_connac2_txwi_free(struct mt76_dev *dev, struct mt76_txwi_cache *t,if (wcid && wcid->sta) { sta = container_of((void *)wcid, struct ieee80211_sta, drv_priv); -spin_lock_bh (&dev->sta_poll_lock); -if (list_empty (&wcid->poll_list)) -list_add_tail (&wcid->poll_list, - &dev->sta_poll_list); -spin_unlock_bh (&dev->sta_poll_lock); +mt76_wcid_add_poll (dev, wcid); } }
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +3 -14
@@ -333,11 +333,7 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb,if (status->wcid) { msta = container_of(status->wcid, struct mt7915_sta, wcid); -spin_lock_bh (&dev->mt76.sta_poll_lock); -if (list_empty (&msta->wcid.poll_list)) -list_add_tail (&msta->wcid.poll_list, - &dev->mt76.sta_poll_list); -spin_unlock_bh (&dev->mt76.sta_poll_lock); +mt76_wcid_add_poll (&dev->mt76, &msta->wcid); } status->freq = mphy->chandef.chan->center_freq;
@@ -927,11 +923,7 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len)continue ; msta = container_of(wcid, struct mt7915_sta, wcid); -spin_lock_bh (&mdev->sta_poll_lock); -if (list_empty (&msta->wcid.poll_list)) -list_add_tail (&msta->wcid.poll_list, - &mdev->sta_poll_list); -spin_unlock_bh (&mdev->sta_poll_lock); +mt76_wcid_add_poll (&dev->mt76, &msta->wcid);continue ; }
@@ -1040,10 +1032,7 @@ static void mt7915_mac_add_txs(struct mt7915_dev *dev, void *data)if (!wcid->sta) goto out; -spin_lock_bh (&dev->mt76.sta_poll_lock); -if (list_empty (&msta->wcid.poll_list)) -list_add_tail (&msta->wcid.poll_list, &dev->mt76.sta_poll_list); -spin_unlock_bh (&dev->mt76.sta_poll_lock); +mt76_wcid_add_poll (&dev->mt76, &msta->wcid); out:rcu_read_unlock ();
drivers/net/wireless/mediatek/mt76/mt7921/mac.c +3 -14
@@ -216,11 +216,7 @@ mt7921_mac_fill_rx(struct mt792x_dev *dev, struct sk_buff *skb)if (status->wcid) { mlink = container_of(status->wcid, struct mt792x_link_sta, wcid); msta = container_of(mlink, struct mt792x_sta, deflink); -spin_lock_bh (&dev->mt76.sta_poll_lock); -if (list_empty (&mlink->wcid.poll_list)) -list_add_tail (&mlink->wcid.poll_list, - &dev->mt76.sta_poll_list); -spin_unlock_bh (&dev->mt76.sta_poll_lock); +mt76_wcid_add_poll (&dev->mt76, &mlink->wcid); }mt792x_get_status_freq_info (status, chfreq);
@@ -479,10 +475,7 @@ void mt7921_mac_add_txs(struct mt792x_dev *dev, void *data)if (!wcid->sta) goto out; -spin_lock_bh (&dev->mt76.sta_poll_lock); -if (list_empty (&mlink->wcid.poll_list)) -list_add_tail (&mlink->wcid.poll_list, &dev->mt76.sta_poll_list); -spin_unlock_bh (&dev->mt76.sta_poll_lock); +mt76_wcid_add_poll (&dev->mt76, &mlink->wcid); out:rcu_read_unlock ();
@@ -529,11 +522,7 @@ static void mt7921_mac_tx_free(struct mt792x_dev *dev, void *data, int len)continue ; mlink = container_of(wcid, struct mt792x_link_sta, wcid); -spin_lock_bh (&mdev->sta_poll_lock); -if (list_empty (&mlink->wcid.poll_list)) -list_add_tail (&mlink->wcid.poll_list, - &mdev->sta_poll_list); -spin_unlock_bh (&mdev->sta_poll_lock); +mt76_wcid_add_poll (&dev->mt76, &mlink->wcid);continue ; }
drivers/net/wireless/mediatek/mt76/mt7925/mac.c +3 -14
@@ -395,11 +395,7 @@ mt7925_mac_fill_rx(struct mt792x_dev *dev, struct sk_buff *skb)if (status->wcid) { mlink = container_of(status->wcid, struct mt792x_link_sta, wcid); -spin_lock_bh (&dev->mt76.sta_poll_lock); -if (list_empty (&mlink->wcid.poll_list)) -list_add_tail (&mlink->wcid.poll_list, - &dev->mt76.sta_poll_list); -spin_unlock_bh (&dev->mt76.sta_poll_lock); +mt76_wcid_add_poll (&dev->mt76, &mlink->wcid); }mt792x_get_status_freq_info (status, chfreq);
@@ -1054,10 +1050,7 @@ void mt7925_mac_add_txs(struct mt792x_dev *dev, void *data)if (!wcid->sta) goto out; -spin_lock_bh (&dev->mt76.sta_poll_lock); -if (list_empty (&mlink->wcid.poll_list)) -list_add_tail (&mlink->wcid.poll_list, &dev->mt76.sta_poll_list); -spin_unlock_bh (&dev->mt76.sta_poll_lock); +mt76_wcid_add_poll (&dev->mt76, &mlink->wcid); out:rcu_read_unlock ();
@@ -1135,11 +1128,7 @@ mt7925_mac_tx_free(struct mt792x_dev *dev, void *data, int len)continue ; mlink = container_of(wcid, struct mt792x_link_sta, wcid); -spin_lock_bh (&mdev->sta_poll_lock); -if (list_empty (&mlink->wcid.poll_list)) -list_add_tail (&mlink->wcid.poll_list, - &mdev->sta_poll_list); -spin_unlock_bh (&mdev->sta_poll_lock); +mt76_wcid_add_poll (&dev->mt76, &mlink->wcid);continue ; }
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +3 -14
@@ -478,11 +478,7 @@ mt7996_mac_fill_rx(struct mt7996_dev *dev, enum mt76_rxq_id q,if (status->wcid) { msta = container_of(status->wcid, struct mt7996_sta, wcid); -spin_lock_bh (&dev->mt76.sta_poll_lock); -if (list_empty (&msta->wcid.poll_list)) -list_add_tail (&msta->wcid.poll_list, - &dev->mt76.sta_poll_list); -spin_unlock_bh (&dev->mt76.sta_poll_lock); +mt76_wcid_add_poll (&dev->mt76, &msta->wcid); } status->freq = mphy->chandef.chan->center_freq;
@@ -1149,11 +1145,7 @@ mt7996_mac_tx_free(struct mt7996_dev *dev, void *data, int len)continue ; msta = container_of(wcid, struct mt7996_sta, wcid); -spin_lock_bh (&mdev->sta_poll_lock); -if (list_empty (&msta->wcid.poll_list)) -list_add_tail (&msta->wcid.poll_list, - &mdev->sta_poll_list); -spin_unlock_bh (&mdev->sta_poll_lock); +mt76_wcid_add_poll (&dev->mt76, &msta->wcid);continue ; }else if (info &MT_TXFREE_INFO_HEADER ) {u32 tx_retries =0 , tx_failed =0 ;
@@ -1379,10 +1371,7 @@ static void mt7996_mac_add_txs(struct mt7996_dev *dev, void *data)if (!wcid->sta) goto out; -spin_lock_bh (&dev->mt76.sta_poll_lock); -if (list_empty (&msta->wcid.poll_list)) -list_add_tail (&msta->wcid.poll_list, &dev->mt76.sta_poll_list); -spin_unlock_bh (&dev->mt76.sta_poll_lock); +mt76_wcid_add_poll (&dev->mt76, &msta->wcid); out:rcu_read_unlock ();
Signature · 1 line
2.47.1