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

[PATCH v3] arm64: dts: mt8195-cherry-tomato: change watchdog reset boot flow

Posted by Hsin-Te Yuan 7 months, 4 weeks ago

From: Hsin-Te Yuan <yuanhsinte@google.com>

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")
Signed-off-by: Hsin-Te Yuan <yuanhsinte@chromium.org>
---
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(+)

diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
index 2d5e8f371b6de..a82d716f10d44 100644
--- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
@@ -23,3 +23,7 @@ &sound {
 &ts_10 {
 	status = "okay";
 };
+
+&watchdog {
+	/delete-property/ mediatek,disable-extrst;
+};
diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
index 2586c32ce6e6f..2fe20e0dad836 100644
--- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
@@ -43,3 +43,7 @@ &sound {
 &ts_10 {
 	status = "okay";
 };
+
+&watchdog {
+	/delete-property/ mediatek,disable-extrst;
+};
diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
index f54f9477b99da..dd294ca98194c 100644
--- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
@@ -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,
-- 
Hsin-Te Yuan <yuanhsinte@chromium.org>

Re: [PATCH v3] arm64: dts: mt8195-cherry-tomato: change watchdog reset boot flow

Posted by AngeloGioacchino Del Regno 7 months ago

On Wed, 24 Jan 2024 07:51:57 +0000, Hsin-Te Yuan wrote:
> 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

Re: [PATCH v3] arm64: dts: mt8195-cherry-tomato: change watchdog reset boot flow

Posted by AngeloGioacchino Del Regno 7 months, 4 weeks ago

Il 24/01/24 08:51, Hsin-Te Yuan ha scritto:
> From: Hsin-Te Yuan <yuanhsinte@google.com>
> 
> 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")
> Signed-off-by: Hsin-Te Yuan <yuanhsinte@chromium.org>

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

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>


> ---
> 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(+)
> 
> diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
> index 2d5e8f371b6de..a82d716f10d44 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
> +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
> @@ -23,3 +23,7 @@ &sound {
>   &ts_10 {
>   	status = "okay";
>   };
> +
> +&watchdog {
> +	/delete-property/ mediatek,disable-extrst;
> +};
> diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
> index 2586c32ce6e6f..2fe20e0dad836 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
> +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
> @@ -43,3 +43,7 @@ &sound {
>   &ts_10 {
>   	status = "okay";
>   };
> +
> +&watchdog {
> +	/delete-property/ mediatek,disable-extrst;
> +};
> diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
> index f54f9477b99da..dd294ca98194c 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
> +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
> @@ -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,

Re: [PATCH v3] arm64: dts: mt8195-cherry-tomato: change watchdog reset boot flow

Posted by Hsin-Te Yuan 7 months, 4 weeks ago

Hi AngeloGioacchino,

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

Regards,
Hsin-Te



On Wed, Jan 24, 2024 at 4:27 PM AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com> wrote:
>
> Il 24/01/24 08:51, Hsin-Te Yuan ha scritto:
> > From: Hsin-Te Yuan <yuanhsinte@google.com>
> >
> > 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")
> > Signed-off-by: Hsin-Te Yuan <yuanhsinte@chromium.org>
>
> Can't trigger the bug, but also this commit gives no side effects, so:
>
> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
>
>
> > ---
> > 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(+)
> >
> > diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
> > index 2d5e8f371b6de..a82d716f10d44 100644
> > --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
> > +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
> > @@ -23,3 +23,7 @@ &sound {
> >   &ts_10 {
> >       status = "okay";
> >   };
> > +
> > +&watchdog {
> > +     /delete-property/ mediatek,disable-extrst;
> > +};
> > diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
> > index 2586c32ce6e6f..2fe20e0dad836 100644
> > --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
> > +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
> > @@ -43,3 +43,7 @@ &sound {
> >   &ts_10 {
> >       status = "okay";
> >   };
> > +
> > +&watchdog {
> > +     /delete-property/ mediatek,disable-extrst;
> > +};
> > diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
> > index f54f9477b99da..dd294ca98194c 100644
> > --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
> > +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
> > @@ -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,
>

Re: [PATCH v3] arm64: dts: mt8195-cherry-tomato: change watchdog reset boot flow

Posted by Hsin-Te Yuan 7 months ago

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


On Wed, Jan 24, 2024 at 5:04 PM Hsin-Te Yuan <yuanhsinte@chromium.org> wrote:
>
> Hi AngeloGioacchino,
>
> This bug can be triggered by stopping watchdog daemon and running
> `sleep 60 > /dev/watchdog`.
>
> Regards,
> Hsin-Te
>
>
>
> On Wed, Jan 24, 2024 at 4:27 PM AngeloGioacchino Del Regno
> <angelogioacchino.delregno@collabora.com> wrote:
> >
> > Il 24/01/24 08:51, Hsin-Te Yuan ha scritto:
> > > From: Hsin-Te Yuan <yuanhsinte@google.com>
> > >
> > > 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")
> > > Signed-off-by: Hsin-Te Yuan <yuanhsinte@chromium.org>
> >
> > Can't trigger the bug, but also this commit gives no side effects, so:
> >
> > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
> >
> >
> > > ---
> > > 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(+)
> > >
> > > diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
> > > index 2d5e8f371b6de..a82d716f10d44 100644
> > > --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
> > > +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
> > > @@ -23,3 +23,7 @@ &sound {
> > >   &ts_10 {
> > >       status = "okay";
> > >   };
> > > +
> > > +&watchdog {
> > > +     /delete-property/ mediatek,disable-extrst;
> > > +};
> > > diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
> > > index 2586c32ce6e6f..2fe20e0dad836 100644
> > > --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
> > > +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
> > > @@ -43,3 +43,7 @@ &sound {
> > >   &ts_10 {
> > >       status = "okay";
> > >   };
> > > +
> > > +&watchdog {
> > > +     /delete-property/ mediatek,disable-extrst;
> > > +};
> > > diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
> > > index f54f9477b99da..dd294ca98194c 100644
> > > --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
> > > +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
> > > @@ -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,
> >