Skip to contentSkip to conversation

arm64: dts: mt8195-cherry-tomato: change watchdog reset boot flow

PATCH Applied Hsin-Te Yuan 2 participants 5 messages Jan 24, 2024 – Feb 19, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 arm64: dts: mt8195-cherry-tomato: change watchdog reset boot flow

From: Hsin-Te Yuan <[email protected]>

The external output reset signal was originally disabled and sent from firmware. However, an unfixed bug in the firmware on tomato prevents the signal from being sent, causing the device to fail to boot. To fix this, enable external output reset signal to allow the device to reboot normally.

Fixes 5eb2e303ec6b ("arm64: dts: mediatek: Introduce MT8195 Cherry platform's Tomato")

---
Changes in v3:
- Add Fixes tag

Changes in v2:
- Limit the effect only on tomato.

---
 arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts | 4 ++++
 arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts | 4 ++++
 arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts | 4 ++++
 3 files changed, 12 insertions(+)
arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts +4 -0
index 2d5e8f371b6de..a82d716f10d44 100644
@@ -23,3 +23,7 @@ &sound {
 &ts_10 {
 	status = "okay";
 };
+
+&watchdog {
+	/delete-property/ mediatek,disable-extrst;
+};
arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts +4 -0
index 2586c32ce6e6f..2fe20e0dad836 100644
@@ -43,3 +43,7 @@ &sound {
 &ts_10 {
 	status = "okay";
 };
+
+&watchdog {
+	/delete-property/ mediatek,disable-extrst;
+};
arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts +4 -0
index f54f9477b99da..dd294ca98194c 100644
@@ -44,3 +44,7 @@ &sound {
 &ts_10 {
 	status = "okay";
 };
+
+&watchdog {
+	/delete-property/ mediatek,disable-extrst;
+};

---
base-commit: 64b50fcb03649ca7f0d762a50e7a3484cfc1d586
change-id: 20230818-send-upstream-e91e615a893c

Best regards,

Signature · 1 line
Hsin-Te Yuan <[email protected]>
maintainer Reviewed-by on v3 1/1
#1 lore raw

Il 24/01/24 08:51, Hsin-Te Yuan ha scritto:

Quoted 10 lines

From: Hsin-Te Yuan <[email protected]>

The external output reset signal was originally disabled and sent from firmware. However, an unfixed bug in the firmware on tomato prevents the signal from being sent, causing the device to fail to boot. To fix this, enable external output reset signal to allow the device to reboot normally.

Fixes 5eb2e303ec6b ("arm64: dts: mediatek: Introduce MT8195 Cherry platform's Tomato")

Can't trigger the bug, but also this commit gives no side effects, so:

Quoted 54 lines

---
Changes in v3:
- Add Fixes tag

Changes in v2:
- Limit the effect only on tomato.

---
  arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts | 4 ++++
  arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts | 4 ++++
  arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts | 4 ++++
  3 files changed, 12 insertions(+)
arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts +4 -0
index 2d5e8f371b6de..a82d716f10d44 100644
@@ -23,3 +23,7 @@ &sound {
  &ts_10 {
  	status = "okay";
  };
+
+&watchdog {
+	/delete-property/ mediatek,disable-extrst;
+};
arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts +4 -0
index 2586c32ce6e6f..2fe20e0dad836 100644
@@ -43,3 +43,7 @@ &sound {
  &ts_10 {
  	status = "okay";
  };
+
+&watchdog {
+	/delete-property/ mediatek,disable-extrst;
+};
arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts +4 -1
index f54f9477b99da..dd294ca98194c 100644
@@ -44,3 +44,7 @@ &sound {
  &ts_10 {
  	status = "okay";
  };
+
+&watchdog {
+	/delete-property/ mediatek,disable-extrst;
+};
 
---

base-commit: 64b50fcb03649ca7f0d762a50e7a3484cfc1d586
change-id: 20230818-send-upstream-e91e615a893c

Best regards,

#2 lore raw

Hi AngeloGioacchino,

This bug can be triggered by stopping watchdog daemon and running sleep 60 > /dev/watchdog.

Regards,
Hsin-Te

Quoted 73 lines · AngeloGioacchino Del Regno

Il 24/01/24 08:51, Hsin-Te Yuan ha scritto:

Quoted 10 lines

From: Hsin-Te Yuan <[email protected]>

The external output reset signal was originally disabled and sent from firmware. However, an unfixed bug in the firmware on tomato prevents the signal from being sent, causing the device to fail to boot. To fix this, enable external output reset signal to allow the device to reboot normally.

Fixes 5eb2e303ec6b ("arm64: dts: mediatek: Introduce MT8195 Cherry platform's Tomato")

Can't trigger the bug, but also this commit gives no side effects, so:

Quoted 54 lines

---
Changes in v3:
- Add Fixes tag

Changes in v2:
- Limit the effect only on tomato.

---
  arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts | 4 ++++
  arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts | 4 ++++
  arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts | 4 ++++
  3 files changed, 12 insertions(+)
arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts +4 -0
index 2d5e8f371b6de..a82d716f10d44 100644
@@ -23,3 +23,7 @@ &sound {
  &ts_10 {
      status = "okay";
  };
+
+&watchdog {
+     /delete-property/ mediatek,disable-extrst;
+};
arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts +4 -0
index 2586c32ce6e6f..2fe20e0dad836 100644
@@ -43,3 +43,7 @@ &sound {
  &ts_10 {
      status = "okay";
  };
+
+&watchdog {
+     /delete-property/ mediatek,disable-extrst;
+};
arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts +4 -1
index f54f9477b99da..dd294ca98194c 100644
@@ -44,3 +44,7 @@ &sound {
  &ts_10 {
      status = "okay";
  };
+
+&watchdog {
+     /delete-property/ mediatek,disable-extrst;
+};
 
---

base-commit: 64b50fcb03649ca7f0d762a50e7a3484cfc1d586
change-id: 20230818-send-upstream-e91e615a893c

Best regards,

#3 lore raw

Hello AngeloGioacchino,

I noticed that this patch does not seem to have been landed yet. Please let me know if there are any issues.

Thank you,
Hsin-Te

Quoted 86 lines · Hsin-Te Yuan

Hi AngeloGioacchino,

This bug can be triggered by stopping watchdog daemon and running sleep 60 > /dev/watchdog.

Regards,
Hsin-Te

Quoted 73 lines · AngeloGioacchino Del Regno

Il 24/01/24 08:51, Hsin-Te Yuan ha scritto:

Quoted 10 lines

From: Hsin-Te Yuan <[email protected]>

The external output reset signal was originally disabled and sent from firmware. However, an unfixed bug in the firmware on tomato prevents the signal from being sent, causing the device to fail to boot. To fix this, enable external output reset signal to allow the device to reboot normally.

Fixes 5eb2e303ec6b ("arm64: dts: mediatek: Introduce MT8195 Cherry platform's Tomato")

Can't trigger the bug, but also this commit gives no side effects, so:

Quoted 54 lines

---
Changes in v3:
- Add Fixes tag

Changes in v2:
- Limit the effect only on tomato.

---
  arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts | 4 ++++
  arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts | 4 ++++
  arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts | 4 ++++
  3 files changed, 12 insertions(+)
arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts +4 -0
index 2d5e8f371b6de..a82d716f10d44 100644
@@ -23,3 +23,7 @@ &sound {
  &ts_10 {
      status = "okay";
  };
+
+&watchdog {
+     /delete-property/ mediatek,disable-extrst;
+};
arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts +4 -0
index 2586c32ce6e6f..2fe20e0dad836 100644
@@ -43,3 +43,7 @@ &sound {
  &ts_10 {
      status = "okay";
  };
+
+&watchdog {
+     /delete-property/ mediatek,disable-extrst;
+};
arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts +4 -1
index f54f9477b99da..dd294ca98194c 100644
@@ -44,3 +44,7 @@ &sound {
  &ts_10 {
      status = "okay";
  };
+
+&watchdog {
+     /delete-property/ mediatek,disable-extrst;
+};
 
---

base-commit: 64b50fcb03649ca7f0d762a50e7a3484cfc1d586
change-id: 20230818-send-upstream-e91e615a893c

Best regards,

maintainer Applied
#4 lore raw
In reply to Hsin-Te Yuan
Quoted 8 lines · Hsin-Te Yuan

The external output reset signal was originally disabled and sent from firmware. However, an unfixed bug in the firmware on tomato prevents the signal from being sent, causing the device to fail to boot. To fix this, enable external output reset signal to allow the device to reboot normally.

[...]

Applied to v6.8-next/dts64, thanks!

[1/1] arm64: dts: mt8195-cherry-tomato: change watchdog reset boot flow

      https://git.kernel.org/mediatek/c/ef569d5d

Cheers,
Angelo