Skip to content

Commit 672662f

Browse files
ryderlee1110nbd168
ryderlee1110
authored and
nbd168
committed
wifi: mt76: mt7996: add full system reset knobs into debugfs
Add testing points into debugfs to trigger firmware assert and enable full system recovery. Also rename knob "fw_ser" to a clear-cut name "sys_recovery". Co-developed-by: Bo Jiao <[email protected]> Signed-off-by: Bo Jiao <[email protected]> Signed-off-by: Ryder Lee <[email protected]> Signed-off-by: Felix Fietkau <[email protected]>
1 parent 27015b6 commit 672662f

File tree

6 files changed

+178
-30
lines changed

6 files changed

+178
-30
lines changed

‎drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,6 +1221,7 @@ enum {
12211221
MCU_UNI_CMD_VOW = 0x37,
12221222
MCU_UNI_CMD_RRO = 0x57,
12231223
MCU_UNI_CMD_OFFCH_SCAN_CTRL = 0x58,
1224+
MCU_UNI_CMD_ASSERT_DUMP = 0x6f,
12241225
};
12251226

12261227
enum {

‎drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c‎

Lines changed: 134 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ DEFINE_DEBUGFS_ATTRIBUTE(fops_implicit_txbf, mt7996_implicit_txbf_get,
4848

4949
/* test knob of system error recovery */
5050
static ssize_t
51-
mt7996_fw_ser_set(struct file *file, const char __user *user_buf,
52-
size_t count, loff_t *ppos)
51+
mt7996_sys_recovery_set(struct file *file, const char __user *user_buf,
52+
size_t count, loff_t *ppos)
5353
{
5454
struct mt7996_phy *phy = file->private_data;
5555
struct mt7996_dev *dev = phy->dev;
56-
u8 band_idx = phy->mt76->band_idx;
56+
bool band = phy->mt76->band_idx;
5757
char buf[16];
5858
int ret = 0;
5959
u16 val;
@@ -73,17 +73,47 @@ mt7996_fw_ser_set(struct file *file, const char __user *user_buf,
7373
return -EINVAL;
7474

7575
switch (val) {
76-
case SER_SET_RECOVER_L1:
77-
case SER_SET_RECOVER_L2:
78-
case SER_SET_RECOVER_L3_RX_ABORT:
79-
case SER_SET_RECOVER_L3_TX_ABORT:
80-
case SER_SET_RECOVER_L3_TX_DISABLE:
81-
case SER_SET_RECOVER_L3_BF:
82-
ret = mt7996_mcu_set_ser(dev, SER_ENABLE, BIT(val), band_idx);
76+
/*
77+
* 0: grab firmware current SER state.
78+
* 1: trigger & enable system error L1 recovery.
79+
* 2: trigger & enable system error L2 recovery.
80+
* 3: trigger & enable system error L3 rx abort.
81+
* 4: trigger & enable system error L3 tx abort
82+
* 5: trigger & enable system error L3 tx disable.
83+
* 6: trigger & enable system error L3 bf recovery.
84+
* 7: trigger & enable system error L4 mdp recovery.
85+
* 8: trigger & enable system error full recovery.
86+
* 9: trigger firmware crash.
87+
*/
88+
case UNI_CMD_SER_QUERY:
89+
ret = mt7996_mcu_set_ser(dev, UNI_CMD_SER_QUERY, 0, band);
90+
break;
91+
case UNI_CMD_SER_SET_RECOVER_L1:
92+
case UNI_CMD_SER_SET_RECOVER_L2:
93+
case UNI_CMD_SER_SET_RECOVER_L3_RX_ABORT:
94+
case UNI_CMD_SER_SET_RECOVER_L3_TX_ABORT:
95+
case UNI_CMD_SER_SET_RECOVER_L3_TX_DISABLE:
96+
case UNI_CMD_SER_SET_RECOVER_L3_BF:
97+
case UNI_CMD_SER_SET_RECOVER_L4_MDP:
98+
ret = mt7996_mcu_set_ser(dev, UNI_CMD_SER_SET, BIT(val), band);
8399
if (ret)
84100
return ret;
85101

86-
ret = mt7996_mcu_set_ser(dev, SER_RECOVER, val, band_idx);
102+
ret = mt7996_mcu_set_ser(dev, UNI_CMD_SER_TRIGGER, val, band);
103+
break;
104+
105+
/* enable full chip reset */
106+
case UNI_CMD_SER_SET_RECOVER_FULL:
107+
mt76_set(dev, MT_WFDMA0_MCU_HOST_INT_ENA, MT_MCU_CMD_WDT_MASK);
108+
dev->recovery.state |= MT_MCU_CMD_WDT_MASK;
109+
mt7996_reset(dev);
110+
break;
111+
112+
/* WARNING: trigger firmware crash */
113+
case UNI_CMD_SER_SET_SYSTEM_ASSERT:
114+
ret = mt7996_mcu_trigger_assert(dev);
115+
if (ret)
116+
return ret;
87117
break;
88118
default:
89119
break;
@@ -92,9 +122,97 @@ mt7996_fw_ser_set(struct file *file, const char __user *user_buf,
92122
return ret ? ret : count;
93123
}
94124

95-
static const struct file_operations mt7996_fw_ser_ops = {
96-
.write = mt7996_fw_ser_set,
97-
/* TODO: ser read */
125+
static ssize_t
126+
mt7996_sys_recovery_get(struct file *file, char __user *user_buf,
127+
size_t count, loff_t *ppos)
128+
{
129+
struct mt7996_phy *phy = file->private_data;
130+
struct mt7996_dev *dev = phy->dev;
131+
char *buff;
132+
int desc = 0;
133+
ssize_t ret;
134+
static const size_t bufsz = 1024;
135+
136+
buff = kmalloc(bufsz, GFP_KERNEL);
137+
if (!buff)
138+
return -ENOMEM;
139+
140+
/* HELP */
141+
desc += scnprintf(buff + desc, bufsz - desc,
142+
"Please echo the correct value ...\n");
143+
desc += scnprintf(buff + desc, bufsz - desc,
144+
"0: grab firmware transient SER state\n");
145+
desc += scnprintf(buff + desc, bufsz - desc,
146+
"1: trigger system error L1 recovery\n");
147+
desc += scnprintf(buff + desc, bufsz - desc,
148+
"2: trigger system error L2 recovery\n");
149+
desc += scnprintf(buff + desc, bufsz - desc,
150+
"3: trigger system error L3 rx abort\n");
151+
desc += scnprintf(buff + desc, bufsz - desc,
152+
"4: trigger system error L3 tx abort\n");
153+
desc += scnprintf(buff + desc, bufsz - desc,
154+
"5: trigger system error L3 tx disable\n");
155+
desc += scnprintf(buff + desc, bufsz - desc,
156+
"6: trigger system error L3 bf recovery\n");
157+
desc += scnprintf(buff + desc, bufsz - desc,
158+
"7: trigger system error L4 mdp recovery\n");
159+
desc += scnprintf(buff + desc, bufsz - desc,
160+
"8: trigger system error full recovery\n");
161+
desc += scnprintf(buff + desc, bufsz - desc,
162+
"9: trigger firmware crash\n");
163+
164+
/* SER statistics */
165+
desc += scnprintf(buff + desc, bufsz - desc,
166+
"\nlet's dump firmware SER statistics...\n");
167+
desc += scnprintf(buff + desc, bufsz - desc,
168+
"::E R , SER_STATUS = 0x%08x\n",
169+
mt76_rr(dev, MT_SWDEF_SER_STATS));
170+
desc += scnprintf(buff + desc, bufsz - desc,
171+
"::E R , SER_PLE_ERR = 0x%08x\n",
172+
mt76_rr(dev, MT_SWDEF_PLE_STATS));
173+
desc += scnprintf(buff + desc, bufsz - desc,
174+
"::E R , SER_PLE_ERR_1 = 0x%08x\n",
175+
mt76_rr(dev, MT_SWDEF_PLE1_STATS));
176+
desc += scnprintf(buff + desc, bufsz - desc,
177+
"::E R , SER_PLE_ERR_AMSDU = 0x%08x\n",
178+
mt76_rr(dev, MT_SWDEF_PLE_AMSDU_STATS));
179+
desc += scnprintf(buff + desc, bufsz - desc,
180+
"::E R , SER_PSE_ERR = 0x%08x\n",
181+
mt76_rr(dev, MT_SWDEF_PSE_STATS));
182+
desc += scnprintf(buff + desc, bufsz - desc,
183+
"::E R , SER_PSE_ERR_1 = 0x%08x\n",
184+
mt76_rr(dev, MT_SWDEF_PSE1_STATS));
185+
desc += scnprintf(buff + desc, bufsz - desc,
186+
"::E R , SER_LMAC_WISR6_B0 = 0x%08x\n",
187+
mt76_rr(dev, MT_SWDEF_LAMC_WISR6_BN0_STATS));
188+
desc += scnprintf(buff + desc, bufsz - desc,
189+
"::E R , SER_LMAC_WISR6_B1 = 0x%08x\n",
190+
mt76_rr(dev, MT_SWDEF_LAMC_WISR6_BN1_STATS));
191+
desc += scnprintf(buff + desc, bufsz - desc,
192+
"::E R , SER_LMAC_WISR6_B2 = 0x%08x\n",
193+
mt76_rr(dev, MT_SWDEF_LAMC_WISR6_BN2_STATS));
194+
desc += scnprintf(buff + desc, bufsz - desc,
195+
"::E R , SER_LMAC_WISR7_B0 = 0x%08x\n",
196+
mt76_rr(dev, MT_SWDEF_LAMC_WISR7_BN0_STATS));
197+
desc += scnprintf(buff + desc, bufsz - desc,
198+
"::E R , SER_LMAC_WISR7_B1 = 0x%08x\n",
199+
mt76_rr(dev, MT_SWDEF_LAMC_WISR7_BN1_STATS));
200+
desc += scnprintf(buff + desc, bufsz - desc,
201+
"::E R , SER_LMAC_WISR7_B2 = 0x%08x\n",
202+
mt76_rr(dev, MT_SWDEF_LAMC_WISR7_BN2_STATS));
203+
desc += scnprintf(buff + desc, bufsz - desc,
204+
"\nSYS_RESET_COUNT: WM %d, WA %d\n",
205+
dev->recovery.wm_reset_count,
206+
dev->recovery.wa_reset_count);
207+
208+
ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);
209+
kfree(buff);
210+
return ret;
211+
}
212+
213+
static const struct file_operations mt7996_sys_recovery_ops = {
214+
.write = mt7996_sys_recovery_set,
215+
.read = mt7996_sys_recovery_get,
98216
.open = simple_open,
99217
.llseek = default_llseek,
100218
};
@@ -674,6 +792,8 @@ int mt7996_init_debugfs(struct mt7996_phy *phy)
674792
debugfs_create_file("xmit-queues", 0400, dir, phy,
675793
&mt7996_xmit_queues_fops);
676794
debugfs_create_file("tx_stats", 0400, dir, phy, &mt7996_tx_stats_fops);
795+
debugfs_create_file("sys_recovery", 0600, dir, phy,
796+
&mt7996_sys_recovery_ops);
677797
debugfs_create_file("fw_debug_wm", 0600, dir, dev, &fops_fw_debug_wm);
678798
debugfs_create_file("fw_debug_wa", 0600, dir, dev, &fops_fw_debug_wa);
679799
debugfs_create_file("fw_debug_bin", 0600, dir, dev, &fops_fw_debug_bin);
@@ -684,7 +804,6 @@ int mt7996_init_debugfs(struct mt7996_phy *phy)
684804
&fops_implicit_txbf);
685805
debugfs_create_devm_seqfile(dev->mt76.dev, "twt_stats", dir,
686806
mt7996_twt_stats);
687-
debugfs_create_file("fw_ser", 0600, dir, phy, &mt7996_fw_ser_ops);
688807
debugfs_create_file("rf_regval", 0600, dir, dev, &fops_rf_regval);
689808

690809
if (phy->mt76->cap.has_5ghz) {

‎drivers/net/wireless/mediatek/mt76/mt7996/mcu.c‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3615,6 +3615,22 @@ int mt7996_mcu_rf_regval(struct mt7996_dev *dev, u32 regidx, u32 *val, bool set)
36153615
return 0;
36163616
}
36173617

3618+
int mt7996_mcu_trigger_assert(struct mt7996_dev *dev)
3619+
{
3620+
struct {
3621+
__le16 tag;
3622+
__le16 len;
3623+
u8 enable;
3624+
u8 rsv[3];
3625+
} __packed req = {
3626+
.len = cpu_to_le16(sizeof(req) - 4),
3627+
.enable = true,
3628+
};
3629+
3630+
return mt76_mcu_send_msg(&dev->mt76, MCU_WM_UNI_CMD(ASSERT_DUMP),
3631+
&req, sizeof(req), false);
3632+
}
3633+
36183634
int mt7996_mcu_set_rro(struct mt7996_dev *dev, u16 tag, u8 val)
36193635
{
36203636
struct {

‎drivers/net/wireless/mediatek/mt76/mt7996/mcu.h‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -648,23 +648,21 @@ enum {
648648
};
649649

650650
enum {
651-
UNI_CMD_SER_QUERY = 0x0,
652-
UNI_CMD_SER_SET = 0x2,
653-
UNI_CMD_SER_TRIGGER = 0x3,
654-
};
655-
656-
enum {
657-
SER_QUERY,
651+
UNI_CMD_SER_QUERY,
658652
/* recovery */
659-
SER_SET_RECOVER_L1,
660-
SER_SET_RECOVER_L2,
661-
SER_SET_RECOVER_L3_RX_ABORT,
662-
SER_SET_RECOVER_L3_TX_ABORT,
663-
SER_SET_RECOVER_L3_TX_DISABLE,
664-
SER_SET_RECOVER_L3_BF,
653+
UNI_CMD_SER_SET_RECOVER_L1,
654+
UNI_CMD_SER_SET_RECOVER_L2,
655+
UNI_CMD_SER_SET_RECOVER_L3_RX_ABORT,
656+
UNI_CMD_SER_SET_RECOVER_L3_TX_ABORT,
657+
UNI_CMD_SER_SET_RECOVER_L3_TX_DISABLE,
658+
UNI_CMD_SER_SET_RECOVER_L3_BF,
659+
UNI_CMD_SER_SET_RECOVER_L4_MDP,
660+
UNI_CMD_SER_SET_RECOVER_FULL,
661+
UNI_CMD_SER_SET_SYSTEM_ASSERT,
665662
/* action */
666-
SER_ENABLE = 2,
667-
SER_RECOVER
663+
UNI_CMD_SER_ENABLE = 1,
664+
UNI_CMD_SER_SET,
665+
UNI_CMD_SER_TRIGGER
668666
};
669667

670668
enum {

‎drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@ int mt7996_mcu_set_rro(struct mt7996_dev *dev, u16 tag, u8 val);
441441
int mt7996_mcu_wa_cmd(struct mt7996_dev *dev, int cmd, u32 a1, u32 a2, u32 a3);
442442
int mt7996_mcu_fw_log_2_host(struct mt7996_dev *dev, u8 type, u8 ctrl);
443443
int mt7996_mcu_fw_dbg_ctrl(struct mt7996_dev *dev, u32 module, u8 level);
444+
int mt7996_mcu_trigger_assert(struct mt7996_dev *dev);
444445
void mt7996_mcu_rx_event(struct mt7996_dev *dev, struct sk_buff *skb);
445446
void mt7996_mcu_exit(struct mt7996_dev *dev);
446447

‎drivers/net/wireless/mediatek/mt76/mt7996/regs.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,19 @@ enum base_rev {
480480
#define MT_SWDEF_MODE MT_SWDEF(0x3c)
481481
#define MT_SWDEF_NORMAL_MODE 0
482482

483+
#define MT_SWDEF_SER_STATS MT_SWDEF(0x040)
484+
#define MT_SWDEF_PLE_STATS MT_SWDEF(0x044)
485+
#define MT_SWDEF_PLE1_STATS MT_SWDEF(0x048)
486+
#define MT_SWDEF_PLE_AMSDU_STATS MT_SWDEF(0x04c)
487+
#define MT_SWDEF_PSE_STATS MT_SWDEF(0x050)
488+
#define MT_SWDEF_PSE1_STATS MT_SWDEF(0x054)
489+
#define MT_SWDEF_LAMC_WISR6_BN0_STATS MT_SWDEF(0x058)
490+
#define MT_SWDEF_LAMC_WISR6_BN1_STATS MT_SWDEF(0x05c)
491+
#define MT_SWDEF_LAMC_WISR6_BN2_STATS MT_SWDEF(0x060)
492+
#define MT_SWDEF_LAMC_WISR7_BN0_STATS MT_SWDEF(0x064)
493+
#define MT_SWDEF_LAMC_WISR7_BN1_STATS MT_SWDEF(0x068)
494+
#define MT_SWDEF_LAMC_WISR7_BN2_STATS MT_SWDEF(0x06c)
495+
483496
/* LED */
484497
#define MT_LED_TOP_BASE 0x18013000
485498
#define MT_LED_PHYS(_n) (MT_LED_TOP_BASE + (_n))

0 commit comments

Comments
 (0)