mt76: mt7603: fix mixed declarations and code
Subsystems (4)
Felix Fietkau
maintainerPATCH v2 1/24 mt76: mt7603: fix mixed declarations and code
Move the qid variable declaration further up
--- drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/dma.c +2 -2
@@ -29,7 +29,7 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb)struct ieee80211_sta *sta;struct mt7603_sta *msta;struct mt76_wcid *wcid; -u8 tid =0 , hwq =0 ; +u8 qid, tid =0 , hwq =0 ;void *priv;int idx;u32 val;
@@ -57,7 +57,7 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb)if (ieee80211_is_data_qos (hdr->frame_control)) { tid = *ieee80211_get_qos_ctl (hdr) &IEEE80211_QOS_CTL_TAG1D_MASK ; -u8 qid = tid_to_ac[tid]; + qid = tid_to_ac[tid]; hwq = wmm_queue_map[qid];skb_set_queue_mapping (skb, qid); }else if (ieee80211_is_data (hdr->frame_control)) {
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 2/24 wifi: mt76: mt7603: fix reading target power from eeprom
If the ext-PA target power is unset, fall back to the standard EEPROM value.
--- drivers/net/wireless/mediatek/mt76/mt7603/init.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/init.c +4 -2
@@ -456,11 +456,13 @@ mt7603_init_txpower(struct mt7603_dev *dev,int target_power = eeprom[MT_EE_TX_POWER_0_START_2G +2 ] & ~BIT (7 );u8 *rate_power = &eeprom[MT_EE_TX_POWER_CCK ];bool ext_pa = eeprom[MT_EE_NIC_CONF_0 +1 ] &BIT (1 ); +u8 ext_pa_pwr;int max_offset, cur_offset;int i; -if (ext_pa &&is_mt7603 (dev)) - target_power = eeprom[MT_EE_TX_POWER_TSSI_OFF ] & ~BIT (7 ); + ext_pa_pwr = eeprom[MT_EE_TX_POWER_TSSI_OFF ]; +if (ext_pa &&is_mt7603 (dev) && ext_pa_pwr !=0 && ext_pa_pwr !=0xff ) + target_power = ext_pa_pwr & ~BIT (7 );if (target_power &BIT (6 )) target_power = -(target_power &GENMASK (5 ,0 ));
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 3/24 wifi: mt76: mt7603: initialize chainmask
In reply to Felix FietkauFixes reported tx power by accounting for the combined output
--- drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c +1 -0
@@ -181,6 +181,7 @@ int mt7603_eeprom_init(struct mt7603_dev *dev) is_mt7688(dev)) dev->mphy.antenna_mask =1 ; + dev->mphy.chainmask = dev->mphy.antenna_mask;mt76_eeprom_override (&dev->mphy);return 0 ;
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 4/24 wifi: mt76: fix mt76_get_rate
In reply to Felix FietkauDo not assume that the first phy has 2 GHz support. Check sband->band instead of accessing dev->phy.sband_2g.
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +3 -2
@@ -1697,14 +1697,15 @@ int mt76_get_rate(struct mt76_dev *dev,struct ieee80211_supported_band *sband, int idx, bool cck) { + bool is_2g = sband->band == NL80211_BAND_2GHZ;int i, offset =0 , len = sband->n_bitrates;if (cck) { -if (sband != &dev->phy.sband_2g.sband) +if (!is_2g)return 0 ; idx &= ~BIT (2 );/* short preamble */ - }else if (sband == &dev->phy.sband_2g.sband) { + }else if (is_2g) { offset =4 ; }
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 5/24 wifi: mt76: partially move channel change code to core
In reply to Felix FietkauThis allows the core code to change the channel. Code deduplication and preparation for adding scanning code to the core.
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 37 ++++++++++++++++--- drivers/net/wireless/mediatek/mt76/mt76.h | 6 ++- .../wireless/mediatek/mt76/mt7603/beacon.c | 2 +- .../net/wireless/mediatek/mt76/mt7603/init.c | 1 + .../net/wireless/mediatek/mt76/mt7603/main.c | 27 ++++---------- .../wireless/mediatek/mt76/mt7603/mt7603.h | 1 + .../net/wireless/mediatek/mt76/mt7615/main.c | 27 ++++---------- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +- .../net/wireless/mediatek/mt76/mt7615/mmio.c | 1 + .../wireless/mediatek/mt76/mt7615/mt7615.h | 2 +- .../net/wireless/mediatek/mt76/mt7615/sdio.c | 1 + .../wireless/mediatek/mt76/mt7615/testmode.c | 2 +- .../net/wireless/mediatek/mt76/mt7615/usb.c | 1 + .../net/wireless/mediatek/mt76/mt76x0/main.c | 19 ++++------ .../wireless/mediatek/mt76/mt76x0/mt76x0.h | 1 + .../net/wireless/mediatek/mt76/mt76x0/pci.c | 1 + .../net/wireless/mediatek/mt76/mt76x0/usb.c | 1 + .../net/wireless/mediatek/mt76/mt76x02_mmio.c | 2 +- .../wireless/mediatek/mt76/mt76x02_usb_core.c | 5 +-- .../wireless/mediatek/mt76/mt76x2/mt76x2.h | 2 + .../net/wireless/mediatek/mt76/mt76x2/pci.c | 1 + .../wireless/mediatek/mt76/mt76x2/pci_main.c | 25 ++++--------- .../net/wireless/mediatek/mt76/mt76x2/usb.c | 1 + .../wireless/mediatek/mt76/mt76x2/usb_main.c | 25 +++---------- .../net/wireless/mediatek/mt76/mt7915/main.c | 19 ++-------- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- .../net/wireless/mediatek/mt76/mt7915/mmio.c | 1 + .../wireless/mediatek/mt76/mt7915/mt7915.h | 2 +- .../wireless/mediatek/mt76/mt7915/testmode.c | 2 +- .../net/wireless/mediatek/mt76/mt7921/main.c | 23 ++++-------- .../net/wireless/mediatek/mt76/mt7921/mcu.c | 2 +- .../wireless/mediatek/mt76/mt7921/mt7921.h | 1 + .../net/wireless/mediatek/mt76/mt7921/pci.c | 1 + .../net/wireless/mediatek/mt76/mt7921/sdio.c | 1 + .../net/wireless/mediatek/mt76/mt7921/usb.c | 1 + .../net/wireless/mediatek/mt76/mt7996/main.c | 23 ++---------- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 2 +- .../net/wireless/mediatek/mt76/mt7996/mmio.c | 1 + .../wireless/mediatek/mt76/mt7996/mt7996.h | 2 +- 39 files changed, 115 insertions(+), 161 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +32 -5
@@ -929,13 +929,19 @@ void mt76_update_survey(struct mt76_phy *phy) }EXPORT_SYMBOL_GPL (mt76_update_survey); -void mt76_set_channel (struct mt76_phy *phy) +int mt76_set_channel (struct mt76_phy *phy,struct cfg80211_chan_def *chandef, +bool offchannel) {struct mt76_dev *dev = phy->dev; -struct ieee80211_hw *hw = phy->hw; -struct cfg80211_chan_def *chandef = &hw->conf.chandef; -bool offchannel = hw->conf.flags &IEEE80211_CONF_OFFCHANNEL ;int timeout =HZ /5 ; +int ret; + +cancel_delayed_work_sync (&phy->mac_work); + +mutex_lock (&dev->mutex); +set_bit (MT76_RESET , &phy->state); + +ieee80211_stop_queues (phy->hw);wait_event_timeout (dev->tx_wait, !mt76_has_tx_pending (phy), timeout);mt76_update_survey (phy);
@@ -946,14 +952,35 @@ void mt76_set_channel(struct mt76_phy *phy) phy->chandef = *chandef; phy->chan_state =mt76_channel_state (phy, chandef->chan); + phy->offchannel = offchannel;if (!offchannel) phy->main_chan = chandef->chan;if (chandef->chan != phy->main_chan)memset (phy->chan_state,0 ,sizeof (*phy->chan_state)); + + ret = dev->drv->set_channel (phy); + +clear_bit (MT76_RESET , &phy->state); +ieee80211_wake_queues (phy->hw); + +mt76_worker_schedule (&dev->tx_worker); + +mutex_unlock (&dev->mutex); + +return ret; } -EXPORT_SYMBOL_GPL (mt76_set_channel); + +int mt76_update_channel (struct mt76_phy *phy) +{ +struct ieee80211_hw *hw = phy->hw; +struct cfg80211_chan_def *chandef = &hw->conf.chandef; +bool offchannel = hw->conf.flags &IEEE80211_CONF_OFFCHANNEL ; + +return mt76_set_channel (phy, chandef, offchannel); +} +EXPORT_SYMBOL_GPL (mt76_update_channel);int mt76_get_survey (struct ieee80211_hw *hw,int idx,struct survey_info *survey)
drivers/net/wireless/mediatek/mt76/mt76.h +5 -1
@@ -487,6 +487,7 @@ struct mt76_driver_ops {u8 mcs_rates;void (*update_survey)(struct mt76_phy *phy); +int (*set_channel)(struct mt76_phy *phy); int (*tx_prepare_skb)(struct mt76_dev *dev, void *txwi_ptr, enum mt76_txq_id qid, struct mt76_wcid *wcid,
@@ -768,6 +769,7 @@ struct mt76_phy {struct cfg80211_chan_def chandef;struct ieee80211_channel *main_chan; +bool offchannel;struct mt76_channel_state *chan_state;enum mt76_dfs_state dfs_state;
@@ -1370,7 +1372,7 @@ void mt76_release_buffered_frames(struct ieee80211_hw *hw,enum ieee80211_frame_release_type reason, bool more_data);bool mt76_has_tx_pending (struct mt76_phy *phy); -void mt76_set_channel (struct mt76_phy *phy); +int mt76_update_channel (struct mt76_phy *phy);void mt76_update_survey (struct mt76_phy *phy);void mt76_update_survey_active_time (struct mt76_phy *phy,ktime_t time); int mt76_get_survey(struct ieee80211_hw *hw, int idx,
@@ -1484,6 +1486,8 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames);void mt76_testmode_tx_pending (struct mt76_phy *phy);void mt76_queue_tx_complete (struct mt76_dev *dev,struct mt76_queue *q,struct mt76_queue_entry *e); +int mt76_set_channel (struct mt76_phy *phy,struct cfg80211_chan_def *chandef, +bool offchannel);/* usb */ static inline bool mt76u_urb_error (struct urb *urb)
drivers/net/wireless/mediatek/mt76/mt7603/beacon.c +1 -1
@@ -107,7 +107,7 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t)struct sk_buff *skb;int i, nframes; -if (mt76_hw (dev)->conf.flags &IEEE80211_CONF_OFFCHANNEL ) +if (dev->mphy.offchannel)return ; data.dev = dev;
drivers/net/wireless/mediatek/mt76/mt7603/init.c +1 -0
@@ -18,6 +18,7 @@ const struct mt76_driver_ops mt7603_drv_ops = { .sta_assoc = mt7603_sta_assoc, .sta_remove = mt7603_sta_remove, .update_survey = mt7603_update_channel, + .set_channel = mt7603_set_channel, }; static void
drivers/net/wireless/mediatek/mt76/mt7603/main.c +7 -20
@@ -133,30 +133,24 @@ void mt7603_init_edcca(struct mt7603_dev *dev)mt7603_edcca_set_strict (dev, false); } -static int -mt7603_set_channel (struct ieee80211_hw *hw,struct cfg80211_chan_def *def) +int mt7603_set_channel (struct mt76_phy *mphy) { -struct mt7603_dev *dev = hw->priv; + struct mt7603_dev *dev = container_of(mphy->dev, struct mt7603_dev, mt76); +struct cfg80211_chan_def *def = &mphy->chandef; +u8 *rssi_data = (u8 *)dev->mt76.eeprom.data;int idx, ret;u8 bw =MT_BW_20 ;bool failed = false; -ieee80211_stop_queues (hw); -cancel_delayed_work_sync (&dev->mphy.mac_work);tasklet_disable (&dev->mt76.pre_tbtt_tasklet); -mutex_lock (&dev->mt76.mutex); -set_bit (MT76_RESET , &dev->mphy.state); -mt7603_beacon_set_timer (dev,-1 ,0 ); -mt76_set_channel (&dev->mphy);mt7603_mac_stop (dev);if (def->width ==NL80211_CHAN_WIDTH_40 ) bw =MT_BW_40 ; - dev->mphy.chandef = *def;mt76_rmw_field (dev,MT_AGG_BWCR ,MT_AGG_BWCR_BW , bw); ret =mt7603_mcu_set_channel (dev);if (ret) {
@@ -180,10 +174,6 @@ mt7603_set_channel(struct ieee80211_hw *hw, struct cfg80211_chan_def *def)mt7603_mac_set_timing (dev);mt7603_mac_start (dev); -clear_bit (MT76_RESET , &dev->mphy.state); - -mt76_txq_schedule_all (&dev->mphy); -ieee80211_queue_delayed_work (mt76_hw (dev), &dev->mphy.mac_work,msecs_to_jiffies (MT7603_WATCHDOG_TIME ));
@@ -199,17 +189,14 @@ mt7603_set_channel(struct ieee80211_hw *hw, struct cfg80211_chan_def *def)mt7603_init_edcca (dev); out: -if (!(mt76_hw (dev)->conf.flags &IEEE80211_CONF_OFFCHANNEL )) +if (!mphy->offchannel)mt7603_beacon_set_timer (dev,-1 , dev->mt76.beacon_int); -mutex_unlock (&dev->mt76.mutex);tasklet_enable (&dev->mt76.pre_tbtt_tasklet);if (failed)mt7603_mac_work (&dev->mphy.mac_work.work); -ieee80211_wake_queues (hw); -return ret; }
@@ -227,7 +214,7 @@ static int mt7603_set_sar_specs(struct ieee80211_hw *hw,if (err)return err; -return mt7603_set_channel (hw, &mphy->chandef); +return mt76_update_channel (mphy); } static int
@@ -238,7 +225,7 @@ mt7603_config(struct ieee80211_hw *hw, u32 changed)if (changed & (IEEE80211_CONF_CHANGE_CHANNEL |IEEE80211_CONF_CHANGE_POWER )) - ret =mt7603_set_channel (hw, &hw->conf.chandef); + ret =mt76_update_channel (&dev->mphy);if (changed &IEEE80211_CONF_CHANGE_MONITOR ) {mutex_lock (&dev->mt76.mutex);
drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h +1 -0
@@ -213,6 +213,7 @@ void mt7603_mac_sta_poll(struct mt7603_dev *dev);void mt7603_pse_client_reset (struct mt7603_dev *dev); +int mt7603_set_channel (struct mt76_phy *mphy);int mt7603_mcu_set_channel (struct mt7603_dev *dev);int mt7603_mcu_set_eeprom (struct mt7603_dev *dev);void mt7603_mcu_exit (struct mt7603_dev *dev);
drivers/net/wireless/mediatek/mt76/mt7615/main.c +7 -20
@@ -282,19 +282,14 @@ static void mt7615_remove_interface(struct ieee80211_hw *hw,mt76_wcid_cleanup (&dev->mt76, &mvif->sta.wcid); } -int mt7615_set_channel (struct mt7615_phy *phy) +int mt7615_set_channel (struct mt76_phy *mphy) { +struct mt7615_phy *phy = mphy->priv;struct mt7615_dev *dev = phy->dev;bool ext_phy = phy != &dev->phy;int ret; -cancel_delayed_work_sync (&phy->mt76->mac_work); - -mt7615_mutex_acquire (dev); - -set_bit (MT76_RESET , &phy->mt76->state); - -mt76_set_channel (phy->mt76); +mt76_connac_pm_wake (mphy, &dev->pm);if (is_mt7615 (&dev->mt76) && dev->flash_eeprom) { ret =mt7615_mcu_apply_rx_dcoc (phy);
@@ -325,11 +320,8 @@ int mt7615_set_channel(struct mt7615_phy *phy) phy->chfreq =mt76_rr (dev,MT_CHFREQ (ext_phy)); out: -clear_bit (MT76_RESET , &phy->mt76->state); +mt76_connac_power_save_sched (mphy, &dev->pm); -mt7615_mutex_release (dev); - -mt76_worker_schedule (&dev->mt76.tx_worker);if (!mt76_testmode_enabled (phy->mt76)) {unsigned long timeout =mt7615_get_macwork_timeout (dev);
@@ -339,6 +331,7 @@ int mt7615_set_channel(struct mt7615_phy *phy)return ret; } +EXPORT_SYMBOL_GPL (mt7615_set_channel); static int mt7615_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, struct ieee80211_vif *vif, struct ieee80211_sta *sta,
@@ -425,11 +418,7 @@ static int mt7615_set_sar_specs(struct ieee80211_hw *hw,if (mt7615_firmware_offload (phy->dev))return mt76_connac_mcu_set_rate_txpower (phy->mt76); -ieee80211_stop_queues (hw); - err =mt7615_set_channel (phy); -ieee80211_wake_queues (hw); - -return err; +return mt76_update_channel (phy->mt76); }static int mt7615_config (struct ieee80211_hw *hw,u32 changed)
@@ -448,9 +437,7 @@ static int mt7615_config(struct ieee80211_hw *hw, u32 changed) mt7615_mutex_release(dev); }#endif -ieee80211_stop_queues (hw); - ret =mt7615_set_channel (phy); -ieee80211_wake_queues (hw); + ret =mt76_update_channel (phy->mt76); }mt7615_mutex_acquire (dev);
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +1 -1
@@ -2151,7 +2151,7 @@ int mt7615_mcu_set_chan_info(struct mt7615_phy *phy, int cmd)if (cmd ==MCU_EXT_CMD (SET_RX_PATH ) || phy->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->offchannel) 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/mt7615/mmio.c +1 -0
@@ -182,6 +182,7 @@ int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base, .sta_add = mt7615_mac_sta_add, .sta_remove = mt7615_mac_sta_remove, .update_survey = mt7615_update_channel, + .set_channel = mt7615_set_channel, };struct mt76_bus_ops *bus_ops;struct ieee80211_ops *ops;
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +1 -1
@@ -457,7 +457,7 @@ void mt7615_roc_work(struct work_struct *work);void mt7615_roc_timer (struct timer_list *timer);void mt7615_init_txpower (struct mt7615_dev *dev,struct ieee80211_supported_band *sband); -int mt7615_set_channel (struct mt7615_phy *phy); +int mt7615_set_channel (struct mt76_phy *mphy);void mt7615_init_work (struct mt7615_dev *dev);int mt7615_mcu_restart (struct mt76_dev *dev);
drivers/net/wireless/mediatek/mt76/mt7615/sdio.c +1 -0
@@ -87,6 +87,7 @@ static int mt7663s_probe(struct sdio_func *func, .sta_add = mt7615_mac_sta_add, .sta_remove = mt7615_mac_sta_remove, .update_survey = mt7615_update_channel, + .set_channel = mt7615_set_channel, };static const struct mt76_bus_ops mt7663s_ops = { .rr = mt76s_rr,
drivers/net/wireless/mediatek/mt76/mt7615/testmode.c +1 -1
@@ -141,7 +141,7 @@ mt7615_tm_init(struct mt7615_phy *phy)mt7615_mcu_set_sku_en (phy, phy->mt76->test.state ==MT76_TM_STATE_OFF );mutex_unlock (&dev->mt76.mutex); -mt7615_set_channel (phy); +mt76_update_channel (phy->mt76); mt7615_ops.configure_filter (phy->mt76->hw,0 , &total_flags,0 );mutex_lock (&dev->mt76.mutex);
drivers/net/wireless/mediatek/mt76/mt7615/usb.c +1 -0
@@ -123,6 +123,7 @@ static int mt7663u_probe(struct usb_interface *usb_intf, .sta_add = mt7615_mac_sta_add, .sta_remove = mt7615_mac_sta_remove, .update_survey = mt7615_update_channel, + .set_channel = mt7615_set_channel, };static struct mt76_bus_ops bus_ops = { .rr = mt7663u_rr,
drivers/net/wireless/mediatek/mt76/mt76x0/main.c +8 -11
@@ -8,16 +8,15 @@#include <linux/etherdevice.h> #include "mt76x0.h" -static void -mt76x0_set_channel (struct mt76x02_dev *dev,struct cfg80211_chan_def *chandef) +int mt76x0_set_channel (struct mt76_phy *mphy) { -cancel_delayed_work_sync (&dev->cal_work); + struct mt76x02_dev *dev = container_of(mphy->dev, struct mt76x02_dev, mt76); +mt76x02_pre_tbtt_enable (dev, false);if (mt76_is_mmio (&dev->mt76))tasklet_disable (&dev->dfs_pd.dfs_tasklet); -mt76_set_channel (&dev->mphy); -mt76x0_phy_set_channel (dev, chandef); +mt76x0_phy_set_channel (dev, &mphy->chandef);mt76x02_mac_cc_reset (dev);mt76x02_edcca_init (dev);
@@ -28,8 +27,9 @@ mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef) }mt76x02_pre_tbtt_enable (dev, true); -mt76_txq_schedule_all (&dev->mphy); +return 0 ; } +EXPORT_SYMBOL_GPL (mt76x0_set_channel);int mt76x0_set_sar_specs (struct ieee80211_hw *hw,const struct cfg80211_sar_specs *sar)
@@ -63,11 +63,8 @@ int mt76x0_config(struct ieee80211_hw *hw, u32 changed)mutex_lock (&dev->mt76.mutex); -if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) { -ieee80211_stop_queues (hw); -mt76x0_set_channel (dev, &hw->conf.chandef); -ieee80211_wake_queues (hw); - } +if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) +mt76_update_channel (&dev->mphy);if (changed &IEEE80211_CONF_CHANGE_POWER ) {struct mt76_phy *mphy = &dev->mphy;
drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h +1 -0
@@ -49,6 +49,7 @@ void mt76x0_chip_onoff(struct mt76x02_dev *dev, bool enable, bool reset);void mt76x0_mac_stop (struct mt76x02_dev *dev);int mt76x0_config (struct ieee80211_hw *hw,u32 changed); +int mt76x0_set_channel (struct mt76_phy *mphy);int mt76x0_set_sar_specs (struct ieee80211_hw *hw,const struct cfg80211_sar_specs *sar);
drivers/net/wireless/mediatek/mt76/mt76x0/pci.c +1 -0
@@ -159,6 +159,7 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id) MT_DRV_SW_RX_AIRTIME, .survey_flags = SURVEY_INFO_TIME_TX, .update_survey = mt76x02_update_channel, + .set_channel = mt76x0_set_channel, .tx_prepare_skb = mt76x02_tx_prepare_skb, .tx_complete_skb = mt76x02_tx_complete_skb, .rx_skb = mt76x02_queue_rx_skb,
drivers/net/wireless/mediatek/mt76/mt76x0/usb.c +1 -0
@@ -217,6 +217,7 @@ static int mt76x0u_probe(struct usb_interface *usb_intf, .drv_flags = MT_DRV_SW_RX_AIRTIME, .survey_flags = SURVEY_INFO_TIME_TX, .update_survey = mt76x02_update_channel, + .set_channel = mt76x0_set_channel, .tx_prepare_skb = mt76x02u_tx_prepare_skb, .tx_complete_skb = mt76x02u_tx_complete_skb, .tx_status_data = mt76x02_tx_status_data,
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +1 -1
@@ -22,7 +22,7 @@ static void mt76x02_pre_tbtt_tasklet(struct tasklet_struct *t)struct sk_buff *skb;int i; -if (mt76_hw (dev)->conf.flags &IEEE80211_CONF_OFFCHANNEL ) +if (dev->mphy.offchannel)return ;__skb_queue_head_init (&data.q);
drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c +1 -4
@@ -188,10 +188,7 @@ static void mt76x02u_pre_tbtt_work(struct work_struct *work)struct sk_buff *skb;int nbeacons; -if (!dev->mt76.beacon_mask) -return ; - -if (mt76_hw (dev)->conf.flags &IEEE80211_CONF_OFFCHANNEL ) +if (!dev->mt76.beacon_mask || dev->mphy.offchannel)return ;__skb_queue_head_init (&data.q);
drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h +2 -0
@@ -47,6 +47,8 @@ void mt76x2_phy_power_on(struct mt76x02_dev *dev);void mt76x2_stop_hardware (struct mt76x02_dev *dev);int mt76x2_eeprom_init (struct mt76x02_dev *dev);int mt76x2_apply_calibration_data (struct mt76x02_dev *dev,int channel); +int mt76x2e_set_channel (struct mt76_phy *phy); +int mt76x2u_set_channel (struct mt76_phy *phy);void mt76x2_phy_set_antenna (struct mt76x02_dev *dev);int mt76x2_phy_start (struct mt76x02_dev *dev);
drivers/net/wireless/mediatek/mt76/mt76x2/pci.c +1 -0
@@ -25,6 +25,7 @@ mt76x2e_probe(struct pci_dev *pdev, const struct pci_device_id *id) MT_DRV_SW_RX_AIRTIME, .survey_flags = SURVEY_INFO_TIME_TX, .update_survey = mt76x02_update_channel, + .set_channel = mt76x2e_set_channel, .tx_prepare_skb = mt76x02_tx_prepare_skb, .tx_complete_skb = mt76x02_tx_complete_skb, .rx_skb = mt76x02_queue_rx_skb,
drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c +7 -18
@@ -32,33 +32,25 @@ mt76x2_stop(struct ieee80211_hw *hw, bool suspend)mt76x2_stop_hardware (dev); } -static void -mt76x2_set_channel (struct mt76x02_dev *dev,struct cfg80211_chan_def *chandef) +int mt76x2e_set_channel (struct mt76_phy *phy) { -cancel_delayed_work_sync (&dev->cal_work); + struct mt76x02_dev *dev = container_of(phy->dev, struct mt76x02_dev, mt76); +tasklet_disable (&dev->mt76.pre_tbtt_tasklet);tasklet_disable (&dev->dfs_pd.dfs_tasklet); -mutex_lock (&dev->mt76.mutex); -set_bit (MT76_RESET , &dev->mphy.state); - -mt76_set_channel (&dev->mphy); -mt76x2_mac_stop (dev, true); -mt76x2_phy_set_channel (dev, chandef); +mt76x2_phy_set_channel (dev, &phy->chandef);mt76x02_mac_cc_reset (dev);mt76x02_dfs_init_params (dev);mt76x2_mac_resume (dev); -clear_bit (MT76_RESET , &dev->mphy.state); -mutex_unlock (&dev->mt76.mutex); -tasklet_enable (&dev->dfs_pd.dfs_tasklet);tasklet_enable (&dev->mt76.pre_tbtt_tasklet); -mt76_txq_schedule_all (&dev->mphy); +return 0 ; } static int
@@ -95,11 +87,8 @@ mt76x2_config(struct ieee80211_hw *hw, u32 changed)mutex_unlock (&dev->mt76.mutex); -if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) { -ieee80211_stop_queues (hw); -mt76x2_set_channel (dev, &hw->conf.chandef); -ieee80211_wake_queues (hw); - } +if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) +mt76_update_channel (&dev->mphy);return 0 ; }
drivers/net/wireless/mediatek/mt76/mt76x2/usb.c +1 -0
@@ -32,6 +32,7 @@ static int mt76x2u_probe(struct usb_interface *intf, .drv_flags = MT_DRV_SW_RX_AIRTIME, .survey_flags = SURVEY_INFO_TIME_TX, .update_survey = mt76x02_update_channel, + .set_channel = mt76x2u_set_channel, .tx_prepare_skb = mt76x02u_tx_prepare_skb, .tx_complete_skb = mt76x02u_tx_complete_skb, .tx_status_data = mt76x02_tx_status_data,
drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c +5 -20
@@ -31,32 +31,20 @@ static void mt76x2u_stop(struct ieee80211_hw *hw, bool suspend)mt76x2u_stop_hw (dev); } -static int -mt76x2u_set_channel (struct mt76x02_dev *dev, -struct cfg80211_chan_def *chandef) +int mt76x2u_set_channel (struct mt76_phy *mphy) { + struct mt76x02_dev *dev = container_of(mphy->dev, struct mt76x02_dev, mt76);int err; -cancel_delayed_work_sync (&dev->cal_work);mt76x02_pre_tbtt_enable (dev, false); - -mutex_lock (&dev->mt76.mutex); -set_bit (MT76_RESET , &dev->mphy.state); - -mt76_set_channel (&dev->mphy); -mt76x2_mac_stop (dev, false); - err =mt76x2u_phy_set_channel (dev, chandef); + err =mt76x2u_phy_set_channel (dev, &mphy->chandef);mt76x02_mac_cc_reset (dev);mt76x2_mac_resume (dev); -clear_bit (MT76_RESET , &dev->mphy.state); -mutex_unlock (&dev->mt76.mutex); -mt76x02_pre_tbtt_enable (dev, true); -mt76_txq_schedule_all (&dev->mphy);return err; }
@@ -93,11 +81,8 @@ mt76x2u_config(struct ieee80211_hw *hw, u32 changed)mutex_unlock (&dev->mt76.mutex); -if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) { -ieee80211_stop_queues (hw); - err =mt76x2u_set_channel (dev, &hw->conf.chandef); -ieee80211_wake_queues (hw); - } +if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) +mt76_update_channel (&dev->mphy);return err; }
drivers/net/wireless/mediatek/mt76/mt7915/main.c +3 -16
@@ -317,18 +317,12 @@ static void mt7915_remove_interface(struct ieee80211_hw *hw,mt76_wcid_cleanup (&dev->mt76, &msta->wcid); } -int mt7915_set_channel (struct mt7915_phy *phy) +int mt7915_set_channel (struct mt76_phy *mphy) { +struct mt7915_phy *phy = mphy->priv;struct mt7915_dev *dev = phy->dev;int ret; -cancel_delayed_work_sync (&phy->mt76->mac_work); - -mutex_lock (&dev->mt76.mutex); -set_bit (MT76_RESET , &phy->mt76->state); - -mt76_set_channel (phy->mt76); -if (dev->cal) { ret =mt7915_mcu_apply_tx_dpd (phy);if (ret)
@@ -347,11 +341,6 @@ int mt7915_set_channel(struct mt7915_phy *phy) phy->noise =0 ; out: -clear_bit (MT76_RESET , &phy->mt76->state); -mutex_unlock (&dev->mt76.mutex); - -mt76_txq_schedule_all (phy->mt76); -if (!mt76_testmode_enabled (phy->mt76)) ieee80211_queue_delayed_work(phy->mt76->hw, &phy->mt76->mac_work,
@@ -464,11 +453,9 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)mutex_unlock (&dev->mt76.mutex); }#endif -ieee80211_stop_queues (hw); - ret =mt7915_set_channel (phy); + ret =mt76_update_channel (phy->mt76);if (ret)return ret; -ieee80211_wake_queues (hw); } if (changed & (IEEE80211_CONF_CHANGE_POWER |
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +1 -1
@@ -2747,7 +2747,7 @@ int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd)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 || +else if (phy->mt76->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,
drivers/net/wireless/mediatek/mt76/mt7915/mmio.c +1 -0
@@ -929,6 +929,7 @@ struct mt7915_dev *mt7915_mmio_probe(struct device *pdev, .sta_add = mt7915_mac_sta_add, .sta_remove = mt7915_mac_sta_remove, .update_survey = mt7915_update_channel, + .set_channel = mt7915_set_channel, };struct mt7915_dev *dev;struct mt76_dev *mdev;
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +1 -1
@@ -463,7 +463,7 @@ int mt7915_mcu_add_rate_ctrl(struct mt7915_dev *dev, struct ieee80211_vif *vif, struct ieee80211_sta *sta, bool changed);int mt7915_mcu_add_smps (struct mt7915_dev *dev,struct ieee80211_vif *vif,struct ieee80211_sta *sta); -int mt7915_set_channel (struct mt7915_phy *phy); +int mt7915_set_channel (struct mt76_phy *mphy);int mt7915_mcu_set_chan_info (struct mt7915_phy *phy,int cmd);int mt7915_mcu_set_tx (struct mt7915_dev *dev,struct ieee80211_vif *vif);int mt7915_mcu_update_edca (struct mt7915_dev *dev,void *req);
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +1 -1
@@ -425,7 +425,7 @@ static void mt7915_tm_update_channel(struct mt7915_phy *phy) {mutex_unlock (&phy->dev->mt76.mutex); -mt7915_set_channel (phy); +mt76_update_channel (phy->mt76);mutex_lock (&phy->dev->mt76.mutex);mt7915_mcu_set_chan_info (phy,MCU_EXT_CMD (SET_RX_PATH ));
drivers/net/wireless/mediatek/mt76/mt7921/main.c +7 -16
@@ -454,37 +454,30 @@ static int mt7921_cancel_remain_on_channel(struct ieee80211_hw *hw,return mt7921_abort_roc (phy, mvif); } -static int mt7921_set_channel (struct mt792x_phy *phy) +int mt7921_set_channel (struct mt76_phy *mphy) { +struct mt792x_phy *phy = mphy->priv;struct mt792x_dev *dev = phy->dev;int ret; -cancel_delayed_work_sync (&phy->mt76->mac_work); - -mt792x_mutex_acquire (dev); -set_bit (MT76_RESET , &phy->mt76->state); - -mt76_set_channel (phy->mt76); - +mt76_connac_pm_wake (mphy, &dev->pm); ret =mt7921_mcu_set_chan_info (phy,MCU_EXT_CMD (CHANNEL_SWITCH ));if (ret) goto out;mt792x_mac_set_timeing (phy); -mt792x_mac_reset_counters (phy); phy->noise =0 ; out: -clear_bit (MT76_RESET , &phy->mt76->state); -mt792x_mutex_release (dev); +mt76_connac_power_save_sched (mphy, &dev->pm); -mt76_worker_schedule (&dev->mt76.tx_worker); -ieee80211_queue_delayed_work (phy->mt76->hw, &phy->mt76->mac_work, +ieee80211_queue_delayed_work (mphy->hw, &mphy->mac_work, MT792x_WATCHDOG_TIME);return ret; } +EXPORT_SYMBOL_GPL (mt7921_set_channel); static int mt7921_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, struct ieee80211_vif *vif, struct ieee80211_sta *sta,
@@ -619,11 +612,9 @@ static int mt7921_config(struct ieee80211_hw *hw, u32 changed)int ret =0 ;if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) { -ieee80211_stop_queues (hw); - ret =mt7921_set_channel (phy); + ret =mt76_update_channel (phy->mt76);if (ret)return ret; -ieee80211_wake_queues (hw); }mt792x_mutex_acquire (dev);
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +1 -1
@@ -890,7 +890,7 @@ int mt7921_mcu_set_chan_info(struct mt792x_phy *phy, int cmd)if (cmd ==MCU_EXT_CMD (SET_RX_PATH ) || dev->mt76.hw->conf.flags &IEEE80211_CONF_MONITOR ) req.switch_reason =CH_SWITCH_NORMAL ; -else if (dev->mt76.hw->conf.flags &IEEE80211_CONF_OFFCHANNEL ) +else if (phy->mt76->offchannel) req.switch_reason =CH_SWITCH_SCAN_BYPASS_DPD ;else if (!cfg80211_reg_can_beacon (dev->mt76.hw->wiphy, chandef,NL80211_IFTYPE_AP ))
drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h +1 -0
@@ -186,6 +186,7 @@ int __mt7921_start(struct mt792x_phy *phy);int mt7921_register_device (struct mt792x_dev *dev);void mt7921_unregister_device (struct mt792x_dev *dev);int mt7921_run_firmware (struct mt792x_dev *dev); +int mt7921_set_channel (struct mt76_phy *mphy);int mt7921_mcu_set_bss_pm (struct mt792x_dev *dev,struct ieee80211_vif *vif,bool enable); int mt7921_mcu_sta_update(struct mt792x_dev *dev, struct ieee80211_sta *sta,
drivers/net/wireless/mediatek/mt76/mt7921/pci.c +1 -0
@@ -247,6 +247,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, .sta_assoc = mt7921_mac_sta_assoc, .sta_remove = mt7921_mac_sta_remove, .update_survey = mt792x_update_channel, + .set_channel = mt7921_set_channel, };static const struct mt792x_hif_ops mt7921_pcie_ops = { .init_reset = mt7921e_init_reset,
drivers/net/wireless/mediatek/mt76/mt7921/sdio.c +1 -0
@@ -103,6 +103,7 @@ static int mt7921s_probe(struct sdio_func *func, .sta_assoc = mt7921_mac_sta_assoc, .sta_remove = mt7921_mac_sta_remove, .update_survey = mt792x_update_channel, + .set_channel = mt7921_set_channel, };static const struct mt76_bus_ops mt7921s_ops = { .rr = mt76s_rr,
drivers/net/wireless/mediatek/mt76/mt7921/usb.c +1 -0
@@ -154,6 +154,7 @@ static int mt7921u_probe(struct usb_interface *usb_intf, .sta_assoc = mt7921_mac_sta_assoc, .sta_remove = mt7921_mac_sta_remove, .update_survey = mt792x_update_channel, + .set_channel = mt7921_set_channel, };static const struct mt792x_hif_ops hif_ops = { .mcu_init = mt7921u_mcu_init,
drivers/net/wireless/mediatek/mt76/mt7996/main.c +4 -19
@@ -291,18 +291,11 @@ static void mt7996_remove_interface(struct ieee80211_hw *hw,mt76_wcid_cleanup (&dev->mt76, &msta->wcid); } -int mt7996_set_channel (struct mt7996_phy *phy) +int mt7996_set_channel (struct mt76_phy *mphy) { -struct mt7996_dev *dev = phy->dev; +struct mt7996_phy *phy = mphy->priv;int ret; -cancel_delayed_work_sync (&phy->mt76->mac_work); - -mutex_lock (&dev->mt76.mutex); -set_bit (MT76_RESET , &phy->mt76->state); - -mt76_set_channel (phy->mt76); - ret =mt7996_mcu_set_chan_info (phy,UNI_CHANNEL_SWITCH );if (ret) goto out;
@@ -318,13 +311,7 @@ int mt7996_set_channel(struct mt7996_phy *phy) phy->noise =0 ; out: -clear_bit (MT76_RESET , &phy->mt76->state); -mutex_unlock (&dev->mt76.mutex); - -mt76_txq_schedule_all (phy->mt76); - -ieee80211_queue_delayed_work (phy->mt76->hw, - &phy->mt76->mac_work, +ieee80211_queue_delayed_work (mphy->hw, &mphy->mac_work,MT7996_WATCHDOG_TIME );return ret;
@@ -415,11 +402,9 @@ static int mt7996_config(struct ieee80211_hw *hw, u32 changed)int ret;if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) { -ieee80211_stop_queues (hw); - ret =mt7996_set_channel (phy); + ret =mt76_update_channel (phy->mt76);if (ret)return ret; -ieee80211_wake_queues (hw); } if (changed & (IEEE80211_CONF_CHANGE_POWER |
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +1 -1
@@ -3463,7 +3463,7 @@ int mt7996_mcu_set_chan_info(struct mt7996_phy *phy, u16 tag)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 || +else if (phy->mt76->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,
drivers/net/wireless/mediatek/mt76/mt7996/mmio.c +1 -0
@@ -620,6 +620,7 @@ struct mt7996_dev *mt7996_mmio_probe(struct device *pdev, .sta_add = mt7996_mac_sta_add, .sta_remove = mt7996_mac_sta_remove, .update_survey = mt7996_update_channel, + .set_channel = mt7996_set_channel, };struct mt7996_dev *dev;struct mt76_dev *mdev;
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +1 -1
@@ -468,7 +468,7 @@ int mt7996_mcu_add_obss_spr(struct mt7996_phy *phy, struct ieee80211_vif *vif, struct ieee80211_he_obss_pd *he_obss_pd);int mt7996_mcu_add_rate_ctrl (struct mt7996_dev *dev,struct ieee80211_vif *vif,struct ieee80211_sta *sta,bool changed); -int mt7996_set_channel (struct mt7996_phy *phy); +int mt7996_set_channel (struct mt76_phy *mphy);int mt7996_mcu_set_chan_info (struct mt7996_phy *phy,u16 tag);int mt7996_mcu_set_tx (struct mt7996_dev *dev,struct ieee80211_vif *vif); int mt7996_mcu_set_fixed_rate_ctrl(struct mt7996_dev *dev,
Signature · 1 line
2.46.0
Re: [PATCH v2 05/24] wifi: mt76: partially move channel change code to core
Hi, Felix
This patch broke the MT7610E. After this patch[1], the client cannot connect to the MT7610 AP on OpenWrt. There is no error log output. BTW, MT7612E still works fine.
[1] https://github.com/openwrt/mt76/commit/b80c997b3ff6f3e32fd729dc1c97709da5779fa1
Regards,
Shiji Yang
Felix Fietkau
maintainerRe: [PATCH v2 05/24] wifi: mt76: partially move channel change code to core
Quoted 7 lines · Shiji Yang
Hi, Felix
This patch broke the MT7610E. After this patch[1], the client cannot connect to the MT7610 AP on OpenWrt. There is no error log output. BTW, MT7612E still works fine.
[1] https://github.com/openwrt/mt76/commit/b80c997b3ff6f3e32fd729dc1c97709da5779fa1
Thanks for reporting. Could you please test if this fixes the issue?
https://nbd.name/p/55035e55
Thanks,
- Felix
Re: [PATCH v2 05/24] wifi: mt76: partially move channel change code to core
Quoted 12 lines · Felix Fietkau
Quoted 7 lines · Shiji Yang
Hi, Felix
This patch broke the MT7610E. After this patch[1], the client cannot connect to the MT7610 AP on OpenWrt. There is no error log output. BTW, MT7612E still works fine.
[1] https://github.com/openwrt/mt76/commit/b80c997b3ff6f3e32fd729dc1c97709da5779fa1
Thanks for reporting. Could you please test if this fixes the issue?
https://nbd.name/p/55035e55
Thanks, it fixes the issue for me. Tested on MT7620 + MT7610E router.
Regards.
Felix Fietkau
maintainerPATCH v3 5/24 wifi: mt76: partially move channel change code to core
In reply to Felix FietkauThis allows the core code to change the channel. Code deduplication and preparation for adding scanning code to the core.
---
v3:
- fix mt76x0 locking issue
drivers/net/wireless/mediatek/mt76/mac80211.c | 37 ++++++++++++++++--- drivers/net/wireless/mediatek/mt76/mt76.h | 6 ++- .../wireless/mediatek/mt76/mt7603/beacon.c | 2 +- .../net/wireless/mediatek/mt76/mt7603/init.c | 1 + .../net/wireless/mediatek/mt76/mt7603/main.c | 27 ++++---------- .../wireless/mediatek/mt76/mt7603/mt7603.h | 1 + .../net/wireless/mediatek/mt76/mt7615/main.c | 27 ++++---------- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +- .../net/wireless/mediatek/mt76/mt7615/mmio.c | 1 + .../wireless/mediatek/mt76/mt7615/mt7615.h | 2 +- .../net/wireless/mediatek/mt76/mt7615/sdio.c | 1 + .../wireless/mediatek/mt76/mt7615/testmode.c | 2 +- .../net/wireless/mediatek/mt76/mt7615/usb.c | 1 + .../net/wireless/mediatek/mt76/mt76x0/main.c | 21 +++++------ .../wireless/mediatek/mt76/mt76x0/mt76x0.h | 1 + .../net/wireless/mediatek/mt76/mt76x0/pci.c | 1 + .../net/wireless/mediatek/mt76/mt76x0/usb.c | 1 + .../net/wireless/mediatek/mt76/mt76x02_mmio.c | 2 +- .../wireless/mediatek/mt76/mt76x02_usb_core.c | 5 +-- .../wireless/mediatek/mt76/mt76x2/mt76x2.h | 2 + .../net/wireless/mediatek/mt76/mt76x2/pci.c | 1 + .../wireless/mediatek/mt76/mt76x2/pci_main.c | 25 ++++--------- .../net/wireless/mediatek/mt76/mt76x2/usb.c | 1 + .../wireless/mediatek/mt76/mt76x2/usb_main.c | 25 +++---------- .../net/wireless/mediatek/mt76/mt7915/main.c | 19 ++-------- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- .../net/wireless/mediatek/mt76/mt7915/mmio.c | 1 + .../wireless/mediatek/mt76/mt7915/mt7915.h | 2 +- .../wireless/mediatek/mt76/mt7915/testmode.c | 2 +- .../net/wireless/mediatek/mt76/mt7921/main.c | 23 ++++-------- .../net/wireless/mediatek/mt76/mt7921/mcu.c | 2 +- .../wireless/mediatek/mt76/mt7921/mt7921.h | 1 + .../net/wireless/mediatek/mt76/mt7921/pci.c | 1 + .../net/wireless/mediatek/mt76/mt7921/sdio.c | 1 + .../net/wireless/mediatek/mt76/mt7921/usb.c | 1 + .../net/wireless/mediatek/mt76/mt7996/main.c | 23 ++---------- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 2 +- .../net/wireless/mediatek/mt76/mt7996/mmio.c | 1 + .../wireless/mediatek/mt76/mt7996/mt7996.h | 2 +- 39 files changed, 116 insertions(+), 162 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +32 -5
@@ -929,13 +929,19 @@ void mt76_update_survey(struct mt76_phy *phy) }EXPORT_SYMBOL_GPL (mt76_update_survey); -void mt76_set_channel (struct mt76_phy *phy) +int mt76_set_channel (struct mt76_phy *phy,struct cfg80211_chan_def *chandef, +bool offchannel) {struct mt76_dev *dev = phy->dev; -struct ieee80211_hw *hw = phy->hw; -struct cfg80211_chan_def *chandef = &hw->conf.chandef; -bool offchannel = hw->conf.flags &IEEE80211_CONF_OFFCHANNEL ;int timeout =HZ /5 ; +int ret; + +cancel_delayed_work_sync (&phy->mac_work); + +mutex_lock (&dev->mutex); +set_bit (MT76_RESET , &phy->state); + +ieee80211_stop_queues (phy->hw);wait_event_timeout (dev->tx_wait, !mt76_has_tx_pending (phy), timeout);mt76_update_survey (phy);
@@ -946,14 +952,35 @@ void mt76_set_channel(struct mt76_phy *phy) phy->chandef = *chandef; phy->chan_state =mt76_channel_state (phy, chandef->chan); + phy->offchannel = offchannel;if (!offchannel) phy->main_chan = chandef->chan;if (chandef->chan != phy->main_chan)memset (phy->chan_state,0 ,sizeof (*phy->chan_state)); + + ret = dev->drv->set_channel (phy); + +clear_bit (MT76_RESET , &phy->state); +ieee80211_wake_queues (phy->hw); + +mt76_worker_schedule (&dev->tx_worker); + +mutex_unlock (&dev->mutex); + +return ret; } -EXPORT_SYMBOL_GPL (mt76_set_channel); + +int mt76_update_channel (struct mt76_phy *phy) +{ +struct ieee80211_hw *hw = phy->hw; +struct cfg80211_chan_def *chandef = &hw->conf.chandef; +bool offchannel = hw->conf.flags &IEEE80211_CONF_OFFCHANNEL ; + +return mt76_set_channel (phy, chandef, offchannel); +} +EXPORT_SYMBOL_GPL (mt76_update_channel);int mt76_get_survey (struct ieee80211_hw *hw,int idx,struct survey_info *survey)
drivers/net/wireless/mediatek/mt76/mt76.h +5 -1
@@ -487,6 +487,7 @@ struct mt76_driver_ops {u8 mcs_rates;void (*update_survey)(struct mt76_phy *phy); +int (*set_channel)(struct mt76_phy *phy); int (*tx_prepare_skb)(struct mt76_dev *dev, void *txwi_ptr, enum mt76_txq_id qid, struct mt76_wcid *wcid,
@@ -768,6 +769,7 @@ struct mt76_phy {struct cfg80211_chan_def chandef;struct ieee80211_channel *main_chan; +bool offchannel;struct mt76_channel_state *chan_state;enum mt76_dfs_state dfs_state;
@@ -1370,7 +1372,7 @@ void mt76_release_buffered_frames(struct ieee80211_hw *hw,enum ieee80211_frame_release_type reason, bool more_data);bool mt76_has_tx_pending (struct mt76_phy *phy); -void mt76_set_channel (struct mt76_phy *phy); +int mt76_update_channel (struct mt76_phy *phy);void mt76_update_survey (struct mt76_phy *phy);void mt76_update_survey_active_time (struct mt76_phy *phy,ktime_t time); int mt76_get_survey(struct ieee80211_hw *hw, int idx,
@@ -1484,6 +1486,8 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames);void mt76_testmode_tx_pending (struct mt76_phy *phy);void mt76_queue_tx_complete (struct mt76_dev *dev,struct mt76_queue *q,struct mt76_queue_entry *e); +int mt76_set_channel (struct mt76_phy *phy,struct cfg80211_chan_def *chandef, +bool offchannel);/* usb */ static inline bool mt76u_urb_error (struct urb *urb)
drivers/net/wireless/mediatek/mt76/mt7603/beacon.c +1 -1
@@ -107,7 +107,7 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t)struct sk_buff *skb;int i, nframes; -if (mt76_hw (dev)->conf.flags &IEEE80211_CONF_OFFCHANNEL ) +if (dev->mphy.offchannel)return ; data.dev = dev;
drivers/net/wireless/mediatek/mt76/mt7603/init.c +1 -0
@@ -18,6 +18,7 @@ const struct mt76_driver_ops mt7603_drv_ops = { .sta_assoc = mt7603_sta_assoc, .sta_remove = mt7603_sta_remove, .update_survey = mt7603_update_channel, + .set_channel = mt7603_set_channel, }; static void
drivers/net/wireless/mediatek/mt76/mt7603/main.c +7 -20
@@ -133,30 +133,24 @@ void mt7603_init_edcca(struct mt7603_dev *dev)mt7603_edcca_set_strict (dev, false); } -static int -mt7603_set_channel (struct ieee80211_hw *hw,struct cfg80211_chan_def *def) +int mt7603_set_channel (struct mt76_phy *mphy) { -struct mt7603_dev *dev = hw->priv; + struct mt7603_dev *dev = container_of(mphy->dev, struct mt7603_dev, mt76); +struct cfg80211_chan_def *def = &mphy->chandef; +u8 *rssi_data = (u8 *)dev->mt76.eeprom.data;int idx, ret;u8 bw =MT_BW_20 ;bool failed = false; -ieee80211_stop_queues (hw); -cancel_delayed_work_sync (&dev->mphy.mac_work);tasklet_disable (&dev->mt76.pre_tbtt_tasklet); -mutex_lock (&dev->mt76.mutex); -set_bit (MT76_RESET , &dev->mphy.state); -mt7603_beacon_set_timer (dev,-1 ,0 ); -mt76_set_channel (&dev->mphy);mt7603_mac_stop (dev);if (def->width ==NL80211_CHAN_WIDTH_40 ) bw =MT_BW_40 ; - dev->mphy.chandef = *def;mt76_rmw_field (dev,MT_AGG_BWCR ,MT_AGG_BWCR_BW , bw); ret =mt7603_mcu_set_channel (dev);if (ret) {
@@ -180,10 +174,6 @@ mt7603_set_channel(struct ieee80211_hw *hw, struct cfg80211_chan_def *def)mt7603_mac_set_timing (dev);mt7603_mac_start (dev); -clear_bit (MT76_RESET , &dev->mphy.state); - -mt76_txq_schedule_all (&dev->mphy); -ieee80211_queue_delayed_work (mt76_hw (dev), &dev->mphy.mac_work,msecs_to_jiffies (MT7603_WATCHDOG_TIME ));
@@ -199,17 +189,14 @@ mt7603_set_channel(struct ieee80211_hw *hw, struct cfg80211_chan_def *def)mt7603_init_edcca (dev); out: -if (!(mt76_hw (dev)->conf.flags &IEEE80211_CONF_OFFCHANNEL )) +if (!mphy->offchannel)mt7603_beacon_set_timer (dev,-1 , dev->mt76.beacon_int); -mutex_unlock (&dev->mt76.mutex);tasklet_enable (&dev->mt76.pre_tbtt_tasklet);if (failed)mt7603_mac_work (&dev->mphy.mac_work.work); -ieee80211_wake_queues (hw); -return ret; }
@@ -227,7 +214,7 @@ static int mt7603_set_sar_specs(struct ieee80211_hw *hw,if (err)return err; -return mt7603_set_channel (hw, &mphy->chandef); +return mt76_update_channel (mphy); } static int
@@ -238,7 +225,7 @@ mt7603_config(struct ieee80211_hw *hw, u32 changed)if (changed & (IEEE80211_CONF_CHANGE_CHANNEL |IEEE80211_CONF_CHANGE_POWER )) - ret =mt7603_set_channel (hw, &hw->conf.chandef); + ret =mt76_update_channel (&dev->mphy);if (changed &IEEE80211_CONF_CHANGE_MONITOR ) {mutex_lock (&dev->mt76.mutex);
drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h +1 -0
@@ -213,6 +213,7 @@ void mt7603_mac_sta_poll(struct mt7603_dev *dev);void mt7603_pse_client_reset (struct mt7603_dev *dev); +int mt7603_set_channel (struct mt76_phy *mphy);int mt7603_mcu_set_channel (struct mt7603_dev *dev);int mt7603_mcu_set_eeprom (struct mt7603_dev *dev);void mt7603_mcu_exit (struct mt7603_dev *dev);
drivers/net/wireless/mediatek/mt76/mt7615/main.c +7 -20
@@ -282,19 +282,14 @@ static void mt7615_remove_interface(struct ieee80211_hw *hw,mt76_wcid_cleanup (&dev->mt76, &mvif->sta.wcid); } -int mt7615_set_channel (struct mt7615_phy *phy) +int mt7615_set_channel (struct mt76_phy *mphy) { +struct mt7615_phy *phy = mphy->priv;struct mt7615_dev *dev = phy->dev;bool ext_phy = phy != &dev->phy;int ret; -cancel_delayed_work_sync (&phy->mt76->mac_work); - -mt7615_mutex_acquire (dev); - -set_bit (MT76_RESET , &phy->mt76->state); - -mt76_set_channel (phy->mt76); +mt76_connac_pm_wake (mphy, &dev->pm);if (is_mt7615 (&dev->mt76) && dev->flash_eeprom) { ret =mt7615_mcu_apply_rx_dcoc (phy);
@@ -325,11 +320,8 @@ int mt7615_set_channel(struct mt7615_phy *phy) phy->chfreq =mt76_rr (dev,MT_CHFREQ (ext_phy)); out: -clear_bit (MT76_RESET , &phy->mt76->state); +mt76_connac_power_save_sched (mphy, &dev->pm); -mt7615_mutex_release (dev); - -mt76_worker_schedule (&dev->mt76.tx_worker);if (!mt76_testmode_enabled (phy->mt76)) {unsigned long timeout =mt7615_get_macwork_timeout (dev);
@@ -339,6 +331,7 @@ int mt7615_set_channel(struct mt7615_phy *phy)return ret; } +EXPORT_SYMBOL_GPL (mt7615_set_channel); static int mt7615_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, struct ieee80211_vif *vif, struct ieee80211_sta *sta,
@@ -425,11 +418,7 @@ static int mt7615_set_sar_specs(struct ieee80211_hw *hw,if (mt7615_firmware_offload (phy->dev))return mt76_connac_mcu_set_rate_txpower (phy->mt76); -ieee80211_stop_queues (hw); - err =mt7615_set_channel (phy); -ieee80211_wake_queues (hw); - -return err; +return mt76_update_channel (phy->mt76); }static int mt7615_config (struct ieee80211_hw *hw,u32 changed)
@@ -448,9 +437,7 @@ static int mt7615_config(struct ieee80211_hw *hw, u32 changed) mt7615_mutex_release(dev); }#endif -ieee80211_stop_queues (hw); - ret =mt7615_set_channel (phy); -ieee80211_wake_queues (hw); + ret =mt76_update_channel (phy->mt76); }mt7615_mutex_acquire (dev);
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +1 -1
@@ -2151,7 +2151,7 @@ int mt7615_mcu_set_chan_info(struct mt7615_phy *phy, int cmd)if (cmd ==MCU_EXT_CMD (SET_RX_PATH ) || phy->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->offchannel) 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/mt7615/mmio.c +1 -0
@@ -182,6 +182,7 @@ int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base, .sta_add = mt7615_mac_sta_add, .sta_remove = mt7615_mac_sta_remove, .update_survey = mt7615_update_channel, + .set_channel = mt7615_set_channel, };struct mt76_bus_ops *bus_ops;struct ieee80211_ops *ops;
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +1 -1
@@ -457,7 +457,7 @@ void mt7615_roc_work(struct work_struct *work);void mt7615_roc_timer (struct timer_list *timer);void mt7615_init_txpower (struct mt7615_dev *dev,struct ieee80211_supported_band *sband); -int mt7615_set_channel (struct mt7615_phy *phy); +int mt7615_set_channel (struct mt76_phy *mphy);void mt7615_init_work (struct mt7615_dev *dev);int mt7615_mcu_restart (struct mt76_dev *dev);
drivers/net/wireless/mediatek/mt76/mt7615/sdio.c +1 -0
@@ -87,6 +87,7 @@ static int mt7663s_probe(struct sdio_func *func, .sta_add = mt7615_mac_sta_add, .sta_remove = mt7615_mac_sta_remove, .update_survey = mt7615_update_channel, + .set_channel = mt7615_set_channel, };static const struct mt76_bus_ops mt7663s_ops = { .rr = mt76s_rr,
drivers/net/wireless/mediatek/mt76/mt7615/testmode.c +1 -1
@@ -141,7 +141,7 @@ mt7615_tm_init(struct mt7615_phy *phy)mt7615_mcu_set_sku_en (phy, phy->mt76->test.state ==MT76_TM_STATE_OFF );mutex_unlock (&dev->mt76.mutex); -mt7615_set_channel (phy); +mt76_update_channel (phy->mt76); mt7615_ops.configure_filter (phy->mt76->hw,0 , &total_flags,0 );mutex_lock (&dev->mt76.mutex);
drivers/net/wireless/mediatek/mt76/mt7615/usb.c +1 -0
@@ -123,6 +123,7 @@ static int mt7663u_probe(struct usb_interface *usb_intf, .sta_add = mt7615_mac_sta_add, .sta_remove = mt7615_mac_sta_remove, .update_survey = mt7615_update_channel, + .set_channel = mt7615_set_channel, };static struct mt76_bus_ops bus_ops = { .rr = mt7663u_rr,
drivers/net/wireless/mediatek/mt76/mt76x0/main.c +9 -12
@@ -8,16 +8,15 @@#include <linux/etherdevice.h> #include "mt76x0.h" -static void -mt76x0_set_channel (struct mt76x02_dev *dev,struct cfg80211_chan_def *chandef) +int mt76x0_set_channel (struct mt76_phy *mphy) { -cancel_delayed_work_sync (&dev->cal_work); + struct mt76x02_dev *dev = container_of(mphy->dev, struct mt76x02_dev, mt76); +mt76x02_pre_tbtt_enable (dev, false);if (mt76_is_mmio (&dev->mt76))tasklet_disable (&dev->dfs_pd.dfs_tasklet); -mt76_set_channel (&dev->mphy); -mt76x0_phy_set_channel (dev, chandef); +mt76x0_phy_set_channel (dev, &mphy->chandef);mt76x02_mac_cc_reset (dev);mt76x02_edcca_init (dev);
@@ -28,8 +27,9 @@ mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef) }mt76x02_pre_tbtt_enable (dev, true); -mt76_txq_schedule_all (&dev->mphy); +return 0 ; } +EXPORT_SYMBOL_GPL (mt76x0_set_channel);int mt76x0_set_sar_specs (struct ieee80211_hw *hw,const struct cfg80211_sar_specs *sar)
@@ -61,13 +61,10 @@ int mt76x0_config(struct ieee80211_hw *hw, u32 changed) {struct mt76x02_dev *dev = hw->priv; -mutex_lock (&dev->mt76.mutex); +if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) +mt76_update_channel (&dev->mphy); -if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) { -ieee80211_stop_queues (hw); -mt76x0_set_channel (dev, &hw->conf.chandef); -ieee80211_wake_queues (hw); - } +mutex_lock (&dev->mt76.mutex);if (changed &IEEE80211_CONF_CHANGE_POWER ) {struct mt76_phy *mphy = &dev->mphy;
drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h +1 -0
@@ -49,6 +49,7 @@ void mt76x0_chip_onoff(struct mt76x02_dev *dev, bool enable, bool reset);void mt76x0_mac_stop (struct mt76x02_dev *dev);int mt76x0_config (struct ieee80211_hw *hw,u32 changed); +int mt76x0_set_channel (struct mt76_phy *mphy);int mt76x0_set_sar_specs (struct ieee80211_hw *hw,const struct cfg80211_sar_specs *sar);
drivers/net/wireless/mediatek/mt76/mt76x0/pci.c +1 -0
@@ -159,6 +159,7 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id) MT_DRV_SW_RX_AIRTIME, .survey_flags = SURVEY_INFO_TIME_TX, .update_survey = mt76x02_update_channel, + .set_channel = mt76x0_set_channel, .tx_prepare_skb = mt76x02_tx_prepare_skb, .tx_complete_skb = mt76x02_tx_complete_skb, .rx_skb = mt76x02_queue_rx_skb,
drivers/net/wireless/mediatek/mt76/mt76x0/usb.c +1 -0
@@ -217,6 +217,7 @@ static int mt76x0u_probe(struct usb_interface *usb_intf, .drv_flags = MT_DRV_SW_RX_AIRTIME, .survey_flags = SURVEY_INFO_TIME_TX, .update_survey = mt76x02_update_channel, + .set_channel = mt76x0_set_channel, .tx_prepare_skb = mt76x02u_tx_prepare_skb, .tx_complete_skb = mt76x02u_tx_complete_skb, .tx_status_data = mt76x02_tx_status_data,
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +1 -1
@@ -22,7 +22,7 @@ static void mt76x02_pre_tbtt_tasklet(struct tasklet_struct *t)struct sk_buff *skb;int i; -if (mt76_hw (dev)->conf.flags &IEEE80211_CONF_OFFCHANNEL ) +if (dev->mphy.offchannel)return ;__skb_queue_head_init (&data.q);
drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c +1 -4
@@ -188,10 +188,7 @@ static void mt76x02u_pre_tbtt_work(struct work_struct *work)struct sk_buff *skb;int nbeacons; -if (!dev->mt76.beacon_mask) -return ; - -if (mt76_hw (dev)->conf.flags &IEEE80211_CONF_OFFCHANNEL ) +if (!dev->mt76.beacon_mask || dev->mphy.offchannel)return ;__skb_queue_head_init (&data.q);
drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h +2 -0
@@ -47,6 +47,8 @@ void mt76x2_phy_power_on(struct mt76x02_dev *dev);void mt76x2_stop_hardware (struct mt76x02_dev *dev);int mt76x2_eeprom_init (struct mt76x02_dev *dev);int mt76x2_apply_calibration_data (struct mt76x02_dev *dev,int channel); +int mt76x2e_set_channel (struct mt76_phy *phy); +int mt76x2u_set_channel (struct mt76_phy *phy);void mt76x2_phy_set_antenna (struct mt76x02_dev *dev);int mt76x2_phy_start (struct mt76x02_dev *dev);
drivers/net/wireless/mediatek/mt76/mt76x2/pci.c +1 -0
@@ -25,6 +25,7 @@ mt76x2e_probe(struct pci_dev *pdev, const struct pci_device_id *id) MT_DRV_SW_RX_AIRTIME, .survey_flags = SURVEY_INFO_TIME_TX, .update_survey = mt76x02_update_channel, + .set_channel = mt76x2e_set_channel, .tx_prepare_skb = mt76x02_tx_prepare_skb, .tx_complete_skb = mt76x02_tx_complete_skb, .rx_skb = mt76x02_queue_rx_skb,
drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c +7 -18
@@ -32,33 +32,25 @@ mt76x2_stop(struct ieee80211_hw *hw, bool suspend)mt76x2_stop_hardware (dev); } -static void -mt76x2_set_channel (struct mt76x02_dev *dev,struct cfg80211_chan_def *chandef) +int mt76x2e_set_channel (struct mt76_phy *phy) { -cancel_delayed_work_sync (&dev->cal_work); + struct mt76x02_dev *dev = container_of(phy->dev, struct mt76x02_dev, mt76); +tasklet_disable (&dev->mt76.pre_tbtt_tasklet);tasklet_disable (&dev->dfs_pd.dfs_tasklet); -mutex_lock (&dev->mt76.mutex); -set_bit (MT76_RESET , &dev->mphy.state); - -mt76_set_channel (&dev->mphy); -mt76x2_mac_stop (dev, true); -mt76x2_phy_set_channel (dev, chandef); +mt76x2_phy_set_channel (dev, &phy->chandef);mt76x02_mac_cc_reset (dev);mt76x02_dfs_init_params (dev);mt76x2_mac_resume (dev); -clear_bit (MT76_RESET , &dev->mphy.state); -mutex_unlock (&dev->mt76.mutex); -tasklet_enable (&dev->dfs_pd.dfs_tasklet);tasklet_enable (&dev->mt76.pre_tbtt_tasklet); -mt76_txq_schedule_all (&dev->mphy); +return 0 ; } static int
@@ -95,11 +87,8 @@ mt76x2_config(struct ieee80211_hw *hw, u32 changed)mutex_unlock (&dev->mt76.mutex); -if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) { -ieee80211_stop_queues (hw); -mt76x2_set_channel (dev, &hw->conf.chandef); -ieee80211_wake_queues (hw); - } +if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) +mt76_update_channel (&dev->mphy);return 0 ; }
drivers/net/wireless/mediatek/mt76/mt76x2/usb.c +1 -0
@@ -32,6 +32,7 @@ static int mt76x2u_probe(struct usb_interface *intf, .drv_flags = MT_DRV_SW_RX_AIRTIME, .survey_flags = SURVEY_INFO_TIME_TX, .update_survey = mt76x02_update_channel, + .set_channel = mt76x2u_set_channel, .tx_prepare_skb = mt76x02u_tx_prepare_skb, .tx_complete_skb = mt76x02u_tx_complete_skb, .tx_status_data = mt76x02_tx_status_data,
drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c +5 -20
@@ -31,32 +31,20 @@ static void mt76x2u_stop(struct ieee80211_hw *hw, bool suspend)mt76x2u_stop_hw (dev); } -static int -mt76x2u_set_channel (struct mt76x02_dev *dev, -struct cfg80211_chan_def *chandef) +int mt76x2u_set_channel (struct mt76_phy *mphy) { + struct mt76x02_dev *dev = container_of(mphy->dev, struct mt76x02_dev, mt76);int err; -cancel_delayed_work_sync (&dev->cal_work);mt76x02_pre_tbtt_enable (dev, false); - -mutex_lock (&dev->mt76.mutex); -set_bit (MT76_RESET , &dev->mphy.state); - -mt76_set_channel (&dev->mphy); -mt76x2_mac_stop (dev, false); - err =mt76x2u_phy_set_channel (dev, chandef); + err =mt76x2u_phy_set_channel (dev, &mphy->chandef);mt76x02_mac_cc_reset (dev);mt76x2_mac_resume (dev); -clear_bit (MT76_RESET , &dev->mphy.state); -mutex_unlock (&dev->mt76.mutex); -mt76x02_pre_tbtt_enable (dev, true); -mt76_txq_schedule_all (&dev->mphy);return err; }
@@ -93,11 +81,8 @@ mt76x2u_config(struct ieee80211_hw *hw, u32 changed)mutex_unlock (&dev->mt76.mutex); -if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) { -ieee80211_stop_queues (hw); - err =mt76x2u_set_channel (dev, &hw->conf.chandef); -ieee80211_wake_queues (hw); - } +if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) +mt76_update_channel (&dev->mphy);return err; }
drivers/net/wireless/mediatek/mt76/mt7915/main.c +3 -16
@@ -317,18 +317,12 @@ static void mt7915_remove_interface(struct ieee80211_hw *hw,mt76_wcid_cleanup (&dev->mt76, &msta->wcid); } -int mt7915_set_channel (struct mt7915_phy *phy) +int mt7915_set_channel (struct mt76_phy *mphy) { +struct mt7915_phy *phy = mphy->priv;struct mt7915_dev *dev = phy->dev;int ret; -cancel_delayed_work_sync (&phy->mt76->mac_work); - -mutex_lock (&dev->mt76.mutex); -set_bit (MT76_RESET , &phy->mt76->state); - -mt76_set_channel (phy->mt76); -if (dev->cal) { ret =mt7915_mcu_apply_tx_dpd (phy);if (ret)
@@ -347,11 +341,6 @@ int mt7915_set_channel(struct mt7915_phy *phy) phy->noise =0 ; out: -clear_bit (MT76_RESET , &phy->mt76->state); -mutex_unlock (&dev->mt76.mutex); - -mt76_txq_schedule_all (phy->mt76); -if (!mt76_testmode_enabled (phy->mt76)) ieee80211_queue_delayed_work(phy->mt76->hw, &phy->mt76->mac_work,
@@ -464,11 +453,9 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)mutex_unlock (&dev->mt76.mutex); }#endif -ieee80211_stop_queues (hw); - ret =mt7915_set_channel (phy); + ret =mt76_update_channel (phy->mt76);if (ret)return ret; -ieee80211_wake_queues (hw); } if (changed & (IEEE80211_CONF_CHANGE_POWER |
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +1 -1
@@ -2747,7 +2747,7 @@ int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd)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 || +else if (phy->mt76->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,
drivers/net/wireless/mediatek/mt76/mt7915/mmio.c +1 -0
@@ -929,6 +929,7 @@ struct mt7915_dev *mt7915_mmio_probe(struct device *pdev, .sta_add = mt7915_mac_sta_add, .sta_remove = mt7915_mac_sta_remove, .update_survey = mt7915_update_channel, + .set_channel = mt7915_set_channel, };struct mt7915_dev *dev;struct mt76_dev *mdev;
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +1 -1
@@ -463,7 +463,7 @@ int mt7915_mcu_add_rate_ctrl(struct mt7915_dev *dev, struct ieee80211_vif *vif, struct ieee80211_sta *sta, bool changed);int mt7915_mcu_add_smps (struct mt7915_dev *dev,struct ieee80211_vif *vif,struct ieee80211_sta *sta); -int mt7915_set_channel (struct mt7915_phy *phy); +int mt7915_set_channel (struct mt76_phy *mphy);int mt7915_mcu_set_chan_info (struct mt7915_phy *phy,int cmd);int mt7915_mcu_set_tx (struct mt7915_dev *dev,struct ieee80211_vif *vif);int mt7915_mcu_update_edca (struct mt7915_dev *dev,void *req);
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +1 -1
@@ -425,7 +425,7 @@ static void mt7915_tm_update_channel(struct mt7915_phy *phy) {mutex_unlock (&phy->dev->mt76.mutex); -mt7915_set_channel (phy); +mt76_update_channel (phy->mt76);mutex_lock (&phy->dev->mt76.mutex);mt7915_mcu_set_chan_info (phy,MCU_EXT_CMD (SET_RX_PATH ));
drivers/net/wireless/mediatek/mt76/mt7921/main.c +7 -16
@@ -454,37 +454,30 @@ static int mt7921_cancel_remain_on_channel(struct ieee80211_hw *hw,return mt7921_abort_roc (phy, mvif); } -static int mt7921_set_channel (struct mt792x_phy *phy) +int mt7921_set_channel (struct mt76_phy *mphy) { +struct mt792x_phy *phy = mphy->priv;struct mt792x_dev *dev = phy->dev;int ret; -cancel_delayed_work_sync (&phy->mt76->mac_work); - -mt792x_mutex_acquire (dev); -set_bit (MT76_RESET , &phy->mt76->state); - -mt76_set_channel (phy->mt76); - +mt76_connac_pm_wake (mphy, &dev->pm); ret =mt7921_mcu_set_chan_info (phy,MCU_EXT_CMD (CHANNEL_SWITCH ));if (ret) goto out;mt792x_mac_set_timeing (phy); -mt792x_mac_reset_counters (phy); phy->noise =0 ; out: -clear_bit (MT76_RESET , &phy->mt76->state); -mt792x_mutex_release (dev); +mt76_connac_power_save_sched (mphy, &dev->pm); -mt76_worker_schedule (&dev->mt76.tx_worker); -ieee80211_queue_delayed_work (phy->mt76->hw, &phy->mt76->mac_work, +ieee80211_queue_delayed_work (mphy->hw, &mphy->mac_work, MT792x_WATCHDOG_TIME);return ret; } +EXPORT_SYMBOL_GPL (mt7921_set_channel); static int mt7921_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, struct ieee80211_vif *vif, struct ieee80211_sta *sta,
@@ -619,11 +612,9 @@ static int mt7921_config(struct ieee80211_hw *hw, u32 changed)int ret =0 ;if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) { -ieee80211_stop_queues (hw); - ret =mt7921_set_channel (phy); + ret =mt76_update_channel (phy->mt76);if (ret)return ret; -ieee80211_wake_queues (hw); }mt792x_mutex_acquire (dev);
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +1 -1
@@ -890,7 +890,7 @@ int mt7921_mcu_set_chan_info(struct mt792x_phy *phy, int cmd)if (cmd ==MCU_EXT_CMD (SET_RX_PATH ) || dev->mt76.hw->conf.flags &IEEE80211_CONF_MONITOR ) req.switch_reason =CH_SWITCH_NORMAL ; -else if (dev->mt76.hw->conf.flags &IEEE80211_CONF_OFFCHANNEL ) +else if (phy->mt76->offchannel) req.switch_reason =CH_SWITCH_SCAN_BYPASS_DPD ;else if (!cfg80211_reg_can_beacon (dev->mt76.hw->wiphy, chandef,NL80211_IFTYPE_AP ))
drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h +1 -0
@@ -186,6 +186,7 @@ int __mt7921_start(struct mt792x_phy *phy);int mt7921_register_device (struct mt792x_dev *dev);void mt7921_unregister_device (struct mt792x_dev *dev);int mt7921_run_firmware (struct mt792x_dev *dev); +int mt7921_set_channel (struct mt76_phy *mphy);int mt7921_mcu_set_bss_pm (struct mt792x_dev *dev,struct ieee80211_vif *vif,bool enable); int mt7921_mcu_sta_update(struct mt792x_dev *dev, struct ieee80211_sta *sta,
drivers/net/wireless/mediatek/mt76/mt7921/pci.c +1 -0
@@ -247,6 +247,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, .sta_assoc = mt7921_mac_sta_assoc, .sta_remove = mt7921_mac_sta_remove, .update_survey = mt792x_update_channel, + .set_channel = mt7921_set_channel, };static const struct mt792x_hif_ops mt7921_pcie_ops = { .init_reset = mt7921e_init_reset,
drivers/net/wireless/mediatek/mt76/mt7921/sdio.c +1 -0
@@ -103,6 +103,7 @@ static int mt7921s_probe(struct sdio_func *func, .sta_assoc = mt7921_mac_sta_assoc, .sta_remove = mt7921_mac_sta_remove, .update_survey = mt792x_update_channel, + .set_channel = mt7921_set_channel, };static const struct mt76_bus_ops mt7921s_ops = { .rr = mt76s_rr,
drivers/net/wireless/mediatek/mt76/mt7921/usb.c +1 -0
@@ -154,6 +154,7 @@ static int mt7921u_probe(struct usb_interface *usb_intf, .sta_assoc = mt7921_mac_sta_assoc, .sta_remove = mt7921_mac_sta_remove, .update_survey = mt792x_update_channel, + .set_channel = mt7921_set_channel, };static const struct mt792x_hif_ops hif_ops = { .mcu_init = mt7921u_mcu_init,
drivers/net/wireless/mediatek/mt76/mt7996/main.c +4 -19
@@ -291,18 +291,11 @@ static void mt7996_remove_interface(struct ieee80211_hw *hw,mt76_wcid_cleanup (&dev->mt76, &msta->wcid); } -int mt7996_set_channel (struct mt7996_phy *phy) +int mt7996_set_channel (struct mt76_phy *mphy) { -struct mt7996_dev *dev = phy->dev; +struct mt7996_phy *phy = mphy->priv;int ret; -cancel_delayed_work_sync (&phy->mt76->mac_work); - -mutex_lock (&dev->mt76.mutex); -set_bit (MT76_RESET , &phy->mt76->state); - -mt76_set_channel (phy->mt76); - ret =mt7996_mcu_set_chan_info (phy,UNI_CHANNEL_SWITCH );if (ret) goto out;
@@ -318,13 +311,7 @@ int mt7996_set_channel(struct mt7996_phy *phy) phy->noise =0 ; out: -clear_bit (MT76_RESET , &phy->mt76->state); -mutex_unlock (&dev->mt76.mutex); - -mt76_txq_schedule_all (phy->mt76); - -ieee80211_queue_delayed_work (phy->mt76->hw, - &phy->mt76->mac_work, +ieee80211_queue_delayed_work (mphy->hw, &mphy->mac_work,MT7996_WATCHDOG_TIME );return ret;
@@ -415,11 +402,9 @@ static int mt7996_config(struct ieee80211_hw *hw, u32 changed)int ret;if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) { -ieee80211_stop_queues (hw); - ret =mt7996_set_channel (phy); + ret =mt76_update_channel (phy->mt76);if (ret)return ret; -ieee80211_wake_queues (hw); } if (changed & (IEEE80211_CONF_CHANGE_POWER |
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +1 -1
@@ -3463,7 +3463,7 @@ int mt7996_mcu_set_chan_info(struct mt7996_phy *phy, u16 tag)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 || +else if (phy->mt76->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,
drivers/net/wireless/mediatek/mt76/mt7996/mmio.c +1 -0
@@ -620,6 +620,7 @@ struct mt7996_dev *mt7996_mmio_probe(struct device *pdev, .sta_add = mt7996_mac_sta_add, .sta_remove = mt7996_mac_sta_remove, .update_survey = mt7996_update_channel, + .set_channel = mt7996_set_channel, };struct mt7996_dev *dev;struct mt76_dev *mdev;
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +1 -1
@@ -468,7 +468,7 @@ int mt7996_mcu_add_obss_spr(struct mt7996_phy *phy, struct ieee80211_vif *vif, struct ieee80211_he_obss_pd *he_obss_pd);int mt7996_mcu_add_rate_ctrl (struct mt7996_dev *dev,struct ieee80211_vif *vif,struct ieee80211_sta *sta,bool changed); -int mt7996_set_channel (struct mt7996_phy *phy); +int mt7996_set_channel (struct mt76_phy *mphy);int mt7996_mcu_set_chan_info (struct mt7996_phy *phy,u16 tag);int mt7996_mcu_set_tx (struct mt7996_dev *dev,struct ieee80211_vif *vif); int mt7996_mcu_set_fixed_rate_ctrl(struct mt7996_dev *dev,
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 6/24 wifi: mt76: add separate tx scheduling queue for off-channel tx
In reply to Felix FietkauEnsure that packets are not sent out to the wrong channel
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 7 +-- drivers/net/wireless/mediatek/mt76/mt76.h | 1 + drivers/net/wireless/mediatek/mt76/tx.c | 59 ++++++++++++------- 3 files changed, 41 insertions(+), 26 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +3 -4
@@ -941,8 +941,7 @@ int mt76_set_channel(struct mt76_phy *phy, struct cfg80211_chan_def *chandef,mutex_lock (&dev->mutex);set_bit (MT76_RESET , &phy->state); -ieee80211_stop_queues (phy->hw); - +mt76_worker_disable (&dev->tx_worker);wait_event_timeout (dev->tx_wait, !mt76_has_tx_pending (phy), timeout);mt76_update_survey (phy);
@@ -959,12 +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); -ieee80211_wake_queues (phy->hw); -mt76_worker_schedule (&dev->tx_worker);mutex_unlock (&dev->mutex);
@@ -1548,6 +1546,7 @@ void mt76_wcid_init(struct mt76_wcid *wcid) {INIT_LIST_HEAD (&wcid->tx_list);skb_queue_head_init (&wcid->tx_pending); +skb_queue_head_init (&wcid->tx_offchannel);INIT_LIST_HEAD (&wcid->list);idr_init (&wcid->pktid);
drivers/net/wireless/mediatek/mt76/mt76.h +1 -0
@@ -361,6 +361,7 @@ struct mt76_wcid {struct list_head tx_list;struct sk_buff_head tx_pending; +struct sk_buff_head tx_offchannel;struct list_head list;struct idr pktid;
drivers/net/wireless/mediatek/mt76/tx.c +37 -22
138 lines not on this page · raw message
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 7/24 wifi: mt76: mt7915: disable tx worker during tx BA session enable/disable
In reply to Felix FietkauAvoids firmware race condition.
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +7 -3
@@ -690,13 +690,17 @@ int mt7915_mcu_add_tx_ba(struct mt7915_dev *dev, {struct mt7915_sta *msta = (struct mt7915_sta *)params->sta->drv_priv;struct mt7915_vif *mvif = msta->vif; +int ret; +mt76_worker_disable (&dev->mt76.tx_worker);if (enable && !params->amsdu) msta->wcid.amsdu = false; + ret =mt76_connac_mcu_sta_ba (&dev->mt76, &mvif->mt76, params, +MCU_EXT_CMD (STA_REC_UPDATE ), + enable, true); +mt76_worker_enable (&dev->mt76.tx_worker); -return mt76_connac_mcu_sta_ba (&dev->mt76, &mvif->mt76, params, -MCU_EXT_CMD (STA_REC_UPDATE ), - enable, true); +return ret; } int mt7915_mcu_add_rx_ba(struct mt7915_dev *dev,
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 8/24 wifi: mt76: mt7915: allocate vif wcid in the same range as stations
In reply to Felix FietkauReduces the amount of unnecessary WTBL bank switching, while still reserving WTBL entries for vifs.
--- drivers/net/wireless/mediatek/mt76/mt7915/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/main.c +4 -1
@@ -245,7 +245,9 @@ static int mt7915_add_interface(struct ieee80211_hw *hw, dev->mt76.vif_mask |=BIT_ULL (mvif->mt76.idx); phy->omac_mask |=BIT_ULL (mvif->mt76.omac_idx); - idx =MT7915_WTBL_RESERVED - mvif->mt76.idx; + idx =mt76_wcid_alloc (dev->mt76.wcid_mask,mt7915_wtbl_size (dev)); +if (idx <0 ) +return -ENOSPC ;INIT_LIST_HEAD (&mvif->sta.rc_list);INIT_LIST_HEAD (&mvif->sta.wcid.poll_list);
@@ -292,6 +294,7 @@ static void mt7915_remove_interface(struct ieee80211_hw *hw,mt7915_mcu_add_bss_info (phy, vif, false);mt7915_mcu_add_sta (dev, vif,NULL , false); +mt76_wcid_mask_clear (dev->mt76.wcid_mask, mvif->sta.wcid.idx);mutex_lock (&dev->mt76.mutex);mt76_testmode_reset (phy->mt76, true);
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 9/24 wifi: mt76: connac: add support for IEEE 802.11 fragmentation
In reply to Felix FietkauFrom: Benjamin Lin <[email protected]>
Add fragmentation index into TXD.DW2 to support IEEE 802.11 fragmentation.
--- drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h | 7 +++++++ drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h +7 -0
@@ -355,4 +355,11 @@ enum tx_port_idx {MT_TX_PORT_IDX_MCU }; +enum tx_frag_idx { +MT_TX_FRAG_NONE , +MT_TX_FRAG_FIRST , +MT_TX_FRAG_MID , +MT_TX_FRAG_LAST +}; +#endif /* __MT76_CONNAC2_MAC_H */
drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c +9 -1
@@ -391,6 +391,7 @@ mt76_connac2_mac_write_txwi_80211(struct mt76_dev *dev, __le32 *txwi,bool multicast =is_multicast_ether_addr (hdr->addr1);u8 tid = skb->priority &IEEE80211_QOS_CTL_TID_MASK ;__le16 fc = hdr->frame_control; +__le16 sc = hdr->seq_ctrl;u8 fc_type, fc_stype;u32 val;
@@ -432,6 +433,13 @@ mt76_connac2_mac_write_txwi_80211(struct mt76_dev *dev, __le32 *txwi, info->flags & IEEE80211_TX_CTL_USE_MINRATE) val |=MT_TXD2_FIX_RATE ; +if (ieee80211_has_morefrags (fc) &&ieee80211_is_first_frag (sc)) + val |=FIELD_PREP (MT_TXD2_FRAG ,MT_TX_FRAG_FIRST ); +else if (ieee80211_has_morefrags (fc) && !ieee80211_is_first_frag (sc)) + val |=FIELD_PREP (MT_TXD2_FRAG ,MT_TX_FRAG_MID ); +else if (!ieee80211_has_morefrags (fc) && !ieee80211_is_first_frag (sc)) + val |=FIELD_PREP (MT_TXD2_FRAG ,MT_TX_FRAG_LAST ); + txwi[2 ] |=cpu_to_le32 (val);if (ieee80211_is_beacon (fc)) {
@@ -440,7 +448,7 @@ mt76_connac2_mac_write_txwi_80211(struct mt76_dev *dev, __le32 *txwi, }if (info->flags &IEEE80211_TX_CTL_INJECTED ) { -u16 seqno =le16_to_cpu (hdr->seq_ctrl); +u16 seqno =le16_to_cpu (sc);if (ieee80211_is_back_req (hdr->frame_control)) {struct ieee80211_bar *bar;
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 10/24 wifi: mt76: connac: add support for passing connection state directly
In reply to Felix FietkauPreparation for improvements to sta handling. No functional changes.
--- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 4 +++- .../wireless/mediatek/mt76/mt76_connac_mcu.c | 17 ++++++++--------- .../wireless/mediatek/mt76/mt76_connac_mcu.h | 2 +- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 4 +++- drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 5 ++++- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 4 +++- 6 files changed, 22 insertions(+), 14 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +3 -1
@@ -847,6 +847,7 @@ mt7615_mcu_wtbl_sta_add(struct mt7615_phy *phy, struct ieee80211_vif *vif,struct wtbl_req_hdr *wtbl_hdr;struct mt7615_sta *msta;bool new_entry = true; +int conn_state;int cmd, err; msta = sta ? (struct mt7615_sta *)sta->drv_priv : &mvif->sta;
@@ -863,8 +864,9 @@ mt7615_mcu_wtbl_sta_add(struct mt7615_phy *phy, struct ieee80211_vif *vif,else mvif->sta_added = true; } + conn_state = enable ?CONN_STATE_PORT_SECURE :CONN_STATE_DISCONNECT ;mt76_connac_mcu_sta_basic_tlv (&dev->mt76, sskb, vif, link_sta, - enable, new_entry); + conn_state, new_entry);if (enable && sta)mt76_connac_mcu_sta_tlv (phy->mt76, sskb, sta, vif,0 ,MT76_STA_INFO_STATE_ASSOC );
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +8 -9
@@ -371,7 +371,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_bss_omac_tlv);void mt76_connac_mcu_sta_basic_tlv (struct mt76_dev *dev,struct sk_buff *skb,struct ieee80211_vif *vif,struct ieee80211_link_sta *link_sta, -bool enable,bool newly) +int conn_state,bool newly) {struct sta_rec_basic *basic;struct tlv *tlv;
@@ -382,13 +382,9 @@ void mt76_connac_mcu_sta_basic_tlv(struct mt76_dev *dev, struct sk_buff *skb, basic = (struct sta_rec_basic *)tlv; basic->extra_info =cpu_to_le16 (EXTRA_INFO_VER ); -if (enable) { -if (newly) - basic->extra_info |=cpu_to_le16 (EXTRA_INFO_NEW ); - basic->conn_state =CONN_STATE_PORT_SECURE ; - }else { - basic->conn_state =CONN_STATE_DISCONNECT ; - } +if (newly && conn_state !=CONN_STATE_DISCONNECT ) + basic->extra_info |=cpu_to_le16 (EXTRA_INFO_NEW ); + basic->conn_state = conn_state;if (!link_sta) { basic->conn_type =cpu_to_le32 (CONNECTION_INFRA_BC );
@@ -1051,15 +1047,18 @@ int mt76_connac_mcu_sta_cmd(struct mt76_phy *phy,struct wtbl_req_hdr *wtbl_hdr;struct tlv *sta_wtbl;struct sk_buff *skb; +int conn_state; skb =mt76_connac_mcu_alloc_sta_req (dev, mvif, info->wcid);if (IS_ERR (skb))return PTR_ERR (skb); + conn_state = info->enable ?CONN_STATE_PORT_SECURE : +CONN_STATE_DISCONNECT ; link_sta = info->sta ? &info->sta->deflink :NULL ;if (info->sta || !info->offload_fw)mt76_connac_mcu_sta_basic_tlv (dev, skb, info->vif, - link_sta, info->enable, + link_sta, conn_state, info->newly);if (info->sta && info->enable) mt76_connac_mcu_sta_tlv(phy, skb, info->sta,
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +1 -1
@@ -1898,7 +1898,7 @@ int mt76_connac_mcu_set_vif_ps(struct mt76_dev *dev, struct ieee80211_vif *vif);void mt76_connac_mcu_sta_basic_tlv (struct mt76_dev *dev,struct sk_buff *skb,struct ieee80211_vif *vif,struct ieee80211_link_sta *link_sta, -bool enable,bool newly); +int state,bool newly); void mt76_connac_mcu_wtbl_generic_tlv(struct mt76_dev *dev, struct sk_buff *skb, struct ieee80211_vif *vif, struct ieee80211_sta *sta, void *sta_wtbl,
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +3 -1
@@ -1663,6 +1663,7 @@ int mt7915_mcu_add_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif,struct ieee80211_link_sta *link_sta;struct mt7915_sta *msta;struct sk_buff *skb; +int conn_state;int ret; msta = sta ? (struct mt7915_sta *)sta->drv_priv : &mvif->sta;
@@ -1674,7 +1675,8 @@ int mt7915_mcu_add_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif,return PTR_ERR (skb);/* starec basic */ -mt76_connac_mcu_sta_basic_tlv (&dev->mt76, skb, vif, link_sta, enable, + conn_state = enable ?CONN_STATE_PORT_SECURE :CONN_STATE_DISCONNECT ; +mt76_connac_mcu_sta_basic_tlv (&dev->mt76, skb, vif, link_sta, conn_state, !rcu_access_pointer (dev->mt76.wcid[msta->wcid.idx]));if (!enable) goto out;
drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +4 -1
@@ -1770,16 +1770,19 @@ mt7925_mcu_sta_cmd(struct mt76_phy *phy,struct mt76_vif *mvif = (struct mt76_vif *)info->vif->drv_priv;struct mt76_dev *dev = phy->dev;struct sk_buff *skb; +int conn_state; skb =__mt76_connac_mcu_alloc_sta_req (dev, mvif, info->wcid,MT7925_STA_UPDATE_MAX_SIZE );if (IS_ERR (skb))return PTR_ERR (skb); + conn_state = info->enable ?CONN_STATE_PORT_SECURE : +CONN_STATE_DISCONNECT ;if (info->link_sta)mt76_connac_mcu_sta_basic_tlv (dev, skb, info->vif, info->link_sta, - info->enable, info->newly); + conn_state, info->newly);if (info->link_sta && info->enable) {mt7925_mcu_sta_phy_tlv (skb, info->vif, info->link_sta);mt7925_mcu_sta_ht_tlv (skb, info->link_sta);
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +3 -1
@@ -2163,6 +2163,7 @@ int mt7996_mcu_add_sta(struct mt7996_dev *dev, struct ieee80211_vif *vif,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;
@@ -2175,8 +2176,9 @@ 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, - enable, newly); + conn_state, newly);if (!enable) goto out;
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 11/24 wifi: mt76: change .sta_assoc callback to .sta_event
In reply to Felix FietkauAlso report auth/disassoc events, in order to give the driver more control over handling the station state.
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 23 ++++++++++++++----- drivers/net/wireless/mediatek/mt76/mt76.h | 10 ++++++-- .../net/wireless/mediatek/mt76/mt7603/init.c | 2 +- .../net/wireless/mediatek/mt76/mt7603/main.c | 14 +++++++---- .../wireless/mediatek/mt76/mt7603/mt7603.h | 4 ++-- .../net/wireless/mediatek/mt76/mt7921/main.c | 11 ++++++--- .../wireless/mediatek/mt76/mt7921/mt7921.h | 4 ++-- .../net/wireless/mediatek/mt76/mt7921/pci.c | 2 +- .../net/wireless/mediatek/mt76/mt7921/sdio.c | 2 +- .../net/wireless/mediatek/mt76/mt7921/usb.c | 2 +- .../net/wireless/mediatek/mt76/mt7925/main.c | 21 +++++++++-------- .../wireless/mediatek/mt76/mt7925/mt7925.h | 4 ++-- .../net/wireless/mediatek/mt76/mt7925/pci.c | 2 +- .../net/wireless/mediatek/mt76/mt7925/usb.c | 2 +- 14 files changed, 67 insertions(+), 36 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +17 -6
@@ -1509,21 +1509,32 @@ int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif, {struct mt76_phy *phy = hw->priv;struct mt76_dev *dev = phy->dev; +enum mt76_sta_event ev;if (old_state ==IEEE80211_STA_NOTEXIST && new_state ==IEEE80211_STA_NONE )return mt76_sta_add (phy, vif, sta); -if (old_state ==IEEE80211_STA_AUTH && - new_state ==IEEE80211_STA_ASSOC && - dev->drv->sta_assoc) - dev->drv->sta_assoc (dev, vif, sta); -if (old_state ==IEEE80211_STA_NONE && new_state ==IEEE80211_STA_NOTEXIST )mt76_sta_remove (dev, vif, sta); -return 0 ; +if (!dev->drv->sta_event) +return 0 ; + +if (old_state ==IEEE80211_STA_AUTH && + new_state ==IEEE80211_STA_ASSOC ) + ev =MT76_STA_EVENT_ASSOC ; +else if (old_state ==IEEE80211_STA_ASSOC && + new_state ==IEEE80211_STA_AUTHORIZED ) + ev =MT76_STA_EVENT_AUTHORIZE ; +else if (old_state ==IEEE80211_STA_ASSOC && + new_state ==IEEE80211_STA_AUTH ) + ev =MT76_STA_EVENT_DISASSOC ; +else +return 0 ; + +return dev->drv->sta_event (dev, vif, sta, ev); }EXPORT_SYMBOL_GPL (mt76_sta_state);
drivers/net/wireless/mediatek/mt76/mt76.h +8 -2
@@ -467,6 +467,12 @@ enum { MT76_STATE_WED_RESET, }; +enum mt76_sta_event { +MT76_STA_EVENT_ASSOC , +MT76_STA_EVENT_AUTHORIZE , +MT76_STA_EVENT_DISASSOC , +}; +struct mt76_hw_cap {bool has_2ghz;bool has_5ghz;
@@ -513,8 +519,8 @@ struct mt76_driver_ops {int (*sta_add)(struct mt76_dev *dev,struct ieee80211_vif *vif,struct ieee80211_sta *sta); -void (*sta_assoc)(struct mt76_dev *dev,struct ieee80211_vif *vif, -struct ieee80211_sta *sta); +int (*sta_event)(struct mt76_dev *dev,struct ieee80211_vif *vif, +struct ieee80211_sta *sta,enum mt76_sta_event ev);void (*sta_remove)(struct mt76_dev *dev,struct ieee80211_vif *vif,struct ieee80211_sta *sta);
drivers/net/wireless/mediatek/mt76/mt7603/init.c +1 -1
@@ -15,7 +15,7 @@ const struct mt76_driver_ops mt7603_drv_ops = { .rx_poll_complete = mt7603_rx_poll_complete, .sta_ps = mt7603_sta_ps, .sta_add = mt7603_sta_add, - .sta_assoc = mt7603_sta_assoc, + .sta_event = mt7603_sta_event, .sta_remove = mt7603_sta_remove, .update_survey = mt7603_update_channel, .set_channel = mt7603_set_channel,
drivers/net/wireless/mediatek/mt76/mt7603/main.c +10 -4
@@ -355,13 +355,19 @@ mt7603_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,return ret; } -void -mt7603_sta_assoc (struct mt76_dev *mdev,struct ieee80211_vif *vif, -struct ieee80211_sta *sta) +int +mt7603_sta_event (struct mt76_dev *mdev,struct ieee80211_vif *vif, +struct ieee80211_sta *sta,enum mt76_sta_event ev) { struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76); -mt7603_wtbl_update_cap (dev, sta); +if (ev ==MT76_STA_EVENT_ASSOC ) { +mutex_lock (&dev->mt76.mutex); +mt7603_wtbl_update_cap (dev, sta); +mutex_unlock (&dev->mt76.mutex); + } + +return 0 ; }void
drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h +2 -2
@@ -246,8 +246,8 @@ void mt7603_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q);void mt7603_sta_ps (struct mt76_dev *mdev,struct ieee80211_sta *sta,bool ps);int mt7603_sta_add (struct mt76_dev *mdev,struct ieee80211_vif *vif,struct ieee80211_sta *sta); -void mt7603_sta_assoc (struct mt76_dev *mdev,struct ieee80211_vif *vif, -struct ieee80211_sta *sta); +int mt7603_sta_event (struct mt76_dev *mdev,struct ieee80211_vif *vif, +struct ieee80211_sta *sta,enum mt76_sta_event ev);void mt7603_sta_remove (struct mt76_dev *mdev,struct ieee80211_vif *vif,struct ieee80211_sta *sta);
drivers/net/wireless/mediatek/mt76/mt7921/main.c +8 -3
@@ -821,13 +821,16 @@ int mt7921_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif, }EXPORT_SYMBOL_GPL (mt7921_mac_sta_add); -void mt7921_mac_sta_assoc (struct mt76_dev *mdev,struct ieee80211_vif *vif, -struct ieee80211_sta *sta) +int mt7921_mac_sta_event (struct mt76_dev *mdev,struct ieee80211_vif *vif, +struct ieee80211_sta *sta,enum mt76_sta_event ev) { struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);struct mt792x_sta *msta = (struct mt792x_sta *)sta->drv_priv;struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv; +if (ev !=MT76_STA_EVENT_ASSOC ) +return 0 ; +mt792x_mutex_acquire (dev);if (vif->type ==NL80211_IFTYPE_STATION && !sta->tdls)
@@ -843,8 +846,10 @@ void mt7921_mac_sta_assoc(struct mt76_dev *mdev, struct ieee80211_vif *vif,mt7921_mcu_sta_update (dev, sta, vif, true,MT76_STA_INFO_STATE_ASSOC );mt792x_mutex_release (dev); + +return 0 ; } -EXPORT_SYMBOL_GPL (mt7921_mac_sta_assoc); +EXPORT_SYMBOL_GPL (mt7921_mac_sta_event);void mt7921_mac_sta_remove (struct mt76_dev *mdev,struct ieee80211_vif *vif,struct ieee80211_sta *sta)
drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h +2 -2
@@ -245,8 +245,8 @@ int mt7921_mac_init(struct mt792x_dev *dev);bool mt7921_mac_wtbl_update (struct mt792x_dev *dev,int idx,u32 mask);int mt7921_mac_sta_add (struct mt76_dev *mdev,struct ieee80211_vif *vif,struct ieee80211_sta *sta); -void mt7921_mac_sta_assoc (struct mt76_dev *mdev,struct ieee80211_vif *vif, -struct ieee80211_sta *sta); +int mt7921_mac_sta_event (struct mt76_dev *mdev,struct ieee80211_vif *vif, +struct ieee80211_sta *sta,enum mt76_sta_event ev);void mt7921_mac_sta_remove (struct mt76_dev *mdev,struct ieee80211_vif *vif,struct ieee80211_sta *sta);void mt7921_mac_reset_work (struct work_struct *work);
drivers/net/wireless/mediatek/mt76/mt7921/pci.c +1 -1
@@ -244,7 +244,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, .rx_skb = mt7921_queue_rx_skb, .rx_poll_complete = mt792x_rx_poll_complete, .sta_add = mt7921_mac_sta_add, - .sta_assoc = mt7921_mac_sta_assoc, + .sta_event = mt7921_mac_sta_event, .sta_remove = mt7921_mac_sta_remove, .update_survey = mt792x_update_channel, .set_channel = mt7921_set_channel,
drivers/net/wireless/mediatek/mt76/mt7921/sdio.c +1 -1
@@ -100,7 +100,7 @@ static int mt7921s_probe(struct sdio_func *func, .rx_skb = mt7921_queue_rx_skb, .rx_check = mt7921_rx_check, .sta_add = mt7921_mac_sta_add, - .sta_assoc = mt7921_mac_sta_assoc, + .sta_event = mt7921_mac_sta_event, .sta_remove = mt7921_mac_sta_remove, .update_survey = mt792x_update_channel, .set_channel = mt7921_set_channel,
drivers/net/wireless/mediatek/mt76/mt7921/usb.c +1 -1
@@ -151,7 +151,7 @@ static int mt7921u_probe(struct usb_interface *usb_intf, .rx_skb = mt7921_queue_rx_skb, .rx_check = mt7921_rx_check, .sta_add = mt7921_mac_sta_add, - .sta_assoc = mt7921_mac_sta_assoc, + .sta_event = mt7921_mac_sta_event, .sta_remove = mt7921_mac_sta_remove, .update_survey = mt792x_update_channel, .set_channel = mt7921_set_channel,
drivers/net/wireless/mediatek/mt76/mt7925/main.c +12 -9
@@ -1078,23 +1078,26 @@ static void mt7925_mac_link_sta_assoc(struct mt76_dev *mdev,mt792x_mutex_release (dev); } -void mt7925_mac_sta_assoc (struct mt76_dev *mdev,struct ieee80211_vif *vif, -struct ieee80211_sta *sta) +int mt7925_mac_sta_event (struct mt76_dev *mdev,struct ieee80211_vif *vif, +struct ieee80211_sta *sta,enum mt76_sta_event ev) { +struct ieee80211_link_sta *link_sta = &sta->deflink; + +if (ev !=MT76_STA_EVENT_ASSOC ) +return 0 ; +if (ieee80211_vif_is_mld (vif)) {struct mt792x_sta *msta = (struct mt792x_sta *)sta->drv_priv; -struct ieee80211_link_sta *link_sta; link_sta =mt792x_sta_to_link_sta (vif, sta, msta->deflink_id); -mt7925_mac_set_links (mdev, vif); - -mt7925_mac_link_sta_assoc (mdev, vif, link_sta); - }else { -mt7925_mac_link_sta_assoc (mdev, vif, &sta->deflink); } + +mt7925_mac_link_sta_assoc (mdev, vif, link_sta); + +return 0 ; } -EXPORT_SYMBOL_GPL (mt7925_mac_sta_assoc); +EXPORT_SYMBOL_GPL (mt7925_mac_sta_event); static void mt7925_mac_link_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h +2 -2
@@ -219,8 +219,8 @@ int mt7925_mac_init(struct mt792x_dev *dev);int mt7925_mac_sta_add (struct mt76_dev *mdev,struct ieee80211_vif *vif,struct ieee80211_sta *sta);bool mt7925_mac_wtbl_update (struct mt792x_dev *dev,int idx,u32 mask); -void mt7925_mac_sta_assoc (struct mt76_dev *mdev,struct ieee80211_vif *vif, -struct ieee80211_sta *sta); +int mt7925_mac_sta_event (struct mt76_dev *mdev,struct ieee80211_vif *vif, +struct ieee80211_sta *sta,enum mt76_sta_event ev);void mt7925_mac_sta_remove (struct mt76_dev *mdev,struct ieee80211_vif *vif,struct ieee80211_sta *sta);void mt7925_mac_reset_work (struct work_struct *work);
drivers/net/wireless/mediatek/mt76/mt7925/pci.c +1 -1
@@ -279,7 +279,7 @@ static int mt7925_pci_probe(struct pci_dev *pdev, .rx_skb = mt7925_queue_rx_skb, .rx_poll_complete = mt792x_rx_poll_complete, .sta_add = mt7925_mac_sta_add, - .sta_assoc = mt7925_mac_sta_assoc, + .sta_event = mt7925_mac_sta_event, .sta_remove = mt7925_mac_sta_remove, .update_survey = mt792x_update_channel, };
drivers/net/wireless/mediatek/mt76/mt7925/usb.c +1 -1
@@ -142,7 +142,7 @@ static int mt7925u_probe(struct usb_interface *usb_intf, .rx_skb = mt7925_queue_rx_skb, .rx_check = mt7925_rx_check, .sta_add = mt7925_mac_sta_add, - .sta_assoc = mt7925_mac_sta_assoc, + .sta_event = mt7925_mac_sta_event, .sta_remove = mt7925_mac_sta_remove, .update_survey = mt792x_update_channel, };
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 12/24 wifi: mt76: mt7915: 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.
---
v2:
- fix regressions in vif sta entry update
- avoid using vif sta wcid for unicast tx packets
- fix wcid flag update
drivers/net/wireless/mediatek/mt76/mt76.h | 1 + .../wireless/mediatek/mt76/mt76_connac_mcu.c | 2 +- .../net/wireless/mediatek/mt76/mt7915/main.c | 105 +++++++++++------- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 26 ++--- .../net/wireless/mediatek/mt76/mt7915/mmio.c | 1 + .../wireless/mediatek/mt76/mt7915/mt7915.h | 4 +- .../wireless/mediatek/mt76/mt7915/testmode.c | 4 +- drivers/net/wireless/mediatek/mt76/tx.c | 3 + 8 files changed, 90 insertions(+), 56 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +1 -0
@@ -347,6 +347,7 @@ struct mt76_wcid {u8 hw_key_idx2; u8 sta:1; + u8 sta_disabled:1; u8 amsdu:1; u8 phy_idx:2; u8 link_id:4;
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +1 -1
@@ -283,7 +283,7 @@ __mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif *mvif, };struct sk_buff *skb; -if (wcid && !wcid->sta) +if (wcid && !wcid->sta && !wcid->sta_disabled) hdr.muar_idx =0xe ; mt76_connac_mcu_get_wlan_idx(dev, wcid, &hdr.wlan_idx_lo,
drivers/net/wireless/mediatek/mt76/mt7915/main.c +65 -40
210 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +13 -13
@@ -1657,13 +1657,12 @@ mt7915_mcu_add_group(struct mt7915_dev *dev, struct ieee80211_vif *vif, }int mt7915_mcu_add_sta (struct mt7915_dev *dev,struct ieee80211_vif *vif, -struct ieee80211_sta *sta,bool enable) +struct ieee80211_sta *sta,int conn_state,bool newly) {struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;struct ieee80211_link_sta *link_sta;struct mt7915_sta *msta;struct sk_buff *skb; -int conn_state;int ret; msta = sta ? (struct mt7915_sta *)sta->drv_priv : &mvif->sta;
@@ -1675,14 +1674,10 @@ int mt7915_mcu_add_sta(struct mt7915_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, - !rcu_access_pointer (dev->mt76.wcid[msta->wcid.idx])); -if (!enable) - goto out; - +mt76_connac_mcu_sta_basic_tlv (&dev->mt76, skb, vif, link_sta, + conn_state, newly);/* tag order is in accordance with firmware dependency. */ -if (sta) { +if (sta && conn_state !=CONN_STATE_DISCONNECT ) {/* starec bfer */ mt7915_mcu_sta_bfer_tlv (dev, skb, vif, sta);/* starec ht */
@@ -1693,12 +1688,17 @@ int mt7915_mcu_add_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif,mt76_connac_mcu_sta_uapsd (skb, vif, sta); } - ret =mt7915_mcu_sta_wtbl_tlv (dev, skb, vif, sta); -if (ret) { -dev_kfree_skb (skb); -return ret; +if (newly || conn_state !=CONN_STATE_DISCONNECT ) { + ret =mt7915_mcu_sta_wtbl_tlv (dev, skb, vif, sta); +if (ret) { +dev_kfree_skb (skb); +return ret; + } } +if (conn_state ==CONN_STATE_DISCONNECT ) + goto out; +if (sta) {/* starec amsdu */ mt7915_mcu_sta_amsdu_tlv (dev, skb, vif, sta);
drivers/net/wireless/mediatek/mt76/mt7915/mmio.c +1 -0
@@ -927,6 +927,7 @@ struct mt7915_dev *mt7915_mmio_probe(struct device *pdev, .rx_check = mt7915_rx_check, .rx_poll_complete = mt7915_rx_poll_complete, .sta_add = mt7915_mac_sta_add, + .sta_event = mt7915_mac_sta_event, .sta_remove = mt7915_mac_sta_remove, .update_survey = mt7915_update_channel, .set_channel = mt7915_set_channel,
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +3 -1
@@ -444,7 +444,7 @@ int mt7915_mcu_add_dev_info(struct mt7915_phy *phy,int mt7915_mcu_add_bss_info (struct mt7915_phy *phy,struct ieee80211_vif *vif,int enable);int mt7915_mcu_add_sta (struct mt7915_dev *dev,struct ieee80211_vif *vif, -struct ieee80211_sta *sta,bool enable); +struct ieee80211_sta *sta,int conn_state,bool newly);int mt7915_mcu_add_tx_ba (struct mt7915_dev *dev,struct ieee80211_ampdu_params *params,bool add);
@@ -560,6 +560,8 @@ void mt7915_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,void mt7915_mac_set_timing (struct mt7915_phy *phy);int mt7915_mac_sta_add (struct mt76_dev *mdev,struct ieee80211_vif *vif,struct ieee80211_sta *sta); +int mt7915_mac_sta_event (struct mt76_dev *mdev,struct ieee80211_vif *vif, +struct ieee80211_sta *sta,enum mt76_sta_event ev);void mt7915_mac_sta_remove (struct mt76_dev *mdev,struct ieee80211_vif *vif,struct ieee80211_sta *sta);void mt7915_mac_work (struct work_struct *work);
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +3 -1
@@ -404,6 +404,7 @@ static void mt7915_tm_init(struct mt7915_phy *phy, bool en) {struct mt7915_dev *dev = phy->dev; +int state;if (!test_bit (MT76_STATE_RUNNING , &phy->mt76->state))return ;
@@ -415,7 +416,8 @@ mt7915_tm_init(struct mt7915_phy *phy, bool en)mt7915_tm_set_trx (phy,TM_MAC_TXRX , !en);mt7915_mcu_add_bss_info (phy, phy->monitor_vif, en); -mt7915_mcu_add_sta (dev, phy->monitor_vif,NULL , en); + state = en ?CONN_STATE_PORT_SECURE :CONN_STATE_DISCONNECT ; +mt7915_mcu_add_sta (dev, phy->monitor_vif,NULL , state, true);if (!en)mt7915_tm_set_tam_arb (phy, en,0 );
drivers/net/wireless/mediatek/mt76/tx.c +3 -0
@@ -313,6 +313,9 @@ __mt76_tx_queue_skb(struct mt76_phy *phy, int qid, struct sk_buff *skb,return idx; wcid = (struct mt76_wcid *)sta->drv_priv; +if (!wcid->sta) +return idx; + q->entry[idx].wcid = wcid->idx;if (!non_aql)
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 13/24 wifi: mt76: mt7915: set MT76_MCU_RESET early in mt7915_mac_full_reset
In reply to Felix FietkauThis avoids running into unnecessary timeouts waiting for MCU responses
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +1 -0
@@ -1448,6 +1448,7 @@ mt7915_mac_full_reset(struct mt7915_dev *dev) dev->recovery.hw_full_reset = true; +set_bit (MT76_MCU_RESET , &dev->mphy.state);wake_up (&dev->mt76.mcu.wait);ieee80211_stop_queues (mt76_hw (dev));if (ext_phy)
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 14/24 wifi: mt76: mt7915: retry mcu messages
In reply to Felix FietkauIn some cases MCU messages can get lost. Instead of failing completely, attempt to recover by re-sending them.
--- drivers/net/wireless/mediatek/mt76/mcu.c | 20 +++++++++++++++++++ drivers/net/wireless/mediatek/mt76/mt76.h | 3 +++ .../net/wireless/mediatek/mt76/mt7915/mcu.c | 7 ++----- 3 files changed, 25 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mcu.c +20 -0
@@ -73,6 +73,8 @@ int mt76_mcu_skb_send_and_get_msg(struct mt76_dev *dev, struct sk_buff *skb, int cmd, bool wait_resp, struct sk_buff **ret_skb) { + unsigned int retry = 0; +struct sk_buff *orig_skb =NULL ;unsigned long expires;int ret, seq;
@@ -81,6 +83,14 @@ int mt76_mcu_skb_send_and_get_msg(struct mt76_dev *dev, struct sk_buff *skb,mutex_lock (&dev->mcu.mutex); +if (dev->mcu_ops->mcu_skb_prepare_msg) { + ret = dev->mcu_ops->mcu_skb_prepare_msg (dev, skb, cmd, &seq); +if (ret <0 ) + goto out; + } + +retry: + orig_skb =skb_get (skb); ret = dev->mcu_ops->mcu_skb_send_msg (dev, skb, cmd, &seq);if (ret <0 ) goto out;
@@ -94,6 +104,14 @@ int mt76_mcu_skb_send_and_get_msg(struct mt76_dev *dev, struct sk_buff *skb, do { skb = mt76_mcu_get_response(dev, expires); + if (!skb && !test_bit(MT76_MCU_RESET, &dev->phy.state) && + retry++ < dev->mcu_ops->max_retry) { + dev_err(dev->dev, "Retry message %08x (seq %d)\n", + cmd, seq); + skb = orig_skb; + goto retry; + } + ret = dev->mcu_ops->mcu_parse_response(dev, cmd, skb, seq); if (!ret && ret_skb) *ret_skb = skb;
@@ -101,7 +119,9 @@ int mt76_mcu_skb_send_and_get_msg(struct mt76_dev *dev, struct sk_buff *skb,dev_kfree_skb (skb); }while (ret == -EAGAIN ); + out: +dev_kfree_skb (orig_skb);mutex_unlock (&dev->mcu.mutex);return ret;
drivers/net/wireless/mediatek/mt76/mt76.h +3 -0
@@ -230,11 +230,14 @@ struct mt76_queue { };struct mt76_mcu_ops { +unsigned int max_retry;u32 headroom;u32 tailroom;int (*mcu_send_msg)(struct mt76_dev *dev,int cmd,const void *data,int len,bool wait_resp); +int (*mcu_skb_prepare_msg)(struct mt76_dev *dev,struct sk_buff *skb, +int cmd,int *seq);int (*mcu_skb_send_msg)(struct mt76_dev *dev,struct sk_buff *skb,int cmd,int *seq); int (*mcu_parse_response)(struct mt76_dev *dev, int cmd,
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +2 -5
@@ -191,11 +191,6 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb, { struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);enum mt76_mcuq_id qid; -int ret; - - ret =mt76_connac2_mcu_fill_message (mdev, skb, cmd, wait_seq); -if (ret) -return ret;if (cmd ==MCU_CMD (FW_SCATTER )) qid =MT_MCUQ_FWDL ;
@@ -2382,7 +2377,9 @@ 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 , .headroom =sizeof (struct mt76_connac2_mcu_txd ), + .mcu_skb_prepare_msg = mt76_connac2_mcu_fill_message, .mcu_skb_send_msg = mt7915_mcu_send_message, .mcu_parse_response = mt7915_mcu_parse_response, };
Signature · 1 line
2.46.0
Re: [PATCH v2 14/24] wifi: mt76: mt7915: retry mcu messages
Quoted 4 lines · Felix Fietkau
In some cases MCU messages can get lost. Instead of failing completely, attempt to recover by re-sending them.
Signed-off-by Felix Fietkau <[email protected]>
Hi,
KernelCI has identified a regression originating from this patch. I've verified that reverting it fixes the issue.
Regression's impact: Unable to boot
Affected platforms:
* mt8186-corsola-steelix-sku131072
Relevant kernel logs:
[ 3.457006] ------------[ cut here ]------------ [ 3.466050] kernel BUG at net/core/skbuff.c:2255! [ 3.466055] Internal error: Oops - BUG: 00000000f2000800 [#1] PREEMPT SMP [ 3.466059] Modules linked in: mt7921s mtk_vcodec_dbgfs mt76_sdio mtk_jpeg mtk_vcodec_common mt7921_common mtk_jpeg_enc_hw [ 3.484734] mt792x_lib mt76_connac_lib mtk_vpu mtk_jpeg_dec_hw v4l2_mem2mem [ 3.496464] mt76 videobuf2_dma_contig btmtksdio cros_ec_rpmsg btmtk videobuf2_memops cbmem mac80211 libarc4 bluetooth videobuf2_v4l2 videodev [ 3.510198] ecdh_generic cros_ec_sensors cros_ec_lid_angle cfg80211 ecc [ 3.522273] videobuf2_common mediatek_drm cros_ec_sensors_core crct10dif_ce industrialio_triggered_buffer [ 3.534348] kfifo_buf leds_cros_ec cros_ec_typec cros_ec_chardev mc [ 3.545814] sbs_battery elan_i2c phy_mtk_mipi_dsi_drv mtk_mmsys mtk_svs [ 3.562574] drm_dma_helper rfkill snd_sof_mt8186 mtk_adsp_common [ 3.574821] snd_sof_xtensa_dsp snd_sof_of snd_sof mtk_scp [ 3.594963] mtk_mutex mtk_rpmsg hid_multitouch mtk_scp_ipi lvts_thermal mt6577_auxadc [ 3.610771] snd_sof_utils mtk_wdt coreboot_table [ 3.626141] ramoops reed_solomon pwm_bl backlight [ 3.637694] [ 3.637698] CPU: 4 UID: 0 PID: 235 Comm: mt76-sdio-txrx Not tainted 6.11.0-rc7-next-20240913 #1 [ 3.651764] Hardware name: Google Steelix board (DT) [ 3.651767] pstate: 20400009 (nzCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 3.664875] pc : pskb_expand_head+0x2cc/0x3c4 [ 3.729971] usb 1-1: new high-speed USB device number 2 using xhci-mtk [ 3.733209] lr : mt76s_tx_run_queue+0x27c/0x410 [mt76_sdio] [ 3.744152] sp : ffff8000810d3c30 [ 3.756220] x29: ffff8000810d3c30 x28: 0000000000000000 [ 3.765341] x27: ffff6a16c81a7780 [ 3.778973] x26: 0000000000000000 x25: ffff6a16cc2576b0 x24: 0000000000000140 [ 3.790005] x23: ffff6a16cb910080 [ 3.799991] x22: 0000000000000028 [ 3.816224] x21: ffff6a16cc252000 [ 3.821005] x20: 0000000000000000 x19: ffff6a16c81a4300 x18: 0000000000000000 [ 3.858429] x17: ffffc9f99aab0000 x16: ffffa01e5a692f5c x15: 0000000000000000 [ 3.865556] x14: 0000000000000352 x13: 0000000000000352 x12: 0000000000000001 [ 3.872682] x11: 0000000000000057 x10: ffff6a16c8aeeb88 x9 : ffff6a16c81a4300 [ 3.879808] x8 : ffff6a16c8aeeb98 x7 : ffff6a17f6d91428 x6 : 0000000000000001 [ 3.886935] x5 : 0000000000000000 x4 : ffff6a16c827b3c0 x3 : 0000000000000820 [ 3.894060] x2 : 0000000000000200 x1 : 0000000000000002 x0 : ffff6a16c81a4300 [ 3.901186] Call trace: [ 3.903621] pskb_expand_head+0x2cc/0x3c4 [ 3.907622] mt76s_tx_run_queue+0x27c/0x410 [mt76_sdio] [ 3.912839] mt76s_txrx_worker+0xc8/0xde4 [mt76_sdio] [ 3.917881] mt7921s_txrx_worker+0x5c/0xec [mt7921s] [ 3.922839] __mt76_worker_fn+0x80/0x120 [mt76] [ 3.927380] kthread+0x114/0x118 [ 3.930601] ret_from_fork+0x10/0x20 [ 3.934171] Code: 17ffffb5 f9002bfb d4210000 f9002bfb (d4210000) [ 3.940252] ---[ end trace 0000000000000000 ]--- [ 3.948178] note: mt76-sdio-txrx [235] exited with irqs disabled [ 3.954227] note: mt76-sdio-txrx [235] exited with preempt_count 1 [ 3.960491] ------------[ cut here ]------------
[ 11.486135] ------------[ cut here ]------------ [ 11.490749] WARNING: CPU: 7 PID: 54 at kernel/kthread.c:657 kthread_park+0xa4/0xd0 [ 11.498319] Modules linked in: ip_tables x_tables ipv6 ax88796b asix onboard_usb_dev panel_edp uvcvideo uvc videobuf2_vmalloc mtk_vcodec_dec_hw mtk_vcodec_dec v4l2_vp9 mtk_vcodec_enc v4l2_h264 mt7921s mtk_jpeg mtk_vcodec_dbgfs btmtksdio mtk_vcodec_common mt76_sdio mtk_jpeg_enc_hw mtk_vpu mtk_jpeg_dec_hw btmtk mt7921_common mt792x_lib v4l2_mem2mem cros_ec_rpmsg videobuf2_dma_contig cbmem mt76_connac_lib videobuf2_memops videobuf2_v4l2 mt76 mac80211 bluetooth crct10dif_ce videodev ecdh_generic cros_ec_lid_angle videobuf2_common cros_ec_sensors ecc libarc4 mc mediatek_drm leds_cros_ec cros_ec_sensors_core cfg80211 mtk_mutex phy_mtk_mipi_dsi_drv mtk_mmsys drm_dma_helper industrialio_triggered_buffer sbs_battery rfkill cros_ec_chardev kfifo_buf snd_sof_mt8186 hid_multitouch mtk_adsp_common cros_ec_typec elan_i2c snd_sof_xtensa_dsp snd_sof_of snd_sof mtk_wdt mtk_scp snd_sof_utils lvts_thermal mtk_svs mt6577_auxadc pwm_bl backlight mtk_rpmsg mtk_scp_ipi ramoops reed_solomon coreboot_table [ 11.585320] CPU: 7 UID: 0 PID: 54 Comm: kworker/7:0 Tainted: G D W 6.11.0-rc7-next-20240913 #1 [ 11.585329] Tainted: [D]=DIE, [W]=WARN [ 11.585331] Hardware name: Google Steelix board (DT) [ 11.585334] Workqueue: events mt7921_init_work [mt7921_common] [ 11.585349] pstate: 20400009 (nzCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 11.616606] pc : kthread_park+0xa4/0xd0 [ 11.620431] lr : mt7921s_init_reset+0x80/0x24c [mt7921s] [ 11.625731] sp : ffff800080473cd0 [ 11.629032] x29: ffff800080473cd0 x28: 0000000000000000 x27: 0000000000000000 [ 11.636153] x26: ffff559736df45a8 x25: ffff559606502148 x24: ffff55960650a148 [ 11.643274] x23: 000000000041f23c x22: ffff559606502000 x21: ffff559606507738 [ 11.650394] x20: 0000000000000000 x19: ffff5596086e9140 x18: 0000000000000001 [ 11.657515] x17: 000000040044ffff x16: ffffb34762ec4fbc x15: 0000000000000000 [ 11.664636] x14: 00000000000001cc x13: 0000000000000000 x12: 0000000000000000 [ 11.671757] x11: 0000000000000001 x10: 0000000000000a90 x9 : ffff800080473bb0 [ 11.678878] x8 : ffff559736debcc0 x7 : ffff559736df4c40 x6 : 00000000000249f0 [ 11.685998] x5 : ffff559606502068 x4 : ffff559606502060 x3 : ffff559606507740 [ 11.693119] x2 : ffff559606507740 x1 : 0000000000005800 x0 : 000000000020804c [ 11.700240] Call trace: [ 11.702673] kthread_park+0xa4/0xd0 [ 11.706150] mt7921s_init_reset+0x80/0x24c [mt7921s] [ 11.711100] mt7921_init_work+0x190/0x240 [mt7921_common] [ 11.716486] process_one_work+0x14c/0x28c [ 11.720483] worker_thread+0x2d0/0x3d8 [ 11.724219] kthread+0x114/0x118 [ 11.727435] ret_from_fork+0x10/0x20 [ 11.731000] ---[ end trace 0000000000000000 ]--- [ 11.848160] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 [ 11.856958] Mem abort info: [ 11.859747] ESR = 0x0000000096000004 [ 11.863490] EC = 0x25: DABT (current EL), IL = 32 bits [ 11.868795] SET = 0, FnV = 0 [ 11.871842] EA = 0, S1PTW = 0 [ 11.874976] FSC = 0x04: level 0 translation fault [ 11.879847] Data abort info: [ 11.882721] ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000 [ 11.888199] CM = 0, WnR = 0, TnD = 0, TagAccess = 0 [ 11.893247] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 [ 11.898555] user pgtable: 4k pages, 48-bit VAs, pgdp=000000010815f000 [ 11.904993] [0000000000000000] pgd=0000000000000000, p4d=0000000000000000 [ 11.918032] Modules linked in: ip_tables x_tables ipv6 ax88796b asix onboard_usb_dev panel_edp uvcvideo uvc videobuf2_vmalloc mtk_vcodec_dec_hw mtk_vcodec_dec v4l2_vp9 mtk_vcodec_enc v4l2_h264 mt7921s mtk_jpeg mtk_vcodec_dbgfs btmtksdio mtk_vcodec_common mt76_sdio mtk_jpeg_enc_hw mtk_vpu mtk_jpeg_dec_hw btmtk mt7921_common mt792x_lib v4l2_mem2mem cros_ec_rpmsg videobuf2_dma_contig cbmem mt76_connac_lib videobuf2_memops videobuf2_v4l2 mt76 mac80211 bluetooth crct10dif_ce videodev ecdh_generic cros_ec_lid_angle videobuf2_common cros_ec_sensors ecc libarc4 mc mediatek_drm leds_cros_ec cros_ec_sensors_core cfg80211 mtk_mutex phy_mtk_mipi_dsi_drv mtk_mmsys drm_dma_helper industrialio_triggered_buffer sbs_battery rfkill cros_ec_chardev kfifo_buf snd_sof_mt8186 hid_multitouch mtk_adsp_common cros_ec_typec elan_i2c snd_sof_xtensa_dsp snd_sof_of snd_sof mtk_wdt mtk_scp snd_sof_utils lvts_thermal mtk_svs mt6577_auxadc pwm_bl backlight mtk_rpmsg mtk_scp_ipi ramoops reed_solomon coreboot_table [ 12.005017] CPU: 7 UID: 0 PID: 54 Comm: kworker/7:0 Tainted: G D W 6.11.0-rc7-next-20240913 #1 [ 12.014835] Tainted: [D]=DIE, [W]=WARN [ 12.018572] Hardware name: Google Steelix board (DT) [ 12.023523] Workqueue: events mt7921_init_work [mt7921_common] [ 12.029355] pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 12.036305] pc : kthread_unpark+0x1c/0xb4 [ 12.040311] lr : mt7921s_init_reset+0xc0/0x24c [mt7921s] [ 12.045614] sp : ffff800080473cc0 [ 12.048915] x29: ffff800080473cc0 x28: 0000000000000000 x27: 0000000000000000 [ 12.056040] x26: ffff559736df45a8 x25: ffff559606502148 x24: ffff55960650a148 [ 12.063163] x23: 000000000041f23c x22: ffff559606502000 x21: ffff5596065076b0 [ 12.070288] x20: ffff559606507800 x19: 0000000000000000 x18: ffff55973eea827c [ 12.077411] x17: 00000000000a9818 x16: ffffb34762ec4a30 x15: 0000000000000000 [ 12.084535] x14: ffff559600304580 x13: 0000000000000050 x12: 0000000000000001 [ 12.091659] x11: 0000000000000001 x10: 0000000000000a90 x9 : ffff800080473850 [ 12.098783] x8 : 0000000000000100 x7 : ffff559736078000 x6 : 0000000000000018 [ 12.105907] x5 : 00000000ffff8f00 x4 : 00ffffffffffffff x3 : 0000000000001099 [ 12.113031] x2 : 00000000fffee699 x1 : 000000000020804c x0 : ffff5596086e9140 [ 12.120155] Call trace: [ 12.122590] kthread_unpark+0x1c/0xb4 [ 12.126244] mt7921s_init_reset+0xc0/0x24c [mt7921s] [ 12.131197] mt7921_init_work+0x190/0x240 [mt7921_common] [ 12.136587] process_one_work+0x14c/0x28c [ 12.140585] worker_thread+0x2d0/0x3d8 [ 12.144323] kthread+0x114/0x118 [ 12.147542] ret_from_fork+0x10/0x20 [ 12.151111] Code: f9000bf3 b9402c01 36a804c1 f942cc13 (f9400261) [ 12.157190] ---[ end trace 0000000000000000 ]---
(Full logs available here: http://0x0.st/XxI-.txt)
Happy to provide any other details necessary.
Please add
when fixing this.
#regzbot introduced: next-20240909..next-20240910
#regzbot title: Boot regression on mt8186-corsola-steelix-sku131072 due to bug in mcu message sending logic in mt76
Thanks,
Nícolas
Re: [PATCH v2 14/24] wifi: mt76: mt7915: retry mcu messages
Quoted 181 lines · Nícolas F. R. A. Prado
Quoted 4 lines · Felix Fietkau
In some cases MCU messages can get lost. Instead of failing completely, attempt to recover by re-sending them.
Signed-off-by Felix Fietkau <[email protected]>Hi,
KernelCI has identified a regression originating from this patch. I've verified that reverting it fixes the issue.
Regression's impact: Unable to boot
Affected platforms:
* mt8186-corsola-steelix-sku131072Relevant kernel logs:
[ 3.457006] ------------[ cut here ]------------ [ 3.466050] kernel BUG at net/core/skbuff.c:2255! [ 3.466055] Internal error: Oops - BUG: 00000000f2000800 [#1] PREEMPT SMP [ 3.466059] Modules linked in: mt7921s mtk_vcodec_dbgfs mt76_sdio mtk_jpeg mtk_vcodec_common mt7921_common mtk_jpeg_enc_hw [ 3.484734] mt792x_lib mt76_connac_lib mtk_vpu mtk_jpeg_dec_hw v4l2_mem2mem [ 3.496464] mt76 videobuf2_dma_contig btmtksdio cros_ec_rpmsg btmtk videobuf2_memops cbmem mac80211 libarc4 bluetooth videobuf2_v4l2 videodev [ 3.510198] ecdh_generic cros_ec_sensors cros_ec_lid_angle cfg80211 ecc [ 3.522273] videobuf2_common mediatek_drm cros_ec_sensors_core crct10dif_ce industrialio_triggered_buffer [ 3.534348] kfifo_buf leds_cros_ec cros_ec_typec cros_ec_chardev mc [ 3.545814] sbs_battery elan_i2c phy_mtk_mipi_dsi_drv mtk_mmsys mtk_svs [ 3.562574] drm_dma_helper rfkill snd_sof_mt8186 mtk_adsp_common [ 3.574821] snd_sof_xtensa_dsp snd_sof_of snd_sof mtk_scp [ 3.594963] mtk_mutex mtk_rpmsg hid_multitouch mtk_scp_ipi lvts_thermal mt6577_auxadc [ 3.610771] snd_sof_utils mtk_wdt coreboot_table [ 3.626141] ramoops reed_solomon pwm_bl backlight [ 3.637694] [ 3.637698] CPU: 4 UID: 0 PID: 235 Comm: mt76-sdio-txrx Not tainted 6.11.0-rc7-next-20240913 #1 [ 3.651764] Hardware name: Google Steelix board (DT) [ 3.651767] pstate: 20400009 (nzCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 3.664875] pc : pskb_expand_head+0x2cc/0x3c4 [ 3.729971] usb 1-1: new high-speed USB device number 2 using xhci-mtk [ 3.733209] lr : mt76s_tx_run_queue+0x27c/0x410 [mt76_sdio] [ 3.744152] sp : ffff8000810d3c30 [ 3.756220] x29: ffff8000810d3c30 x28: 0000000000000000 [ 3.765341] x27: ffff6a16c81a7780 [ 3.778973] x26: 0000000000000000 x25: ffff6a16cc2576b0 x24: 0000000000000140 [ 3.790005] x23: ffff6a16cb910080 [ 3.799991] x22: 0000000000000028 [ 3.816224] x21: ffff6a16cc252000 [ 3.821005] x20: 0000000000000000 x19: ffff6a16c81a4300 x18: 0000000000000000 [ 3.858429] x17: ffffc9f99aab0000 x16: ffffa01e5a692f5c x15: 0000000000000000 [ 3.865556] x14: 0000000000000352 x13: 0000000000000352 x12: 0000000000000001 [ 3.872682] x11: 0000000000000057 x10: ffff6a16c8aeeb88 x9 : ffff6a16c81a4300 [ 3.879808] x8 : ffff6a16c8aeeb98 x7 : ffff6a17f6d91428 x6 : 0000000000000001 [ 3.886935] x5 : 0000000000000000 x4 : ffff6a16c827b3c0 x3 : 0000000000000820 [ 3.894060] x2 : 0000000000000200 x1 : 0000000000000002 x0 : ffff6a16c81a4300 [ 3.901186] Call trace: [ 3.903621] pskb_expand_head+0x2cc/0x3c4 [ 3.907622] mt76s_tx_run_queue+0x27c/0x410 [mt76_sdio] [ 3.912839] mt76s_txrx_worker+0xc8/0xde4 [mt76_sdio] [ 3.917881] mt7921s_txrx_worker+0x5c/0xec [mt7921s] [ 3.922839] __mt76_worker_fn+0x80/0x120 [mt76] [ 3.927380] kthread+0x114/0x118 [ 3.930601] ret_from_fork+0x10/0x20 [ 3.934171] Code: 17ffffb5 f9002bfb d4210000 f9002bfb (d4210000) [ 3.940252] ---[ end trace 0000000000000000 ]--- [ 3.948178] note: mt76-sdio-txrx [235] exited with irqs disabled [ 3.954227] note: mt76-sdio-txrx [235] exited with preempt_count 1 [ 3.960491] ------------[ cut here ]------------[ 11.486135] ------------[ cut here ]------------ [ 11.490749] WARNING: CPU: 7 PID: 54 at kernel/kthread.c:657 kthread_park+0xa4/0xd0 [ 11.498319] Modules linked in: ip_tables x_tables ipv6 ax88796basix
onboard_usb_devpanel_edpuvcvideo uvcvideobuf2_vmallocmtk_vcodec_dec_hwmtk_vcodec_decv4l2_vp9mtk_vcodec_encv4l2_h264mt7921smtk_jpegmtk_vcodec_dbgfsbtmtksdiomtk_vcodec_commonmt76_sdiomtk_jpeg_enc_hwmtk_vpumtk_jpeg_dec_hwbtmtkmt7921_commonmt792x_libv4l2_mem2memcros_ec_rpmsgvideobuf2_dma_contigcbmemmt76_connac_libvideobuf2_memopsvideobuf2_v4l2mt76 mac80211 bluetoothcrct10dif_cevideodevecdh_genericcros_ec_lid_anglevideobuf2_commoncros_ec_sensorsecc libarc4 mcmediatek_drmleds_cros_eccros_ec_sensors_corecfg80211mtk_mutexphy_mtk_mipi_dsi_drvmtk_mmsysdrm_dma_helperindustrialio_triggered_buffersbs_batteryrfkillcros_ec_chardevkfifo_bufsnd_sof_mt8186hid_multitouchmtk_adsp_commoncros_ec_typecelan_i2csnd_sof_xtensa_dspsnd_sof_ofsnd_sofmtk_wdtmtk_scpsnd_sof_utilslvts_thermalmtk_svsmt6577_auxadcpwm_blbacklightmtk_rpmsgmtk_scp_ipiramoopsreed_solomoncoreboot_table[ 11.585320] CPU: 7 UID: 0 PID: 54 Comm: kworker/7:0 Tainted: G D W 6.11.0-rc7-next-20240913 #1 [ 11.585329] Tainted: [D]=DIE, [W]=WARN [ 11.585331] Hardware name: Google Steelix board (DT) [ 11.585334] Workqueue: events mt7921_init_work [mt7921_common] [ 11.585349] pstate: 20400009 (nzCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 11.616606] pc : kthread_park+0xa4/0xd0 [ 11.620431] lr : mt7921s_init_reset+0x80/0x24c [mt7921s] [ 11.625731] sp : ffff800080473cd0 [ 11.629032] x29: ffff800080473cd0 x28: 0000000000000000 x27: 0000000000000000 [ 11.636153] x26: ffff559736df45a8 x25: ffff559606502148 x24: ffff55960650a148 [ 11.643274] x23: 000000000041f23c x22: ffff559606502000 x21: ffff559606507738 [ 11.650394] x20: 0000000000000000 x19: ffff5596086e9140 x18: 0000000000000001 [ 11.657515] x17: 000000040044ffff x16: ffffb34762ec4fbc x15: 0000000000000000 [ 11.664636] x14: 00000000000001cc x13: 0000000000000000 x12: 0000000000000000 [ 11.671757] x11: 0000000000000001 x10: 0000000000000a90 x9 : ffff800080473bb0 [ 11.678878] x8 : ffff559736debcc0 x7 : ffff559736df4c40 x6 : 00000000000249f0 [ 11.685998] x5 : ffff559606502068 x4 : ffff559606502060 x3 : ffff559606507740 [ 11.693119] x2 : ffff559606507740 x1 : 0000000000005800 x0 : 000000000020804c [ 11.700240] Call trace: [ 11.702673] kthread_park+0xa4/0xd0 [ 11.706150] mt7921s_init_reset+0x80/0x24c [mt7921s] [ 11.711100] mt7921_init_work+0x190/0x240 [mt7921_common] [ 11.716486] process_one_work+0x14c/0x28c [ 11.720483] worker_thread+0x2d0/0x3d8 [ 11.724219] kthread+0x114/0x118 [ 11.727435] ret_from_fork+0x10/0x20 [ 11.731000] ---[ end trace 0000000000000000 ]--- [ 11.848160] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 [ 11.856958] Mem abort info: [ 11.859747] ESR = 0x0000000096000004 [ 11.863490] EC = 0x25: DABT (current EL), IL = 32 bits [ 11.868795] SET = 0, FnV = 0 [ 11.871842] EA = 0, S1PTW = 0 [ 11.874976] FSC = 0x04: level 0 translation fault [ 11.879847] Data abort info: [ 11.882721] ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000 [ 11.888199] CM = 0, WnR = 0, TnD = 0, TagAccess = 0 [ 11.893247] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 [ 11.898555] user pgtable: 4k pages, 48-bit VAs, pgdp=000000010815f000 [ 11.904993] [0000000000000000] pgd=0000000000000000, p4d=0000000000000000 [ 11.918032] Modules linked in: ip_tables x_tables ipv6 ax88796basix
onboard_usb_devpanel_edpuvcvideo uvcvideobuf2_vmallocmtk_vcodec_dec_hwmtk_vcodec_decv4l2_vp9mtk_vcodec_encv4l2_h264mt7921smtk_jpegmtk_vcodec_dbgfsbtmtksdiomtk_vcodec_commonmt76_sdiomtk_jpeg_enc_hwmtk_vpumtk_jpeg_dec_hwbtmtkmt7921_commonmt792x_libv4l2_mem2memcros_ec_rpmsgvideobuf2_dma_contigcbmemmt76_connac_libvideobuf2_memopsvideobuf2_v4l2mt76 mac80211 bluetoothcrct10dif_cevideodevecdh_genericcros_ec_lid_anglevideobuf2_commoncros_ec_sensorsecc libarc4 mcmediatek_drmleds_cros_eccros_ec_sensors_corecfg80211mtk_mutexphy_mtk_mipi_dsi_drvmtk_mmsysdrm_dma_helperindustrialio_triggered_buffersbs_batteryrfkillcros_ec_chardevkfifo_bufsnd_sof_mt8186hid_multitouchmtk_adsp_commoncros_ec_typecelan_i2csnd_sof_xtensa_dspsnd_sof_ofsnd_sofmtk_wdtmtk_scpsnd_sof_utilslvts_thermalmtk_svsmt6577_auxadcpwm_blbacklightmtk_rpmsgmtk_scp_ipiramoopsreed_solomoncoreboot_table[ 12.005017] CPU: 7 UID: 0 PID: 54 Comm: kworker/7:0 Tainted: G D W 6.11.0-rc7-next-20240913 #1 [ 12.014835] Tainted: [D]=DIE, [W]=WARN [ 12.018572] Hardware name: Google Steelix board (DT) [ 12.023523] Workqueue: events mt7921_init_work [mt7921_common] [ 12.029355] pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 12.036305] pc : kthread_unpark+0x1c/0xb4 [ 12.040311] lr : mt7921s_init_reset+0xc0/0x24c [mt7921s] [ 12.045614] sp : ffff800080473cc0 [ 12.048915] x29: ffff800080473cc0 x28: 0000000000000000 x27: 0000000000000000 [ 12.056040] x26: ffff559736df45a8 x25: ffff559606502148 x24: ffff55960650a148 [ 12.063163] x23: 000000000041f23c x22: ffff559606502000 x21: ffff5596065076b0 [ 12.070288] x20: ffff559606507800 x19: 0000000000000000 x18: ffff55973eea827c [ 12.077411] x17: 00000000000a9818 x16: ffffb34762ec4a30 x15: 0000000000000000 [ 12.084535] x14: ffff559600304580 x13: 0000000000000050 x12: 0000000000000001 [ 12.091659] x11: 0000000000000001 x10: 0000000000000a90 x9 : ffff800080473850 [ 12.098783] x8 : 0000000000000100 x7 : ffff559736078000 x6 : 0000000000000018 [ 12.105907] x5 : 00000000ffff8f00 x4 : 00ffffffffffffff x3 : 0000000000001099 [ 12.113031] x2 : 00000000fffee699 x1 : 000000000020804c x0 : ffff5596086e9140 [ 12.120155] Call trace: [ 12.122590] kthread_unpark+0x1c/0xb4 [ 12.126244] mt7921s_init_reset+0xc0/0x24c [mt7921s] [ 12.131197] mt7921_init_work+0x190/0x240 [mt7921_common] [ 12.136587] process_one_work+0x14c/0x28c [ 12.140585] worker_thread+0x2d0/0x3d8 [ 12.144323] kthread+0x114/0x118 [ 12.147542] ret_from_fork+0x10/0x20 [ 12.151111] Code: f9000bf3 b9402c01 36a804c1 f942cc13 (f9400261) [ 12.157190] ---[ end trace 0000000000000000 ]---(Full logs available here: http://0x0.st/XxI-.txt)
Happy to provide any other details necessary.
Quoted 7 lines
Please add
when fixing this.
#regzbot introduced: next-20240909..next-20240910 #regzbot title: Boot regression on mt8186-corsola-steelix-sku131072 due to bug in mcu message sending logic in mt76
I don't see this in regzbot so let's try again:
#regzbot introduced: 3688c18b65ae ^
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Felix Fietkau
maintainerPATCH v2 15/24 wifi: mt76: mt7915: reset the device after MCU timeout
In reply to Felix FietkauOn MT7915, MCU hangs do not trigger watchdog interrupts, so they can only be detected through MCU message timeouts. Ensure that the hardware gets restarted when that happens in order to prevent a permanent stuck state.
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +9 -0
@@ -157,12 +157,21 @@ static int mt7915_mcu_parse_response(struct mt76_dev *mdev, int cmd, struct sk_buff *skb, int seq) { + struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);struct mt76_connac2_mcu_rxd *rxd;int ret =0 ;if (!skb) {dev_err (mdev->dev,"Message %08x (seq %d) timeout\n" , cmd, seq); + +if (!test_and_set_bit (MT76_MCU_RESET , &dev->mphy.state)) { + dev->recovery.restart = true; +wake_up (&dev->mt76.mcu.wait); +queue_work (dev->mt76.wq, &dev->reset_work); +wake_up (&dev->reset_wait); + } +return -ETIMEDOUT ; }
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 16/24 wifi: mt76: mt7915: add dummy HW offload of IEEE 802.11 fragmentation
In reply to Felix FietkauFrom: Benjamin Lin <[email protected]>
Currently, CONNAC2 series do not support encryption for fragmented Tx frames. Therefore, add dummy function mt7915_set_frag_threshold() to prevent SW IEEE 802.11 fragmentation.
--- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 1 + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 7 +++++++ 2 files changed, 8 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +1 -0
@@ -398,6 +398,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy)ieee80211_hw_set (hw,SUPPORTS_RX_DECAP_OFFLOAD );ieee80211_hw_set (hw,SUPPORTS_MULTI_BSSID );ieee80211_hw_set (hw,WANT_MONITOR_VIF ); +ieee80211_hw_set (hw,SUPPORTS_TX_FRAG ); hw->max_tx_fragments =4 ;
drivers/net/wireless/mediatek/mt76/mt7915/main.c +7 -0
@@ -1594,6 +1594,12 @@ mt7915_twt_teardown_request(struct ieee80211_hw *hw,mutex_unlock (&dev->mt76.mutex); } +static int +mt7915_set_frag_threshold (struct ieee80211_hw *hw,u32 val) +{ +return 0 ; +} +static int mt7915_set_radar_background (struct ieee80211_hw *hw,struct cfg80211_chan_def *chandef)
@@ -1723,6 +1729,7 @@ const struct ieee80211_ops mt7915_ops = { .sta_set_decap_offload = mt7915_sta_set_decap_offload, .add_twt_setup = mt7915_mac_add_twt_setup, .twt_teardown_request = mt7915_twt_teardown_request, + .set_frag_threshold = mt7915_set_frag_threshold, CFG80211_TESTMODE_CMD(mt76_testmode_cmd) CFG80211_TESTMODE_DUMP(mt76_testmode_dump)#ifdef CONFIG_MAC80211_DEBUGFS
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 17/24 wifi: mt76: mt7915: hold dev->mt76.mutex while disabling tx worker
In reply to Felix FietkauPrevent racing against other functions disabling the same worker
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +3 -1
@@ -1538,12 +1538,14 @@ void mt7915_mac_reset_work(struct work_struct *work)set_bit (MT76_RESET , &phy2->mt76->state);cancel_delayed_work_sync (&phy2->mt76->mac_work); } + +mutex_lock (&dev->mt76.mutex); +mt76_worker_disable (&dev->mt76.tx_worker);mt76_for_each_q_rx (&dev->mt76, i)napi_disable (&dev->mt76.napi[i]);napi_disable (&dev->mt76.tx_napi); -mutex_lock (&dev->mt76.mutex);if (mtk_wed_device_active (&dev->mt76.mmio.wed))mtk_wed_device_stop (&dev->mt76.mmio.wed);
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 18/24 wifi: mt76: connac: move mt7615_mcu_del_wtbl_all to connac
In reply to Felix FietkauPreparation for reusing it in mt7915
--- drivers/net/wireless/mediatek/mt76/mt7615/init.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 10 ---------- drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 1 - drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 11 +++++++++++ drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 1 + 5 files changed, 13 insertions(+), 12 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/init.c +1 -1
@@ -319,7 +319,7 @@ void mt7615_init_work(struct mt7615_dev *dev)mt7615_mcu_set_eeprom (dev);mt7615_mac_init (dev);mt7615_phy_init (dev); -mt7615_mcu_del_wtbl_all (dev); +mt76_connac_mcu_del_wtbl_all (&dev->mt76);mt7615_check_offload_capability (dev); }EXPORT_SYMBOL_GPL (mt7615_init_work);
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +0 -10
@@ -1880,16 +1880,6 @@ int mt7615_mcu_set_dbdc(struct mt7615_dev *dev) sizeof(req), true); } -int mt7615_mcu_del_wtbl_all (struct mt7615_dev *dev) -{ -struct wtbl_req_hdr req = { - .operation =WTBL_RESET_ALL , - }; - -return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD (WTBL_UPDATE ), - &req,sizeof (req), true); -} -int mt7615_mcu_set_fcc5_lpn (struct mt7615_dev *dev,int val) {struct {
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +0 -1
@@ -399,7 +399,6 @@ void mt7615_mac_set_rates(struct mt7615_phy *phy, struct mt7615_sta *sta, struct ieee80211_tx_rate *rates);void mt7615_pm_wake_work (struct work_struct *work);void mt7615_pm_power_save_work (struct work_struct *work); -int mt7615_mcu_del_wtbl_all (struct mt7615_dev *dev);int mt7615_mcu_set_chan_info (struct mt7615_phy *phy,int cmd);int mt7615_mcu_set_wmm (struct mt7615_dev *dev,u8 queue,const struct ieee80211_tx_queue_params *params);
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +11 -0
@@ -2849,6 +2849,17 @@ int mt76_connac_mcu_restart(struct mt76_dev *dev) }EXPORT_SYMBOL_GPL (mt76_connac_mcu_restart); +int mt76_connac_mcu_del_wtbl_all (struct mt76_dev *dev) +{ +struct wtbl_req_hdr req = { + .operation =WTBL_RESET_ALL , + }; + +return mt76_mcu_send_msg (dev,MCU_EXT_CMD (WTBL_UPDATE ), + &req,sizeof (req), true); +} +EXPORT_SYMBOL_GPL (mt76_connac_mcu_del_wtbl_all); +int mt76_connac_mcu_rdd_cmd (struct mt76_dev *dev,int cmd,u8 index,u8 rx_sel,u8 val) {
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +1 -0
@@ -2032,6 +2032,7 @@ void mt76_connac_mcu_wtbl_smps_tlv(struct sk_buff *skb, void *sta_wtbl, void *wtbl_tlv);int mt76_connac_mcu_set_pm (struct mt76_dev *dev,int band,int enter);int mt76_connac_mcu_restart (struct mt76_dev *dev); +int mt76_connac_mcu_del_wtbl_all (struct mt76_dev *dev);int mt76_connac_mcu_rdd_cmd (struct mt76_dev *dev,int cmd,u8 index,u8 rx_sel,u8 val);int mt76_connac_mcu_sta_wed_update (struct mt76_dev *dev,struct sk_buff *skb);
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 19/24 wifi: mt76: mt7915: improve hardware restart reliability
In reply to Felix Fietkau- use reconfig_complete to restart mac_work / queues
- reset full wtbl after firmware init
- clear wcid and vif mask to avoid leak
- fix sta poll list corruption
--- .../net/wireless/mediatek/mt76/mt7915/mac.c | 27 ++++++++++--------- .../net/wireless/mediatek/mt76/mt7915/main.c | 12 +++++++++ .../net/wireless/mediatek/mt76/mt7915/mcu.c | 2 ++ 3 files changed, 28 insertions(+), 13 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +14 -13
@@ -1463,26 +1463,27 @@ mt7915_mac_full_reset(struct mt7915_dev *dev)if (!mt7915_mac_restart (dev))break ; } -mutex_unlock (&dev->mt76.mutex);if (i ==10 )dev_err (dev->mt76.dev,"chip full reset failed\n" ); +spin_lock_bh (&dev->mt76.sta_poll_lock); +while (!list_empty (&dev->mt76.sta_poll_list)) +list_del_init (dev->mt76.sta_poll_list.next); +spin_unlock_bh (&dev->mt76.sta_poll_lock); + +memset (dev->mt76.wcid_mask,0 ,sizeof (dev->mt76.wcid_mask)); + dev->mt76.vif_mask =0 ; + + i =mt76_wcid_alloc (dev->mt76.wcid_mask,MT7915_WTBL_STA ); + dev->mt76.global_wcid.idx = i; + dev->recovery.hw_full_reset = false; + +mutex_unlock (&dev->mt76.mutex); +ieee80211_restart_hw (mt76_hw (dev));if (ext_phy)ieee80211_restart_hw (ext_phy->hw); - -ieee80211_wake_queues (mt76_hw (dev)); -if (ext_phy) -ieee80211_wake_queues (ext_phy->hw); - - dev->recovery.hw_full_reset = false; -ieee80211_queue_delayed_work (mt76_hw (dev), &dev->mphy.mac_work, -MT7915_WATCHDOG_TIME ); -if (ext_phy) -ieee80211_queue_delayed_work (ext_phy->hw, - &ext_phy->mac_work, -MT7915_WATCHDOG_TIME ); }/* system error recovery */
drivers/net/wireless/mediatek/mt76/mt7915/main.c +12 -0
@@ -1682,6 +1682,17 @@ mt7915_net_fill_forward_path(struct ieee80211_hw *hw, }#endif +static void +mt7915_reconfig_complete (struct ieee80211_hw *hw, +enum ieee80211_reconfig_type reconfig_type) +{ +struct mt7915_phy *phy =mt7915_hw_phy (hw); + +ieee80211_wake_queues (hw); +ieee80211_queue_delayed_work (hw, &phy->mt76->mac_work, +MT7915_WATCHDOG_TIME ); +} +const struct ieee80211_ops mt7915_ops = { .add_chanctx = ieee80211_emulate_add_chanctx, .remove_chanctx = ieee80211_emulate_remove_chanctx,
@@ -1740,4 +1751,5 @@ const struct ieee80211_ops mt7915_ops = { .net_fill_forward_path = mt7915_net_fill_forward_path, .net_setup_tc = mt76_wed_net_setup_tc, #endif + .reconfig_complete = mt7915_reconfig_complete, };
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +2 -0
@@ -2362,6 +2362,8 @@ int mt7915_mcu_init_firmware(struct mt7915_dev *dev)if (ret)return ret; +mt76_connac_mcu_del_wtbl_all (&dev->mt76); +if ((mtk_wed_device_active (&dev->mt76.mmio.wed) &&is_mt7915 (&dev->mt76)) || !mtk_wed_get_rx_capa (&dev->mt76.mmio.wed))
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 20/24 mt76: shrink mt76_queue_buf
In reply to Felix FietkauReuse one bit from the length field for skip_unmap
--- drivers/net/wireless/mediatek/mt76/mt76.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +2 -2
@@ -162,8 +162,8 @@ enum mt76_dfs_state {struct mt76_queue_buf {dma_addr_t addr; -u16 len; -bool skip_unmap; +u16 len:15 , + skip_unmap:1 ; };struct mt76_tx_info {
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 21/24 wifi: mt76: mt7915: fix rx filter setting for bfee functionality
In reply to Felix FietkauFrom: Howard Hsu <[email protected]>
Fix rx filter setting to prevent dropping NDPA frames. Without this change, bfee functionality may behave abnormally.
--- drivers/net/wireless/mediatek/mt76/mt7915/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/main.c +1 -2
@@ -557,8 +557,7 @@ static void mt7915_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; rxfilter = phy->rxfilter;
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 22/24 wifi: mt76: mt7915: always query station rx rate from firmware
In reply to Felix FietkauWhen offloading is enabled, the software rx path may not have the latest rate information.
--- drivers/net/wireless/mediatek/mt76/mt7915/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/main.c +1 -2
@@ -1094,8 +1094,7 @@ static void mt7915_sta_statistics(struct ieee80211_hw *hw,struct rate_info *txrate = &msta->wcid.rate;struct rate_info rxrate = {}; -if (is_mt7915 (&phy->dev->mt76) && - !mt7915_mcu_get_rx_rate (phy, vif, sta, &rxrate)) { +if (!mt7915_mcu_get_rx_rate (phy, vif, sta, &rxrate)) { sinfo->rxrate = rxrate; sinfo->filled |=BIT_ULL (NL80211_STA_INFO_RX_BITRATE ); }
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 23/24 wifi: mt76: mt7996: fix uninitialized TLV data
In reply to Felix FietkauUse skb_put_zero instead of skb_put
--- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +1 -1
@@ -735,7 +735,7 @@ void mt7996_mcu_rx_event(struct mt7996_dev *dev, struct sk_buff *skb)static struct tlv *mt7996_mcu_add_uni_tlv (struct sk_buff *skb,u16 tag,u16 len) { -struct tlv *ptlv =skb_put (skb, len); +struct tlv *ptlv =skb_put_zero (skb, len); ptlv->tag =cpu_to_le16 (tag); ptlv->len =cpu_to_le16 (len);
Signature · 1 line
2.46.0
Felix Fietkau
maintainerPATCH v2 24/24 wifi: mt76: mt7915: avoid long MCU command timeouts during SER
In reply to Felix FietkauImmediately abort MCU commands when firmware requests DMA restart.
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +5 -0
@@ -1696,6 +1696,11 @@ void mt7915_reset(struct mt7915_dev *dev)return ; } +if ((READ_ONCE (dev->recovery.state) &MT_MCU_CMD_STOP_DMA )) { +set_bit (MT76_MCU_RESET , &dev->mphy.state); +wake_up (&dev->mt76.mcu.wait); + } +queue_work (dev->mt76.wq, &dev->reset_work);wake_up (&dev->reset_wait); }
Signature · 1 line
2.46.0