mt76: mt7615: measure channel noise and report it via survey
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/4 mt76: mt7615: measure channel noise and report it via survey
Read measurements every 100 ms and build a simple moving average
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 4 ++ drivers/net/wireless/mediatek/mt76/mt76.h | 2 + .../net/wireless/mediatek/mt76/mt7615/mac.c | 42 +++++++++++++++++++ .../net/wireless/mediatek/mt76/mt7615/main.c | 3 ++ .../wireless/mediatek/mt76/mt7615/mt7615.h | 3 ++ .../net/wireless/mediatek/mt76/mt7615/regs.h | 6 +++ 6 files changed, 60 insertions(+)
drivers/net/wireless/mediatek/mt76/mac80211.c +4 -0
@@ -617,6 +617,9 @@ int mt76_get_survey(struct ieee80211_hw *hw, int idx, survey->channel = chan; survey->filled =SURVEY_INFO_TIME |SURVEY_INFO_TIME_BUSY ; survey->filled |= dev->drv->survey_flags; +if (state->noise) + survey->filled |=SURVEY_INFO_NOISE_DBM ; +if (chan == phy->main_chan) { survey->filled |=SURVEY_INFO_IN_USE ;
@@ -627,6 +630,7 @@ int mt76_get_survey(struct ieee80211_hw *hw, int idx, survey->time_busy =div_u64 (state->cc_busy,1000 ); survey->time_rx =div_u64 (state->cc_rx,1000 ); survey->time =div_u64 (state->cc_active,1000 ); + survey->noise = state->noise;spin_lock_bh (&dev->cc_lock); survey->time_bss_rx =div_u64 (state->cc_bss_rx,1000 );
drivers/net/wireless/mediatek/mt76/mt76.h +2 -0
@@ -328,6 +328,8 @@ struct mt76_channel_state {u64 cc_rx;u64 cc_bss_rx;u64 cc_tx; + +s8 noise; };struct mt76_sband {
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +42 -0
72 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/main.c +3 -0
@@ -40,11 +40,13 @@ static int mt7615_start(struct ieee80211_hw *hw)if (!running) {mt7615_mcu_ctrl_pm_state (dev,0 ,0 );mt7615_mcu_set_mac_enable (dev,0 , true); +mt7615_mac_enable_nf (dev,0 ); }if (phy != &dev->phy) {mt7615_mcu_ctrl_pm_state (dev,1 ,0 );mt7615_mcu_set_mac_enable (dev,1 , true); +mt7615_mac_enable_nf (dev,1 ); }set_bit (MT76_STATE_RUNNING , &phy->mt76->state);
@@ -238,6 +240,7 @@ static int mt7615_set_channel(struct mt7615_phy *phy)mt7615_mac_cca_stats_reset (phy);mt7615_mac_reset_counters (dev); + phy->noise =0 ; out:clear_bit (MT76_RESET , &phy->mt76->state);
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +3 -0
@@ -94,6 +94,8 @@ struct mt7615_phy {u32 rxfilter;u32 omac_mask; +u16 noise; +unsigned long last_cca_adj;int false_cca_ofdm, false_cca_cck;s8 ofdm_sensitivity;
@@ -288,6 +290,7 @@ bool mt7615_mac_wtbl_update(struct mt7615_dev *dev, int idx, u32 mask);void mt7615_mac_reset_counters (struct mt7615_dev *dev);void mt7615_mac_cca_stats_reset (struct mt7615_phy *phy);void mt7615_mac_set_scs (struct mt7615_dev *dev,bool enable); +void mt7615_mac_enable_nf (struct mt7615_dev *dev,bool ext_phy);void mt7615_mac_sta_poll (struct mt7615_dev *dev); int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi, struct sk_buff *skb, struct mt76_wcid *wcid,
drivers/net/wireless/mediatek/mt76/mt7615/regs.h +6 -0
@@ -104,6 +104,9 @@#define MT_WF_PHY_B1_PD_OFDM (v) ((v) << 16)#define MT_WF_PHY_B1_PD_BLK BIT(25) +#define MT_WF_PHY_RXTD_BASE MT_WF_PHY(0x2200) +#define MT_WF_PHY_RXTD (_n) (MT_WF_PHY_RXTD_BASE + ((_n) << 2)) +#define MT_WF_PHY_B0_RXTD_CCK_PD MT_WF_PHY(0x2310)#define MT_WF_PHY_B0_PD_CCK_MASK GENMASK(8, 1)#define MT_WF_PHY_B0_PD_CCK (v) ((v) << 1)
@@ -112,6 +115,9 @@#define MT_WF_PHY_B1_PD_CCK_MASK GENMASK(31, 24)#define MT_WF_PHY_B1_PD_CCK (v) ((v) << 24) +#define MT_WF_PHY_RXTD2_BASE MT_WF_PHY(0x2a00) +#define MT_WF_PHY_RXTD2 (_n) (MT_WF_PHY_RXTD2_BASE + ((_n) << 2)) +#define MT_WF_CFG_BASE 0x20200#define MT_WF_CFG (ofs) (MT_WF_CFG_BASE + (ofs))
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 2/4 mt76: mt7615: increase MCU command timeout
MCU_EXT_CMD_EFUSE_BUFFER_MODE needs more time on initialization, and with only 10 seconds it sometimes runs into timeouts.
--- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +1 -1
@@ -144,7 +144,7 @@ mt7615_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data, int len, bool wait_resp) { struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76); -unsigned long expires = jiffies +10 *HZ ; +unsigned long expires = jiffies +20 *HZ ;struct sk_buff *skb;int ret, seq;
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 3/4 mt76: mt7603: fix input validation issues for powersave-filtered frames
In reply to Felix FietkauBefore extracting the tid out of the packet, check if it was qos-data. Only accept tid values 0-7
Also, avoid accepting the hardware queue as skb queue mapping, it could lead to an overrun. Instead, derive the hardware queue from the tid number, in order to avoid issues with packets being filtered multiple times. This also fixes a mismatch between hardware and software queue indexes.
--- .../net/wireless/mediatek/mt76/mt7603/dma.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/dma.c +15 -4
@@ -30,6 +30,16 @@ mt7603_init_tx_queue(struct mt7603_dev *dev, struct mt76_sw_queue *q,static void mt7603_rx_loopback_skb (struct mt7603_dev *dev,struct sk_buff *skb) { +static const u8 tid_to_ac[8 ] = { +IEEE80211_AC_BE , +IEEE80211_AC_BK , +IEEE80211_AC_BK , +IEEE80211_AC_BE , +IEEE80211_AC_VI , +IEEE80211_AC_VI , +IEEE80211_AC_VO , +IEEE80211_AC_VO + };__le32 *txd = (__le32 *)skb->data;struct ieee80211_hdr *hdr;struct ieee80211_sta *sta;
@@ -38,7 +48,7 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb)void *priv;int idx;u32 val; -u8 tid; +u8 tid =0 ;if (skb->len <MT_TXD_SIZE +sizeof (struct ieee80211_hdr )) goto free;
@@ -56,15 +66,16 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb) 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)); - 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); 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 ; +if (ieee80211_is_data_qos (hdr->frame_control)) + tid = *ieee80211_get_qos_ctl (hdr) & +IEEE80211_QOS_CTL_TAG1D_MASK ; +skb_set_queue_mapping (skb, tid_to_ac[tid]);ieee80211_sta_set_buffered (sta, tid, true);spin_lock_bh (&dev->ps_lock);
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 4/4 mt76: clear skb pointers from rx aggregation reorder buffer during cleanup
In reply to Felix FietkauDuring the cleanup of the aggregation session, a rx handler (or release timer) on another CPU might still hold a pointer to the reorder buffer and could attempt to release some packets.
Clearing pointers during cleanup avoids a theoretical use-after-free bug here.
--- drivers/net/wireless/mediatek/mt76/agg-rx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/agg-rx.c +1 -0
@@ -276,6 +276,7 @@ static void mt76_rx_aggr_shutdown(struct mt76_dev *dev, struct mt76_rx_tid *tid)if (!skb)continue ; + tid->reorder_buf[i] =NULL ; tid->nframes--;dev_kfree_skb (skb); }
Signature · 1 line
2.24.0