| Message ID | 20231103163434.1.Ic7577567baff921347d423b722de8b857602efb1@changeid |
|---|---|
| State | New |
| Headers | show |
| Series | [1/9] arm64: dts: qcom: sc7180: Make watchdog bark interrupt edge triggered | expand |
On Fri, Nov 03, 2023 at 04:34:27PM -0700, Douglas Anderson wrote: > On sc7180 when the watchdog timer fires your logs get filled with: > watchdog0: pretimeout event > watchdog0: pretimeout event > watchdog0: pretimeout event > ... > watchdog0: pretimeout event > > If you're using console-ramoops to debug crashes the above gets quite > annoying since it blows away any other log messages that might have > been there. > > The issue is that the "bark" interrupt (AKA the "pretimeout" > interrupt) remains high until the watchdog is pet. Since we've got > things configured as "level" triggered we'll keep getting interrupted > over and over. > > Let's switch to edge triggered. Now we'll get one interrupt when the > "bark" interrupt goes off we'll get one interrupt and won't get > another one until the "bark" interrupt is cleared and asserts again. > > This matches how many older Qualcomm SoCs have things configured. > > Fixes: 28cc13e4060c ("arm64: dts: qcom: sc7180: Add watchdog bark interrupt") > Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > > arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi > index 11f353d416b4..c0365832c315 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi > @@ -3576,7 +3576,7 @@ watchdog@17c10000 { > compatible = "qcom,apss-wdt-sc7180", "qcom,kpss-wdt"; > reg = <0 0x17c10000 0 0x1000>; > clocks = <&sleep_clk>; > - interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; > + interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>; > }; > > timer@17c20000 { > -- > 2.42.0.869.gea05f2083d-goog >
On Fri, Nov 03, 2023 at 04:34:31PM -0700, Douglas Anderson wrote: > As described in the patch ("arm64: dts: qcom: sc7180: Make watchdog > bark interrupt edge triggered"), the Qualcomm watchdog timer's bark > interrupt should be configured as edge triggered. Make the change. > > Fixes: 46a4359f9156 ("arm64: dts: qcom: sm8250: Add watchdog bark interrupt") > Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > > arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi > index be970472f6c4..72db75ca7731 100644 > --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi > @@ -6018,7 +6018,7 @@ watchdog@17c10000 { > compatible = "qcom,apss-wdt-sm8250", "qcom,kpss-wdt"; > reg = <0 0x17c10000 0 0x1000>; > clocks = <&sleep_clk>; > - interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; > + interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>; > }; > > timer@17c20000 { > -- > 2.42.0.869.gea05f2083d-goog >
Hi, On Mon, Nov 6, 2023 at 1:49 PM Stephen Boyd <swboyd@chromium.org> wrote: > > Quoting Douglas Anderson (2023-11-03 16:34:27) > > On sc7180 when the watchdog timer fires your logs get filled with: > > watchdog0: pretimeout event > > watchdog0: pretimeout event > > watchdog0: pretimeout event > > ... > > watchdog0: pretimeout event > > > > If you're using console-ramoops to debug crashes the above gets quite > > annoying since it blows away any other log messages that might have > > been there. > > > > The issue is that the "bark" interrupt (AKA the "pretimeout" > > interrupt) remains high until the watchdog is pet. Since we've got > > things configured as "level" triggered we'll keep getting interrupted > > over and over. > > > > Let's switch to edge triggered. Now we'll get one interrupt when the > > "bark" interrupt goes off we'll get one interrupt and won't get > > "We'll get one" twice? I like to make like to make typos. If you hadn't hadn't noticed. I'll wait another few days and send a version with the typo fixed unless Bjorn tells me not to (because he didn't care and applied it anyway or because he fixed it himself while applying). > > another one until the "bark" interrupt is cleared and asserts again. > > > > This matches how many older Qualcomm SoCs have things configured. > > > > Fixes: 28cc13e4060c ("arm64: dts: qcom: sc7180: Add watchdog bark interrupt") > > Signed-off-by: Douglas Anderson <dianders@chromium.org> > > --- > > Reviewed-by: Stephen Boyd <swboyd@chromium.org> Thanks! -Doug
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 11f353d416b4..c0365832c315 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -3576,7 +3576,7 @@ watchdog@17c10000 { compatible = "qcom,apss-wdt-sc7180", "qcom,kpss-wdt"; reg = <0 0x17c10000 0 0x1000>; clocks = <&sleep_clk>; - interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>; }; timer@17c20000 {
On sc7180 when the watchdog timer fires your logs get filled with: watchdog0: pretimeout event watchdog0: pretimeout event watchdog0: pretimeout event ... watchdog0: pretimeout event If you're using console-ramoops to debug crashes the above gets quite annoying since it blows away any other log messages that might have been there. The issue is that the "bark" interrupt (AKA the "pretimeout" interrupt) remains high until the watchdog is pet. Since we've got things configured as "level" triggered we'll keep getting interrupted over and over. Let's switch to edge triggered. Now we'll get one interrupt when the "bark" interrupt goes off we'll get one interrupt and won't get another one until the "bark" interrupt is cleared and asserts again. This matches how many older Qualcomm SoCs have things configured. Fixes: 28cc13e4060c ("arm64: dts: qcom: sc7180: Add watchdog bark interrupt") Signed-off-by: Douglas Anderson <dianders@chromium.org> --- arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)