* [PATCH 1/5] mt76x02: improve mac error check/reset reliability
@ 2022-02-03 13:35 Felix Fietkau
2022-02-03 13:35 ` [PATCH 2/5] mt76: mt76x02: improve tx hang detection Felix Fietkau
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Felix Fietkau @ 2022-02-03 13:35 UTC (permalink / raw)
To: linux-wireless
On AP mode devices, check beacon tx counters to detect MAC errors.
When an error is detected, stop the MAC before resetting it
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
drivers/net/wireless/mediatek/mt76/mt76x02.h | 1 +
.../net/wireless/mediatek/mt76/mt76x02_mac.c | 25 ++++++++++++++-----
.../net/wireless/mediatek/mt76/mt76x02_regs.h | 2 ++
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h
index 44d1a92d9a90..3232083e9916 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h
@@ -104,6 +104,7 @@ struct mt76x02_dev {
u32 tx_hang_reset;
u8 tx_hang_check;
+ u8 beacon_hang_check;
u8 mcu_timeout;
struct mt76x02_calibration cal;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index a404fd7ea968..dc2aeaab72ec 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -1040,12 +1040,26 @@ EXPORT_SYMBOL_GPL(mt76x02_update_channel);
static void mt76x02_check_mac_err(struct mt76x02_dev *dev)
{
- u32 val = mt76_rr(dev, 0x10f4);
+ if (dev->mt76.beacon_mask) {
+ if (mt76_rr(dev, MT_TX_STA_0) & MT_TX_STA_0_BEACONS) {
+ dev->beacon_hang_check = 0;
+ return;
+ }
- if (!(val & BIT(29)) || !(val & (BIT(7) | BIT(5))))
- return;
+ if (++dev->beacon_hang_check < 10)
+ return;
+
+ dev->beacon_hang_check = 0;
+ } else {
+ u32 val = mt76_rr(dev, 0x10f4);
+ if (!(val & BIT(29)) || !(val & (BIT(7) | BIT(5))))
+ return;
+ }
+
+ dev_err(dev->mt76.dev, "MAC error detected\n");
- dev_err(dev->mt76.dev, "mac specific condition occurred\n");
+ mt76_wr(dev, MT_MAC_SYS_CTRL, 0);
+ mt76x02_wait_for_txrx_idle(&dev->mt76);
mt76_set(dev, MT_MAC_SYS_CTRL, MT_MAC_SYS_CTRL_RESET_CSR);
udelay(10);
@@ -1178,8 +1192,7 @@ void mt76x02_mac_work(struct work_struct *work)
dev->mt76.aggr_stats[idx++] += val >> 16;
}
- if (!dev->mt76.beacon_mask)
- mt76x02_check_mac_err(dev);
+ mt76x02_check_mac_err(dev);
if (dev->ed_monitor)
mt76x02_edcca_check(dev);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h b/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h
index fa7872ac22bf..fe0c5e3298bc 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h
@@ -571,6 +571,8 @@
#define MT_RX_STAT_2_OVERFLOW_ERRORS GENMASK(31, 16)
#define MT_TX_STA_0 0x170c
+#define MT_TX_STA_0_BEACONS GENMASK(31, 16)
+
#define MT_TX_STA_1 0x1710
#define MT_TX_STA_2 0x1714
--
2.32.0 (Apple Git-132)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/5] mt76: mt76x02: improve tx hang detection
2022-02-03 13:35 [PATCH 1/5] mt76x02: improve mac error check/reset reliability Felix Fietkau
@ 2022-02-03 13:35 ` Felix Fietkau
2022-02-03 13:35 ` [PATCH 3/5] mt76: mt7915: fix/rewrite the dfs state handling logic Felix Fietkau
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Felix Fietkau @ 2022-02-03 13:35 UTC (permalink / raw)
To: linux-wireless
Instead of checking if any queue has not made progress since the last run,
only trigger hang detection if one of the queues has not made any progress
in 10 subsequent runs. This should reduce false positive firmware restarts
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
drivers/net/wireless/mediatek/mt76/mt76x02.h | 2 +-
.../net/wireless/mediatek/mt76/mt76x02_mmio.c | 30 +++++++------------
2 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h
index 3232083e9916..f76fd22ee035 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h
@@ -103,7 +103,7 @@ struct mt76x02_dev {
u8 tbtt_count;
u32 tx_hang_reset;
- u8 tx_hang_check;
+ u8 tx_hang_check[4];
u8 beacon_hang_check;
u8 mcu_timeout;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index ec0de691129a..8bcd8afa0d3a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -348,18 +348,20 @@ static bool mt76x02_tx_hang(struct mt76x02_dev *dev)
for (i = 0; i < 4; i++) {
q = dev->mphy.q_tx[i];
- if (!q->queued)
- continue;
-
prev_dma_idx = dev->mt76.tx_dma_idx[i];
dma_idx = readl(&q->regs->dma_idx);
dev->mt76.tx_dma_idx[i] = dma_idx;
- if (prev_dma_idx == dma_idx)
- break;
+ if (!q->queued || prev_dma_idx != dma_idx) {
+ dev->tx_hang_check[i] = 0;
+ continue;
+ }
+
+ if (++dev->tx_hang_check[i] >= MT_TX_HANG_TH)
+ return true;
}
- return i < 4;
+ return false;
}
static void mt76x02_key_sync(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -530,23 +532,13 @@ static void mt76x02_check_tx_hang(struct mt76x02_dev *dev)
if (test_bit(MT76_RESTART, &dev->mphy.state))
return;
- if (mt76x02_tx_hang(dev)) {
- if (++dev->tx_hang_check >= MT_TX_HANG_TH)
- goto restart;
- } else {
- dev->tx_hang_check = 0;
- }
-
- if (dev->mcu_timeout)
- goto restart;
-
- return;
+ if (!mt76x02_tx_hang(dev) && !dev->mcu_timeout)
+ return;
-restart:
mt76x02_watchdog_reset(dev);
dev->tx_hang_reset++;
- dev->tx_hang_check = 0;
+ memset(dev->tx_hang_check, 0, sizeof(dev->tx_hang_check));
memset(dev->mt76.tx_dma_idx, 0xff,
sizeof(dev->mt76.tx_dma_idx));
}
--
2.32.0 (Apple Git-132)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/5] mt76: mt7915: fix/rewrite the dfs state handling logic
2022-02-03 13:35 [PATCH 1/5] mt76x02: improve mac error check/reset reliability Felix Fietkau
2022-02-03 13:35 ` [PATCH 2/5] mt76: mt76x02: improve tx hang detection Felix Fietkau
@ 2022-02-03 13:35 ` Felix Fietkau
2022-02-03 15:13 ` Lorenzo Bianconi
2022-02-03 13:35 ` [PATCH 4/5] mt76: mt7615: " Felix Fietkau
2022-02-03 13:36 ` [PATCH 5/5] mt76: mt76x02: use mt76_phy_dfs_state to determine radar detector state Felix Fietkau
3 siblings, 1 reply; 6+ messages in thread
From: Felix Fietkau @ 2022-02-03 13:35 UTC (permalink / raw)
To: linux-wireless
Client mode on DFS channels was broken, because the old code was activating
the DFS detector on radar channels while leaving it in CAC state.
This was caused by making the decision based on the channel radar flag,
instead of hw->conf.radar_enabled.
In order to properly deal with the various corner cases, rip out the state
handling code and replace it with something that's much easier to reason
about.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
drivers/net/wireless/mediatek/mt76/mac80211.c | 28 ++++++++++
drivers/net/wireless/mediatek/mt76/mt76.h | 9 ++++
.../net/wireless/mediatek/mt76/mt7915/init.c | 7 +--
.../net/wireless/mediatek/mt76/mt7915/mac.c | 51 +++++++++++--------
.../net/wireless/mediatek/mt76/mt7915/main.c | 21 --------
.../net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +-
.../wireless/mediatek/mt76/mt7915/mt7915.h | 1 -
7 files changed, 69 insertions(+), 50 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 148e126b9215..a4bb281a74e6 100644
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -823,6 +823,10 @@ void mt76_set_channel(struct mt76_phy *phy)
wait_event_timeout(dev->tx_wait, !mt76_has_tx_pending(phy), timeout);
mt76_update_survey(phy);
+ if (phy->chandef.chan->center_freq != chandef->chan->center_freq ||
+ phy->chandef.width != chandef->width)
+ phy->dfs_state = MT_DFS_STATE_UNKNOWN;
+
phy->chandef = *chandef;
phy->chan_state = mt76_channel_state(phy, chandef->chan);
@@ -1604,3 +1608,27 @@ void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi,
wi->worker_stat_count = ei - wi->initial_stat_idx;
}
EXPORT_SYMBOL_GPL(mt76_ethtool_worker);
+
+enum mt76_dfs_state mt76_phy_dfs_state(struct mt76_phy *phy)
+{
+ struct ieee80211_hw *hw = phy->hw;
+ struct mt76_dev *dev = phy->dev;
+
+ if (dev->region == NL80211_DFS_UNSET ||
+ test_bit(MT76_SCANNING, &phy->state))
+ return MT_DFS_STATE_DISABLED;
+
+ if (!hw->conf.radar_enabled) {
+ if ((hw->conf.flags & IEEE80211_CONF_MONITOR) &&
+ (phy->chandef.chan->flags & IEEE80211_CHAN_RADAR))
+ return MT_DFS_STATE_ACTIVE;
+
+ return MT_DFS_STATE_DISABLED;
+ }
+
+ if (phy->chandef.chan->dfs_state != NL80211_DFS_AVAILABLE)
+ return MT_DFS_STATE_CAC;
+
+ return MT_DFS_STATE_ACTIVE;
+}
+EXPORT_SYMBOL_GPL(mt76_phy_dfs_state);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 43abf0679876..8d5c484eee58 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -105,6 +105,13 @@ enum mt76_cipher_type {
MT_CIPHER_GCMP_256,
};
+enum mt76_dfs_state {
+ MT_DFS_STATE_UNKNOWN,
+ MT_DFS_STATE_DISABLED,
+ MT_DFS_STATE_CAC,
+ MT_DFS_STATE_ACTIVE,
+};
+
struct mt76_queue_buf {
dma_addr_t addr;
u16 len;
@@ -639,6 +646,7 @@ struct mt76_phy {
struct ieee80211_channel *main_chan;
struct mt76_channel_state *chan_state;
+ enum mt76_dfs_state dfs_state;
ktime_t survey_time;
struct mt76_hw_cap cap;
@@ -1184,6 +1192,7 @@ void mt76_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
const u8 *mac);
void mt76_sw_scan_complete(struct ieee80211_hw *hw,
struct ieee80211_vif *vif);
+enum mt76_dfs_state mt76_phy_dfs_state(struct mt76_phy *phy);
int mt76_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
void *data, int len);
int mt76_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb,
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index e908d56a9e21..705f362b8f7b 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -288,7 +288,6 @@ mt7915_regd_notifier(struct wiphy *wiphy,
struct mt7915_dev *dev = mt7915_hw_dev(hw);
struct mt76_phy *mphy = hw->priv;
struct mt7915_phy *phy = mphy->priv;
- struct cfg80211_chan_def *chandef = &mphy->chandef;
memcpy(dev->mt76.alpha2, request->alpha2, sizeof(dev->mt76.alpha2));
dev->mt76.region = request->dfs_region;
@@ -299,9 +298,7 @@ mt7915_regd_notifier(struct wiphy *wiphy,
mt7915_init_txpower(dev, &mphy->sband_2g.sband);
mt7915_init_txpower(dev, &mphy->sband_5g.sband);
- if (!(chandef->chan->flags & IEEE80211_CHAN_RADAR))
- return;
-
+ mphy->dfs_state = MT_DFS_STATE_UNKNOWN;
mt7915_dfs_init_radar_detector(phy);
}
@@ -976,8 +973,6 @@ int mt7915_register_device(struct mt7915_dev *dev)
mt7915_init_wiphy(hw);
- dev->phy.dfs_state = -1;
-
#ifdef CONFIG_NL80211_TESTMODE
dev->mt76.test_ops = &mt7915_testmode_ops;
#endif
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 88bc4cf0dd79..59f0334ef8d2 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -2439,41 +2439,48 @@ mt7915_dfs_init_radar_specs(struct mt7915_phy *phy)
int mt7915_dfs_init_radar_detector(struct mt7915_phy *phy)
{
- struct cfg80211_chan_def *chandef = &phy->mt76->chandef;
struct mt7915_dev *dev = phy->dev;
bool ext_phy = phy != &dev->phy;
+ enum mt76_dfs_state dfs_state, prev_state;
int err;
- if (dev->mt76.region == NL80211_DFS_UNSET) {
- phy->dfs_state = -1;
- if (phy->rdd_state)
- goto stop;
+ prev_state = phy->mt76->dfs_state;
+ dfs_state = mt76_phy_dfs_state(phy->mt76);
+ if (prev_state == dfs_state)
return 0;
- }
- if (test_bit(MT76_SCANNING, &phy->mt76->state))
- return 0;
-
- if (phy->dfs_state == chandef->chan->dfs_state)
- return 0;
+ if (prev_state == MT_DFS_STATE_UNKNOWN)
+ mt7915_dfs_stop_radar_detector(phy);
- err = mt7915_dfs_init_radar_specs(phy);
- if (err < 0) {
- phy->dfs_state = -1;
+ if (dfs_state == MT_DFS_STATE_DISABLED)
goto stop;
- }
- phy->dfs_state = chandef->chan->dfs_state;
+ if (prev_state <= MT_DFS_STATE_DISABLED) {
+ err = mt7915_dfs_init_radar_specs(phy);
+ if (err < 0)
+ return err;
+
+ err = mt7915_dfs_start_radar_detector(phy);
+ if (err < 0)
+ return err;
- if (chandef->chan->flags & IEEE80211_CHAN_RADAR) {
- if (chandef->chan->dfs_state != NL80211_DFS_AVAILABLE)
- return mt7915_dfs_start_radar_detector(phy);
+ phy->mt76->dfs_state = MT_DFS_STATE_CAC;
+ }
+
+ if (dfs_state == MT_DFS_STATE_CAC)
+ return 0;
- return mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_CAC_END,
- ext_phy, MT_RX_SEL0, 0);
+ err = mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_CAC_END,
+ ext_phy, MT_RX_SEL0, 0);
+ if (err < 0) {
+ phy->mt76->dfs_state = MT_DFS_STATE_UNKNOWN;
+ return err;
}
+ phy->mt76->dfs_state = MT_DFS_STATE_ACTIVE;
+ return 0;
+
stop:
err = mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_NORMAL_START, ext_phy,
MT_RX_SEL0, 0);
@@ -2481,6 +2488,8 @@ int mt7915_dfs_init_radar_detector(struct mt7915_phy *phy)
return err;
mt7915_dfs_stop_radar_detector(phy);
+ phy->mt76->dfs_state = MT_DFS_STATE_DISABLED;
+
return 0;
}
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index 989298ffffbc..dee7fc011cdf 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -302,26 +302,6 @@ static void mt7915_remove_interface(struct ieee80211_hw *hw,
mt76_packet_id_flush(&dev->mt76, &msta->wcid);
}
-static void mt7915_init_dfs_state(struct mt7915_phy *phy)
-{
- struct mt76_phy *mphy = phy->mt76;
- struct ieee80211_hw *hw = mphy->hw;
- struct cfg80211_chan_def *chandef = &hw->conf.chandef;
-
- if (hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
- return;
-
- if (!(chandef->chan->flags & IEEE80211_CHAN_RADAR) &&
- !(mphy->chandef.chan->flags & IEEE80211_CHAN_RADAR))
- return;
-
- if (mphy->chandef.chan->center_freq == chandef->chan->center_freq &&
- mphy->chandef.width == chandef->width)
- return;
-
- phy->dfs_state = -1;
-}
-
int mt7915_set_channel(struct mt7915_phy *phy)
{
struct mt7915_dev *dev = phy->dev;
@@ -332,7 +312,6 @@ int mt7915_set_channel(struct mt7915_phy *phy)
mutex_lock(&dev->mt76.mutex);
set_bit(MT76_RESET, &phy->mt76->state);
- mt7915_init_dfs_state(phy);
mt76_set_channel(phy->mt76);
if (dev->flash_mode) {
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index e8c68e47b613..462c7da93b60 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -2786,7 +2786,7 @@ int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd)
if (phy->mt76->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
req.switch_reason = CH_SWITCH_SCAN_BYPASS_DPD;
- else if ((chandef->chan->flags & IEEE80211_CHAN_RADAR) &&
+ else if (phy->mt76->hw->conf.radar_enabled &&
chandef->chan->dfs_state != NL80211_DFS_AVAILABLE)
req.switch_reason = CH_SWITCH_DFS;
else
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index bc3a3dcdb3a0..96653d64d161 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -230,7 +230,6 @@ struct mt7915_phy {
u8 slottime;
u8 rdd_state;
- int dfs_state;
u32 rx_ampdu_ts;
u32 ampdu_ref;
--
2.32.0 (Apple Git-132)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/5] mt76: mt7615: fix/rewrite the dfs state handling logic
2022-02-03 13:35 [PATCH 1/5] mt76x02: improve mac error check/reset reliability Felix Fietkau
2022-02-03 13:35 ` [PATCH 2/5] mt76: mt76x02: improve tx hang detection Felix Fietkau
2022-02-03 13:35 ` [PATCH 3/5] mt76: mt7915: fix/rewrite the dfs state handling logic Felix Fietkau
@ 2022-02-03 13:35 ` Felix Fietkau
2022-02-03 13:36 ` [PATCH 5/5] mt76: mt76x02: use mt76_phy_dfs_state to determine radar detector state Felix Fietkau
3 siblings, 0 replies; 6+ messages in thread
From: Felix Fietkau @ 2022-02-03 13:35 UTC (permalink / raw)
To: linux-wireless
Copy the updated logic from mt7915 to to fix issues in handling DFS radar
detector states
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
.../net/wireless/mediatek/mt76/mt7615/init.c | 1 -
.../net/wireless/mediatek/mt76/mt7615/mac.c | 51 +++++++++++--------
2 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
index a753c7476d31..a06dcbb8c673 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
@@ -552,7 +552,6 @@ void mt7615_init_device(struct mt7615_dev *dev)
dev->pm.stats.last_wake_event = jiffies;
dev->pm.stats.last_doze_event = jiffies;
mt7615_cap_dbdc_disable(dev);
- dev->phy.dfs_state = -1;
#ifdef CONFIG_NL80211_TESTMODE
dev->mt76.test_ops = &mt7615_testmode_ops;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index 2705141402c1..1b350cc1d631 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -2287,44 +2287,51 @@ mt7615_dfs_init_radar_specs(struct mt7615_phy *phy)
int mt7615_dfs_init_radar_detector(struct mt7615_phy *phy)
{
- struct cfg80211_chan_def *chandef = &phy->mt76->chandef;
struct mt7615_dev *dev = phy->dev;
bool ext_phy = phy != &dev->phy;
+ enum mt76_dfs_state dfs_state, prev_state;
int err;
if (is_mt7663(&dev->mt76))
return 0;
- if (dev->mt76.region == NL80211_DFS_UNSET) {
- phy->dfs_state = -1;
- if (phy->rdd_state)
- goto stop;
+ prev_state = phy->mt76->dfs_state;
+ dfs_state = mt76_phy_dfs_state(phy->mt76);
+ if (prev_state == dfs_state)
return 0;
- }
- if (test_bit(MT76_SCANNING, &phy->mt76->state))
- return 0;
-
- if (phy->dfs_state == chandef->chan->dfs_state)
- return 0;
+ if (prev_state == MT_DFS_STATE_UNKNOWN)
+ mt7615_dfs_stop_radar_detector(phy);
- err = mt7615_dfs_init_radar_specs(phy);
- if (err < 0) {
- phy->dfs_state = -1;
+ if (dfs_state == MT_DFS_STATE_DISABLED)
goto stop;
- }
- phy->dfs_state = chandef->chan->dfs_state;
+ if (prev_state <= MT_DFS_STATE_DISABLED) {
+ err = mt7615_dfs_init_radar_specs(phy);
+ if (err < 0)
+ return err;
+
+ err = mt7615_dfs_start_radar_detector(phy);
+ if (err < 0)
+ return err;
- if (chandef->chan->flags & IEEE80211_CHAN_RADAR) {
- if (chandef->chan->dfs_state != NL80211_DFS_AVAILABLE)
- return mt7615_dfs_start_radar_detector(phy);
+ phy->mt76->dfs_state = MT_DFS_STATE_CAC;
+ }
+
+ if (dfs_state == MT_DFS_STATE_CAC)
+ return 0;
- return mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_CAC_END, ext_phy,
- MT_RX_SEL0, 0);
+ err = mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_CAC_END,
+ ext_phy, MT_RX_SEL0, 0);
+ if (err < 0) {
+ phy->mt76->dfs_state = MT_DFS_STATE_UNKNOWN;
+ return err;
}
+ phy->mt76->dfs_state = MT_DFS_STATE_ACTIVE;
+ return 0;
+
stop:
err = mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_NORMAL_START, ext_phy,
MT_RX_SEL0, 0);
@@ -2332,6 +2339,8 @@ int mt7615_dfs_init_radar_detector(struct mt7615_phy *phy)
return err;
mt7615_dfs_stop_radar_detector(phy);
+ phy->mt76->dfs_state = MT_DFS_STATE_DISABLED;
+
return 0;
}
--
2.32.0 (Apple Git-132)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/5] mt76: mt76x02: use mt76_phy_dfs_state to determine radar detector state
2022-02-03 13:35 [PATCH 1/5] mt76x02: improve mac error check/reset reliability Felix Fietkau
` (2 preceding siblings ...)
2022-02-03 13:35 ` [PATCH 4/5] mt76: mt7615: " Felix Fietkau
@ 2022-02-03 13:36 ` Felix Fietkau
3 siblings, 0 replies; 6+ messages in thread
From: Felix Fietkau @ 2022-02-03 13:36 UTC (permalink / raw)
To: linux-wireless
Fixes corner cases in enabling/disabling detector
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c b/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c
index a601350531cd..024a5c0a5a57 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c
@@ -823,10 +823,7 @@ EXPORT_SYMBOL_GPL(mt76x02_phy_dfs_adjust_agc);
void mt76x02_dfs_init_params(struct mt76x02_dev *dev)
{
- struct cfg80211_chan_def *chandef = &dev->mphy.chandef;
-
- if ((chandef->chan->flags & IEEE80211_CHAN_RADAR) &&
- dev->mt76.region != NL80211_DFS_UNSET) {
+ if (mt76_phy_dfs_state(&dev->mphy) > MT_DFS_STATE_DISABLED) {
mt76x02_dfs_init_sw_detector(dev);
mt76x02_dfs_set_bbp_params(dev);
/* enable debug mode */
--
2.32.0 (Apple Git-132)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 3/5] mt76: mt7915: fix/rewrite the dfs state handling logic
2022-02-03 13:35 ` [PATCH 3/5] mt76: mt7915: fix/rewrite the dfs state handling logic Felix Fietkau
@ 2022-02-03 15:13 ` Lorenzo Bianconi
0 siblings, 0 replies; 6+ messages in thread
From: Lorenzo Bianconi @ 2022-02-03 15:13 UTC (permalink / raw)
To: Felix Fietkau; +Cc: linux-wireless
[-- Attachment #1: Type: text/plain, Size: 10273 bytes --]
> Client mode on DFS channels was broken, because the old code was activating
> the DFS detector on radar channels while leaving it in CAC state.
> This was caused by making the decision based on the channel radar flag,
> instead of hw->conf.radar_enabled.
> In order to properly deal with the various corner cases, rip out the state
> handling code and replace it with something that's much easier to reason
> about.
>
> Signed-off-by: Felix Fietkau <nbd@nbd.name>
Tested-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> drivers/net/wireless/mediatek/mt76/mac80211.c | 28 ++++++++++
> drivers/net/wireless/mediatek/mt76/mt76.h | 9 ++++
> .../net/wireless/mediatek/mt76/mt7915/init.c | 7 +--
> .../net/wireless/mediatek/mt76/mt7915/mac.c | 51 +++++++++++--------
> .../net/wireless/mediatek/mt76/mt7915/main.c | 21 --------
> .../net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +-
> .../wireless/mediatek/mt76/mt7915/mt7915.h | 1 -
> 7 files changed, 69 insertions(+), 50 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
> index 148e126b9215..a4bb281a74e6 100644
> --- a/drivers/net/wireless/mediatek/mt76/mac80211.c
> +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
> @@ -823,6 +823,10 @@ void mt76_set_channel(struct mt76_phy *phy)
> wait_event_timeout(dev->tx_wait, !mt76_has_tx_pending(phy), timeout);
> mt76_update_survey(phy);
>
> + if (phy->chandef.chan->center_freq != chandef->chan->center_freq ||
> + phy->chandef.width != chandef->width)
> + phy->dfs_state = MT_DFS_STATE_UNKNOWN;
> +
> phy->chandef = *chandef;
> phy->chan_state = mt76_channel_state(phy, chandef->chan);
>
> @@ -1604,3 +1608,27 @@ void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi,
> wi->worker_stat_count = ei - wi->initial_stat_idx;
> }
> EXPORT_SYMBOL_GPL(mt76_ethtool_worker);
> +
> +enum mt76_dfs_state mt76_phy_dfs_state(struct mt76_phy *phy)
> +{
> + struct ieee80211_hw *hw = phy->hw;
> + struct mt76_dev *dev = phy->dev;
> +
> + if (dev->region == NL80211_DFS_UNSET ||
> + test_bit(MT76_SCANNING, &phy->state))
> + return MT_DFS_STATE_DISABLED;
> +
> + if (!hw->conf.radar_enabled) {
> + if ((hw->conf.flags & IEEE80211_CONF_MONITOR) &&
> + (phy->chandef.chan->flags & IEEE80211_CHAN_RADAR))
> + return MT_DFS_STATE_ACTIVE;
> +
> + return MT_DFS_STATE_DISABLED;
> + }
> +
> + if (phy->chandef.chan->dfs_state != NL80211_DFS_AVAILABLE)
> + return MT_DFS_STATE_CAC;
> +
> + return MT_DFS_STATE_ACTIVE;
> +}
> +EXPORT_SYMBOL_GPL(mt76_phy_dfs_state);
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
> index 43abf0679876..8d5c484eee58 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76.h
> @@ -105,6 +105,13 @@ enum mt76_cipher_type {
> MT_CIPHER_GCMP_256,
> };
>
> +enum mt76_dfs_state {
> + MT_DFS_STATE_UNKNOWN,
> + MT_DFS_STATE_DISABLED,
> + MT_DFS_STATE_CAC,
> + MT_DFS_STATE_ACTIVE,
> +};
> +
> struct mt76_queue_buf {
> dma_addr_t addr;
> u16 len;
> @@ -639,6 +646,7 @@ struct mt76_phy {
> struct ieee80211_channel *main_chan;
>
> struct mt76_channel_state *chan_state;
> + enum mt76_dfs_state dfs_state;
> ktime_t survey_time;
>
> struct mt76_hw_cap cap;
> @@ -1184,6 +1192,7 @@ void mt76_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
> const u8 *mac);
> void mt76_sw_scan_complete(struct ieee80211_hw *hw,
> struct ieee80211_vif *vif);
> +enum mt76_dfs_state mt76_phy_dfs_state(struct mt76_phy *phy);
> int mt76_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
> void *data, int len);
> int mt76_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb,
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
> index e908d56a9e21..705f362b8f7b 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
> @@ -288,7 +288,6 @@ mt7915_regd_notifier(struct wiphy *wiphy,
> struct mt7915_dev *dev = mt7915_hw_dev(hw);
> struct mt76_phy *mphy = hw->priv;
> struct mt7915_phy *phy = mphy->priv;
> - struct cfg80211_chan_def *chandef = &mphy->chandef;
>
> memcpy(dev->mt76.alpha2, request->alpha2, sizeof(dev->mt76.alpha2));
> dev->mt76.region = request->dfs_region;
> @@ -299,9 +298,7 @@ mt7915_regd_notifier(struct wiphy *wiphy,
> mt7915_init_txpower(dev, &mphy->sband_2g.sband);
> mt7915_init_txpower(dev, &mphy->sband_5g.sband);
>
> - if (!(chandef->chan->flags & IEEE80211_CHAN_RADAR))
> - return;
> -
> + mphy->dfs_state = MT_DFS_STATE_UNKNOWN;
> mt7915_dfs_init_radar_detector(phy);
> }
>
> @@ -976,8 +973,6 @@ int mt7915_register_device(struct mt7915_dev *dev)
>
> mt7915_init_wiphy(hw);
>
> - dev->phy.dfs_state = -1;
> -
> #ifdef CONFIG_NL80211_TESTMODE
> dev->mt76.test_ops = &mt7915_testmode_ops;
> #endif
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
> index 88bc4cf0dd79..59f0334ef8d2 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
> @@ -2439,41 +2439,48 @@ mt7915_dfs_init_radar_specs(struct mt7915_phy *phy)
>
> int mt7915_dfs_init_radar_detector(struct mt7915_phy *phy)
> {
> - struct cfg80211_chan_def *chandef = &phy->mt76->chandef;
> struct mt7915_dev *dev = phy->dev;
> bool ext_phy = phy != &dev->phy;
> + enum mt76_dfs_state dfs_state, prev_state;
> int err;
>
> - if (dev->mt76.region == NL80211_DFS_UNSET) {
> - phy->dfs_state = -1;
> - if (phy->rdd_state)
> - goto stop;
> + prev_state = phy->mt76->dfs_state;
> + dfs_state = mt76_phy_dfs_state(phy->mt76);
>
> + if (prev_state == dfs_state)
> return 0;
> - }
>
> - if (test_bit(MT76_SCANNING, &phy->mt76->state))
> - return 0;
> -
> - if (phy->dfs_state == chandef->chan->dfs_state)
> - return 0;
> + if (prev_state == MT_DFS_STATE_UNKNOWN)
> + mt7915_dfs_stop_radar_detector(phy);
>
> - err = mt7915_dfs_init_radar_specs(phy);
> - if (err < 0) {
> - phy->dfs_state = -1;
> + if (dfs_state == MT_DFS_STATE_DISABLED)
> goto stop;
> - }
>
> - phy->dfs_state = chandef->chan->dfs_state;
> + if (prev_state <= MT_DFS_STATE_DISABLED) {
> + err = mt7915_dfs_init_radar_specs(phy);
> + if (err < 0)
> + return err;
> +
> + err = mt7915_dfs_start_radar_detector(phy);
> + if (err < 0)
> + return err;
>
> - if (chandef->chan->flags & IEEE80211_CHAN_RADAR) {
> - if (chandef->chan->dfs_state != NL80211_DFS_AVAILABLE)
> - return mt7915_dfs_start_radar_detector(phy);
> + phy->mt76->dfs_state = MT_DFS_STATE_CAC;
> + }
> +
> + if (dfs_state == MT_DFS_STATE_CAC)
> + return 0;
>
> - return mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_CAC_END,
> - ext_phy, MT_RX_SEL0, 0);
> + err = mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_CAC_END,
> + ext_phy, MT_RX_SEL0, 0);
> + if (err < 0) {
> + phy->mt76->dfs_state = MT_DFS_STATE_UNKNOWN;
> + return err;
> }
>
> + phy->mt76->dfs_state = MT_DFS_STATE_ACTIVE;
> + return 0;
> +
> stop:
> err = mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_NORMAL_START, ext_phy,
> MT_RX_SEL0, 0);
> @@ -2481,6 +2488,8 @@ int mt7915_dfs_init_radar_detector(struct mt7915_phy *phy)
> return err;
>
> mt7915_dfs_stop_radar_detector(phy);
> + phy->mt76->dfs_state = MT_DFS_STATE_DISABLED;
> +
> return 0;
> }
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
> index 989298ffffbc..dee7fc011cdf 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
> @@ -302,26 +302,6 @@ static void mt7915_remove_interface(struct ieee80211_hw *hw,
> mt76_packet_id_flush(&dev->mt76, &msta->wcid);
> }
>
> -static void mt7915_init_dfs_state(struct mt7915_phy *phy)
> -{
> - struct mt76_phy *mphy = phy->mt76;
> - struct ieee80211_hw *hw = mphy->hw;
> - struct cfg80211_chan_def *chandef = &hw->conf.chandef;
> -
> - if (hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
> - return;
> -
> - if (!(chandef->chan->flags & IEEE80211_CHAN_RADAR) &&
> - !(mphy->chandef.chan->flags & IEEE80211_CHAN_RADAR))
> - return;
> -
> - if (mphy->chandef.chan->center_freq == chandef->chan->center_freq &&
> - mphy->chandef.width == chandef->width)
> - return;
> -
> - phy->dfs_state = -1;
> -}
> -
> int mt7915_set_channel(struct mt7915_phy *phy)
> {
> struct mt7915_dev *dev = phy->dev;
> @@ -332,7 +312,6 @@ int mt7915_set_channel(struct mt7915_phy *phy)
> mutex_lock(&dev->mt76.mutex);
> set_bit(MT76_RESET, &phy->mt76->state);
>
> - mt7915_init_dfs_state(phy);
> mt76_set_channel(phy->mt76);
>
> if (dev->flash_mode) {
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> index e8c68e47b613..462c7da93b60 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> @@ -2786,7 +2786,7 @@ int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd)
>
> if (phy->mt76->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
> req.switch_reason = CH_SWITCH_SCAN_BYPASS_DPD;
> - else if ((chandef->chan->flags & IEEE80211_CHAN_RADAR) &&
> + else if (phy->mt76->hw->conf.radar_enabled &&
> chandef->chan->dfs_state != NL80211_DFS_AVAILABLE)
> req.switch_reason = CH_SWITCH_DFS;
> else
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> index bc3a3dcdb3a0..96653d64d161 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> @@ -230,7 +230,6 @@ struct mt7915_phy {
> u8 slottime;
>
> u8 rdd_state;
> - int dfs_state;
>
> u32 rx_ampdu_ts;
> u32 ampdu_ref;
> --
> 2.32.0 (Apple Git-132)
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-02-03 15:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-03 13:35 [PATCH 1/5] mt76x02: improve mac error check/reset reliability Felix Fietkau
2022-02-03 13:35 ` [PATCH 2/5] mt76: mt76x02: improve tx hang detection Felix Fietkau
2022-02-03 13:35 ` [PATCH 3/5] mt76: mt7915: fix/rewrite the dfs state handling logic Felix Fietkau
2022-02-03 15:13 ` Lorenzo Bianconi
2022-02-03 13:35 ` [PATCH 4/5] mt76: mt7615: " Felix Fietkau
2022-02-03 13:36 ` [PATCH 5/5] mt76: mt76x02: use mt76_phy_dfs_state to determine radar detector state Felix Fietkau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).