mt76: mt76x02: reduce false positives in ED/CCA tx blocking
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/11 mt76: mt76x02: reduce false positives in ED/CCA tx blocking
Full tx blocking (as opposed to CCA blocking) should only happen if there is a continuous non-802.11 signal above the energy detect threshold. Unfortunately the ED/CCA counter can't detect that, as it also counts 802.11 signals as busy.
Similar to the vendor code, implement a learning mode that waits until the AGC gain has already been adjusted to the lowest value (due to false CCA events), and the number of false CCA events still remains high, and the blocking threshold is exceeded for more than 5 seconds.
--- drivers/net/wireless/mediatek/mt76/mt76x02.h | 3 +++ .../net/wireless/mediatek/mt76/mt76x02_mac.c | 25 ++++++++++++++++--- .../net/wireless/mediatek/mt76/mt76x02_phy.c | 2 ++ 3 files changed, 26 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x02.h +3 -0
@@ -51,6 +51,7 @@ struct mt76x02_calibration {u16 false_cca;s8 avg_rssi_all;s8 agc_gain_adjust; +s8 agc_lowest_gain;s8 low_gain;s8 temp_vco;
@@ -114,8 +115,10 @@ struct mt76x02_dev {struct mt76x02_dfs_pattern_detector dfs_pd;/* edcca monitor */ +unsigned long ed_trigger_timeout;bool ed_tx_blocked;bool ed_monitor; +u8 ed_monitor_learning;u8 ed_trigger;u8 ed_silent;ktime_t ed_time;
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +21 -4
@@ -960,6 +960,7 @@ void mt76x02_edcca_init(struct mt76x02_dev *dev, bool enable) } }mt76x02_edcca_tx_enable (dev, true); + dev->ed_monitor_learning = true;/* clear previous CCA timer value */ mt76_rr (dev,MT_ED_CCA_TIMER );
@@ -969,6 +970,10 @@ EXPORT_SYMBOL_GPL(mt76x02_edcca_init);#define MT_EDCCA_TH 92#define MT_EDCCA_BLOCK_TH 2 +#define MT_EDCCA_LEARN_TH 50 +#define MT_EDCCA_LEARN_CCA 180 +#define MT_EDCCA_LEARN_TIMEOUT (20 * HZ) +static void mt76x02_edcca_check (struct mt76x02_dev *dev) {ktime_t cur_time;
@@ -991,11 +996,23 @@ static void mt76x02_edcca_check(struct mt76x02_dev *dev) dev->ed_trigger =0 ; } -if (dev->ed_trigger >MT_EDCCA_BLOCK_TH && - !dev->ed_tx_blocked) +if (dev->cal.agc_lowest_gain && + dev->cal.false_cca >MT_EDCCA_LEARN_CCA && + dev->ed_trigger >MT_EDCCA_LEARN_TH ) { + dev->ed_monitor_learning = false; + dev->ed_trigger_timeout = jiffies +20 *HZ ; + }else if (!dev->ed_monitor_learning && +time_is_after_jiffies (dev->ed_trigger_timeout)) { + dev->ed_monitor_learning = true; +mt76x02_edcca_tx_enable (dev, true); + } + +if (dev->ed_monitor_learning) +return ; + +if (dev->ed_trigger >MT_EDCCA_BLOCK_TH && !dev->ed_tx_blocked)mt76x02_edcca_tx_enable (dev, false); -else if (dev->ed_silent >MT_EDCCA_BLOCK_TH && - dev->ed_tx_blocked) +else if (dev->ed_silent >MT_EDCCA_BLOCK_TH && dev->ed_tx_blocked)mt76x02_edcca_tx_enable (dev, true); }
drivers/net/wireless/mediatek/mt76/mt76x02_phy.c +2 -0
@@ -194,6 +194,8 @@ bool mt76x02_phy_adjust_vga_gain(struct mt76x02_dev *dev) ret = true; } + dev->cal.agc_lowest_gain = dev->cal.agc_gain_adjust >= limit; +return ret; }EXPORT_SYMBOL_GPL (mt76x02_phy_adjust_vga_gain);
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 2/11 mt76: mt7603: fix tx status HT rate validation
Use the correct variable in the check. Fixes an uninitialized variable warning
--- drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +1 -1
@@ -1072,7 +1072,7 @@ mt7603_fill_txs(struct mt7603_dev *dev, struct mt7603_sta *sta,case MT_PHY_TYPE_HT : final_rate_flags |=IEEE80211_TX_RC_MCS ; final_rate &=GENMASK (5 ,0 ); -if (i >15 ) +if (final_rate >15 )return false;break ;default :
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 3/11 mt76: mt76x2: fix external LNA gain settings
In reply to Felix FietkauDevices with external LNA need different values for AGC registers 8 and 9
--- drivers/net/wireless/mediatek/mt76/mt76x2/phy.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x2/phy.c +8 -3
@@ -260,10 +260,15 @@ mt76x2_phy_set_gain_val(struct mt76x02_dev *dev) gain_val[0 ] = dev->cal.agc_gain_cur[0 ] - dev->cal.agc_gain_adjust; gain_val[1 ] = dev->cal.agc_gain_cur[1 ] - dev->cal.agc_gain_adjust; -if (dev->mt76.chandef.width >=NL80211_CHAN_WIDTH_40 ) + val =0x1836 <<16 ; +if (!mt76x2_has_ext_lna (dev) && + dev->mt76.chandef.width >=NL80211_CHAN_WIDTH_40 ) val =0x1e42 <<16 ; -else - val =0x1836 <<16 ; + +if (mt76x2_has_ext_lna (dev) && + dev->mt76.chandef.chan->band ==NL80211_BAND_2GHZ && + dev->mt76.chandef.width <NL80211_CHAN_WIDTH_40 ) + val =0x0f36 <<16 ; val |=0xf8 ;
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 4/11 mt76: mt76x2: fix 2.4 GHz channel gain settings
In reply to Felix FietkauAGC register 35, 37 override for the low gain setting should only be done on 5 GHz. Also, 2.4 GHz needs a different value for register 35
--- .../net/wireless/mediatek/mt76/mt76x2/phy.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x2/phy.c +14 -5
@@ -285,6 +285,7 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev) {u8 *gain = dev->cal.agc_gain_init;u8 low_gain_delta, gain_delta; +u32 agc_35, agc_37;bool gain_change;int low_gain;u32 val;
@@ -323,6 +324,16 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev)else low_gain_delta =14 ; + agc_37 =0x2121262c ; +if (dev->mt76.chandef.chan->band ==NL80211_BAND_2GHZ ) + agc_35 =0x11111516 ; +else if (low_gain ==2 ) + agc_35 = agc_37 =0x08080808 ; +else if (dev->mt76.chandef.width ==NL80211_CHAN_WIDTH_80 ) + agc_35 =0x10101014 ; +else + agc_35 =0x11111116 ; +if (low_gain ==2 ) {mt76_wr (dev,MT_BBP (RXO ,18 ),0xf000a990 );mt76_wr (dev,MT_BBP (AGC ,35 ),0x08080808 );
@@ -331,15 +342,13 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev) dev->cal.agc_gain_adjust =0 ; }else {mt76_wr (dev,MT_BBP (RXO ,18 ),0xf000a991 ); -if (dev->mt76.chandef.width ==NL80211_CHAN_WIDTH_80 ) -mt76_wr (dev,MT_BBP (AGC ,35 ),0x10101014 ); -else -mt76_wr (dev,MT_BBP (AGC ,35 ),0x11111116 ); -mt76_wr (dev,MT_BBP (AGC ,37 ),0x2121262C ); gain_delta =0 ; dev->cal.agc_gain_adjust = low_gain_delta; } +mt76_wr (dev,MT_BBP (AGC ,35 ), agc_35); +mt76_wr (dev,MT_BBP (AGC ,37 ), agc_37); + dev->cal.agc_gain_cur[0 ] = gain[0 ] - gain_delta; dev->cal.agc_gain_cur[1 ] = gain[1 ] - gain_delta;mt76x2_phy_set_gain_val (dev);
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 5/11 mt76: mt7603: clear ps filtering mode before releasing buffered frames
In reply to Felix FietkauFixes sending them, otherwise they loop back right into the buffer
--- drivers/net/wireless/mediatek/mt76/mt7603/main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7603/main.c +2 -0
@@ -399,6 +399,8 @@ mt7603_release_buffered_frames(struct ieee80211_hw *hw,__skb_queue_head_init (&list); +mt7603_wtbl_set_ps (dev, msta, false); +spin_lock_bh (&dev->ps_lock); skb_queue_walk_safe(&msta->psq, skb, tmp) {if (!nframes)
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 6/11 mt76: mt7603: fix up hardware queue index for PS filtered packets
In reply to Felix FietkauMake the queue index match the hardware queue on which they get sent out
--- drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7603/dma.c +4 -0
@@ -47,6 +47,10 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb) val =le32_to_cpu (txd[0 ]);skb_set_queue_mapping (skb,FIELD_GET (MT_TXD0_Q_IDX , val)); + val &= ~(MT_TXD0_P_IDX |MT_TXD0_Q_IDX ); + val |=FIELD_PREP (MT_TXD0_Q_IDX ,MT_TX_HW_QUEUE_MGMT ); + txd[0 ] =cpu_to_le32 (val); +spin_lock_bh (&dev->ps_lock);__skb_queue_tail (&msta->psq, skb);if (skb_queue_len (&msta->psq) >=64 ) {
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 7/11 mt76: mt7603: notify mac80211 about buffered frames in ps queue
In reply to Felix FietkauAlso fix the size check for filtered powersave frames Fixes a corner case with waking up clients
--- drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/dma.c +11 -2
@@ -24,12 +24,16 @@ static void mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb) { __le32 *txd = (__le32 *)skb->data; +struct ieee80211_hdr *hdr; +struct ieee80211_sta *sta;struct mt7603_sta *msta;struct mt76_wcid *wcid; +void *priv;int idx;u32 val; +u8 tid; -if (skb->len <sizeof (MT_TXD_SIZE ) +sizeof (struct ieee80211_hdr )) +if (skb->len <MT_TXD_SIZE +sizeof (struct ieee80211_hdr )) goto free; val =le32_to_cpu (txd[1 ]);
@@ -43,7 +47,7 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb)if (!wcid) goto free; - msta = container_of(wcid, struct mt7603_sta, wcid); + priv = msta = container_of(wcid, struct mt7603_sta, wcid); val =le32_to_cpu (txd[0 ]);skb_set_queue_mapping (skb,FIELD_GET (MT_TXD0_Q_IDX , val));
@@ -51,6 +55,11 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb) val |=FIELD_PREP (MT_TXD0_Q_IDX ,MT_TX_HW_QUEUE_MGMT ); txd[0 ] =cpu_to_le32 (val); + sta = container_of(priv, struct ieee80211_sta, drv_priv); + hdr = (struct ieee80211_hdr *) &skb->data[MT_TXD_SIZE ]; + tid = *ieee80211_get_qos_ctl (hdr) &IEEE80211_QOS_CTL_TID_MASK ; +ieee80211_sta_set_buffered (sta, tid, true); +spin_lock_bh (&dev->ps_lock);__skb_queue_tail (&msta->psq, skb);if (skb_queue_len (&msta->psq) >=64 ) {
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 8/11 mt76: mt7603: clear the service period on releasing PS filtered packets
In reply to Felix FietkauThese packets have no txwi entry in the ring, so tracking via tx status does not work. To prevent PS poll requests from being unanswered, end the service period right away
--- drivers/net/wireless/mediatek/mt76/mt7603/main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7603/main.c +3 -0
@@ -416,6 +416,9 @@ mt7603_release_buffered_frames(struct ieee80211_hw *hw, }spin_unlock_bh (&dev->ps_lock); +if (!skb_queue_empty (&list)) +ieee80211_sta_eosp (sta); +mt7603_ps_tx_list (dev, &list);if (nframes)
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 9/11 mt76: when releasing PS frames, end the service period if no frame was found
In reply to Felix FietkauFixes a rare corner case if the txq dequeue attempt fails, but mac80211 still has PS buffered packets
--- drivers/net/wireless/mediatek/mt76/tx.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt76/tx.c +3 -0
@@ -377,7 +377,10 @@ mt76_release_buffered_frames(struct ieee80211_hw *hw, struct ieee80211_sta *sta,if (last_skb) {mt76_queue_ps_skb (dev, sta, last_skb, true); dev->queue_ops->kick (dev, hwq); + }else { +ieee80211_sta_eosp (sta); } +spin_unlock_bh (&hwq->lock); }EXPORT_SYMBOL_GPL (mt76_release_buffered_frames);
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 10/11 mt76: mt76x02: disable ED/CCA by default
In reply to Felix FietkauThis feature has been reported to cause stability issues on several systems. Disable it until it has been fixed and verified. It can still be enabled through debugfs
--- drivers/net/wireless/mediatek/mt76/mt76x02.h | 1 + .../wireless/mediatek/mt76/mt76x02_debugfs.c | 27 +++++++++++++++++++ .../net/wireless/mediatek/mt76/mt76x02_dfs.c | 3 ++- 3 files changed, 30 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt76x02.h +1 -0
@@ -118,6 +118,7 @@ struct mt76x02_dev {unsigned long ed_trigger_timeout;bool ed_tx_blocked;bool ed_monitor; +u8 ed_monitor_enabled;u8 ed_monitor_learning;u8 ed_trigger;u8 ed_silent;
drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c +27 -0
@@ -116,6 +116,32 @@ static int read_agc(struct seq_file *file, void *data)return 0 ; } +static int +mt76_edcca_set (void *data,u64 val) +{ +struct mt76x02_dev *dev = data; +enum nl80211_dfs_regions region = dev->dfs_pd.region; + + dev->ed_monitor_enabled = !!val; + dev->ed_monitor = dev->ed_monitor_enabled && + region ==NL80211_DFS_ETSI ; +mt76x02_edcca_init (dev, true); + +return 0 ; +} + +static int +mt76_edcca_get (void *data,u64 *val) +{ +struct mt76x02_dev *dev = data; + + *val = dev->ed_monitor_enabled; +return 0 ; +} + +DEFINE_DEBUGFS_ATTRIBUTE (fops_edcca, mt76_edcca_get, mt76_edcca_set, +"%lld\n" ); +void mt76x02_init_debugfs (struct mt76x02_dev *dev) {struct dentry *dir;
@@ -127,6 +153,7 @@ void mt76x02_init_debugfs(struct mt76x02_dev *dev)debugfs_create_u8 ("temperature" ,0400 , dir, &dev->cal.temp);debugfs_create_bool ("tpc" ,0600 , dir, &dev->enable_tpc); +debugfs_create_file ("edcca" ,0400 , dir, dev, &fops_edcca);debugfs_create_file ("ampdu_stat" ,0400 , dir, dev, &fops_ampdu_stat);debugfs_create_file ("dfs_stats" ,0400 , dir, dev, &fops_dfs_stat); debugfs_create_devm_seqfile(dev->mt76.dev, "txpower", dir,
drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c +2 -1
@@ -885,7 +885,8 @@ mt76x02_dfs_set_domain(struct mt76x02_dev *dev,if (dfs_pd->region != region) {tasklet_disable (&dfs_pd->dfs_tasklet); - dev->ed_monitor = region ==NL80211_DFS_ETSI ; + dev->ed_monitor = dev->ed_monitor_enabled && + region ==NL80211_DFS_ETSI ;mt76x02_edcca_init (dev, true); dfs_pd->region = region;
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 11/11 mt76: mt7603: set moredata flag when queueing ps-filtered packets
In reply to Felix FietkauClients should poll for more packets afterwards
--- drivers/net/wireless/mediatek/mt76/mt7603/main.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7603/main.c +11 -0
@@ -5,6 +5,7 @@#include <linux/pci.h> #include <linux/module.h> #include "mt7603.h" +#include "mac.h" #include "eeprom.h" static int
@@ -385,6 +386,15 @@ mt7603_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps)mt7603_ps_tx_list (dev, &list); } +static void +mt7603_ps_set_more_data (struct sk_buff *skb) +{ +struct ieee80211_hdr *hdr; + + hdr = (struct ieee80211_hdr *) &skb->data[MT_TXD_SIZE ]; + hdr->frame_control |=cpu_to_le16 (IEEE80211_FCTL_MOREDATA ); +} + static void mt7603_release_buffered_frames(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
@@ -411,6 +421,7 @@ mt7603_release_buffered_frames(struct ieee80211_hw *hw,skb_set_queue_mapping (skb,MT_TXQ_PSD );__skb_unlink (skb, &msta->psq); +mt7603_ps_set_more_data (skb);__skb_queue_tail (&list, skb); nframes--; }
Signature · 1 line
2.17.0