Skip to content

Commit

Permalink
fixup! mt76 mt7915: restart target on MCU timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
blocktrron committed Mar 3, 2024
1 parent e61277c commit 9256534
Showing 1 changed file with 18 additions and 6 deletions.
24 changes: 18 additions & 6 deletions patches/openwrt/0009-mt7915-restart-target-on-MCU-timeout.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,22 @@ Signed-off-by: David Bauer <[email protected]>

diff --git a/package/kernel/mt76/patches/100-mt7915-trigger-reset-upon-MCU-timeout.patch b/package/kernel/mt76/patches/100-mt7915-trigger-reset-upon-MCU-timeout.patch
new file mode 100644
index 0000000000000000000000000000000000000000..93a1807314df519749cf13da4e7e69be9ac145e3
index 0000000000000000000000000000000000000000..e6087c1138c6b73dda8c71f83d5b8147364d8e2e
--- /dev/null
+++ b/package/kernel/mt76/patches/100-mt7915-trigger-reset-upon-MCU-timeout.patch
@@ -0,0 +1,32 @@
+From 031d12d6f6a37d53ba0d8f26e0103d70a925d4eb Mon Sep 17 00:00:00 2001
@@ -0,0 +1,44 @@
+From df26ec38c89eb225f6404ceaa1910022feae1132 Mon Sep 17 00:00:00 2001
+From: David Bauer <[email protected]>
+Date: Sat, 2 Mar 2024 21:23:06 +0100
+Subject: [PATCH] mt7915: trigger reset upon MCU timeout
+
+Signed-off-by: David Bauer <[email protected]>
+---
+ mt7915/mcu.c | 3 +++
+ 1 file changed, 3 insertions(+)
+ mt7915/mcu.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/mt7915/mcu.c b/mt7915/mcu.c
+index 8224f8be..590a8b24 100644
+index 8224f8be..cc174cf7 100644
+--- a/mt7915/mcu.c
++++ b/mt7915/mcu.c
+@@ -157,12 +157,15 @@ static int
Expand All @@ -39,6 +40,17 @@ index 0000000000000000000000000000000000000000..93a1807314df519749cf13da4e7e69be
+ return -ETIMEDOUT;
+ }
+
+@@ -193,6 +196,10 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
+ enum mt76_mcuq_id qid;
+ int ret;
+
++ /* Check if restart is pending */
++ if (dev->recovery.restart)
++ return -EBUSY;
++
+ ret = mt76_connac2_mcu_fill_message(mdev, skb, cmd, wait_seq);
+ if (ret)
+ return ret;
+--
+2.43.0
+

0 comments on commit 9256534

Please sign in to comment.