mirror of
https://github.com/outbackdingo/mt76.git
synced 2026-10-24 13:26:48 +00:00
mt76x2: dfs: remove unnecessary mt76x2_dfs_chan_state() routine
Remove chennel busy-idle logic since it is not used on mt7612-mt7662 based devices Signed-off-by: Lorenzo Bianconi <[email protected]>
This commit is contained in:
committed by
Felix Fietkau
parent
85d12fea1a
commit
36ad8c3df2
@@ -295,32 +295,6 @@ static bool mt76x2_dfs_check_hw_pulse(struct mt76x2_dev *dev,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void mt76x2_dfs_chan_state(struct mt76x2_dev *dev)
|
||||
{
|
||||
u64 ch_active_time, ch_busy_time;
|
||||
u32 ch_active_delta, ch_busy_delta;
|
||||
struct mt76_channel_state *state;
|
||||
struct cfg80211_chan_def *chandef = &dev->mt76.chandef;
|
||||
struct mt76x2_dfs_pattern_detector *dfs_pd = &dev->dfs_pd;
|
||||
|
||||
mt76x2_update_channel(&dev->mt76);
|
||||
state = mt76_channel_state(&dev->mt76, chandef->chan);
|
||||
|
||||
spin_lock_bh(&dev->mt76.cc_lock);
|
||||
ch_active_time = state->cc_active;
|
||||
ch_busy_time = state->cc_busy;
|
||||
spin_unlock_bh(&dev->mt76.cc_lock);
|
||||
|
||||
ch_active_delta = ch_active_time - dfs_pd->ch_active_time;
|
||||
ch_busy_delta = ch_busy_time - dfs_pd->ch_busy_time;
|
||||
|
||||
dfs_pd->ch_busy = (MT_DFS_FRAC(ch_busy_delta, ch_active_delta) >
|
||||
MT_DFS_FRAC(80, 100));
|
||||
|
||||
dfs_pd->ch_active_time = ch_active_time;
|
||||
dfs_pd->ch_busy_time = ch_busy_time;
|
||||
}
|
||||
|
||||
void mt76x2_dfs_tasklet(unsigned long arg)
|
||||
{
|
||||
struct mt76x2_dev *dev = (struct mt76x2_dev *)arg;
|
||||
@@ -331,14 +305,6 @@ void mt76x2_dfs_tasklet(unsigned long arg)
|
||||
if (test_bit(MT76_SCANNING, &dev->mt76.state))
|
||||
goto out;
|
||||
|
||||
if (++dfs_pd->ch_state_cnt > MT_DFS_CH_STATE_INTERVAL) {
|
||||
dfs_pd->ch_state_cnt = 0;
|
||||
mt76x2_dfs_chan_state(dev);
|
||||
}
|
||||
|
||||
if (dfs_pd->ch_busy)
|
||||
goto out;
|
||||
|
||||
engine_mask = mt76_rr(dev, MT_BBP(DFS, 1));
|
||||
if (!(engine_mask & 0xf))
|
||||
goto out;
|
||||
|
||||
@@ -21,13 +21,8 @@
|
||||
#include <linux/nl80211.h>
|
||||
|
||||
#define MT_DFS_GP_INTERVAL (10 << 4) /* 64 us unit */
|
||||
#define MT_DFS_CH_STATE_INTERVAL 20
|
||||
#define MT_DFS_NUM_ENGINES 4
|
||||
|
||||
/* scaled fraction values */
|
||||
#define MT_DFS_SCALE 16
|
||||
#define MT_DFS_FRAC(val, div) (((val) << MT_DFS_SCALE) / div)
|
||||
|
||||
/* bbp params */
|
||||
#define MT_DFS_SYM_ROUND 0
|
||||
#define MT_DFS_DELTA_DELAY 2
|
||||
@@ -74,13 +69,7 @@ struct mt76x2_dfs_pattern_detector {
|
||||
u8 chirp_pulse_cnt;
|
||||
u32 chirp_pulse_ts;
|
||||
|
||||
u16 ch_state_cnt;
|
||||
u64 ch_active_time;
|
||||
u64 ch_busy_time;
|
||||
bool ch_busy;
|
||||
|
||||
struct mt76x2_dfs_engine_stats stats[MT_DFS_NUM_ENGINES];
|
||||
|
||||
struct tasklet_struct dfs_tasklet;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user