openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mt76: mt7615: wake device before accessing regmap in debugfs 

Make sure the device is in full-power before reading regs in debugfs

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Lorenzo Bianconi 2020-07-03 10:15:44 +02:00 committed by Felix Fietkau
parent adfd5112c8
commit ea4906c4be
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c
View File

@ -6,11 +6,16 @@ static int
mt7615_radar_pattern_set(void *data, u64 val) mt7615_radar_pattern_set(void *data, u64 val)
{ {
struct mt7615_dev *dev = data; struct mt7615_dev *dev = data;
int err;
if (!mt7615_wait_for_mcu_init(dev)) if (!mt7615_wait_for_mcu_init(dev))
return 0; return 0;
return mt7615_mcu_rdd_send_pattern(dev); mt7615_mutex_acquire(dev);
err = mt7615_mcu_rdd_send_pattern(dev);
mt7615_mutex_release(dev);
return err;
} }
DEFINE_DEBUGFS_ATTRIBUTE(fops_radar_pattern, NULL, DEFINE_DEBUGFS_ATTRIBUTE(fops_radar_pattern, NULL,
@ -84,7 +89,10 @@ mt7615_fw_debug_set(void *data, u64 val)
return 0; return 0;
dev->fw_debug = val; dev->fw_debug = val;
mt7615_mutex_acquire(dev);
mt7615_mcu_fw_log_2_host(dev, dev->fw_debug ? 2 : 0); mt7615_mcu_fw_log_2_host(dev, dev->fw_debug ? 2 : 0);
mt7615_mutex_release(dev);
return 0; return 0;
} }
@ -111,6 +119,8 @@ mt7615_reset_test_set(void *data, u64 val)
if (!mt7615_wait_for_mcu_init(dev)) if (!mt7615_wait_for_mcu_init(dev))
return 0; return 0;
mt7615_mutex_acquire(dev);
skb = alloc_skb(1, GFP_KERNEL); skb = alloc_skb(1, GFP_KERNEL);
if (!skb) if (!skb)
return -ENOMEM; return -ENOMEM;
@ -118,6 +128,8 @@ mt7615_reset_test_set(void *data, u64 val)
skb_put(skb, 1); skb_put(skb, 1);
mt76_tx_queue_skb_raw(dev, 0, skb, 0); mt76_tx_queue_skb_raw(dev, 0, skb, 0);
mt7615_mutex_release(dev);
return 0; return 0;
} }
@ -167,9 +179,13 @@ mt7615_ampdu_stat_read(struct seq_file *file, void *data)
{ {
struct mt7615_dev *dev = file->private; struct mt7615_dev *dev = file->private;
mt7615_mutex_acquire(dev);
mt7615_ampdu_stat_read_phy(&dev->phy, file); mt7615_ampdu_stat_read_phy(&dev->phy, file);
mt7615_ampdu_stat_read_phy(mt7615_ext_phy(dev), file); mt7615_ampdu_stat_read_phy(mt7615_ext_phy(dev), file);
mt7615_mutex_release(dev);
return 0; return 0;
} }
@ -221,7 +237,10 @@ static int mt7615_read_temperature(struct seq_file *s, void *data)
return 0; return 0;
/* cpu */ /* cpu */
mt7615_mutex_acquire(dev);
temp = mt7615_mcu_get_temperature(dev, 0); temp = mt7615_mcu_get_temperature(dev, 0);
mt7615_mutex_release(dev);
seq_printf(s, "Temperature: %d\n", temp); seq_printf(s, "Temperature: %d\n", temp);
return 0; return 0;
@ -233,6 +252,8 @@ mt7615_queues_acq(struct seq_file *s, void *data)
struct mt7615_dev *dev = dev_get_drvdata(s->private); struct mt7615_dev *dev = dev_get_drvdata(s->private);
int i; int i;
mt7615_mutex_acquire(dev);
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
int j, wmm_idx = i % MT7615_MAX_WMM_SETS; int j, wmm_idx = i % MT7615_MAX_WMM_SETS;
int acs = i / MT7615_MAX_WMM_SETS; int acs = i / MT7615_MAX_WMM_SETS;
@ -253,6 +274,8 @@ mt7615_queues_acq(struct seq_file *s, void *data)
seq_printf(s, "AC%d%d: queued=%d\n", wmm_idx, acs, qlen); seq_printf(s, "AC%d%d: queued=%d\n", wmm_idx, acs, qlen);
} }
mt7615_mutex_release(dev);
return 0; return 0;
} }