| Message ID | 20231106144335.v2.1.Ic7577567baff921347d423b722de8b857602efb1@changeid |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,1/9] arm64: dts: qcom: sc7180: Make watchdog bark interrupt edge triggered | expand |
On Mon, 6 Nov 2023 at 23:44, Douglas Anderson <dianders@chromium.org> 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: 09b701b89a76 ("arm64: dts: qcom: sa8775p: add the watchdog node") > Reviewed-by: Guenter Roeck <linux@roeck-us.net> > Reviewed-by: Stephen Boyd <swboyd@chromium.org> > Signed-off-by: Douglas Anderson <dianders@chromium.org> > --- > > (no changes since v1) > > arch/arm64/boot/dts/qcom/sa8775p.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/qcom/sa8775p.dtsi b/arch/arm64/boot/dts/qcom/sa8775p.dtsi > index 13dd44dd9ed1..6b92f9083104 100644 > --- a/arch/arm64/boot/dts/qcom/sa8775p.dtsi > +++ b/arch/arm64/boot/dts/qcom/sa8775p.dtsi > @@ -2235,7 +2235,7 @@ watchdog@17c10000 { > compatible = "qcom,apss-wdt-sa8775p", "qcom,kpss-wdt"; > reg = <0x0 0x17c10000 0x0 0x1000>; > clocks = <&sleep_clk>; > - interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; > + interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>; > }; > > memtimer: timer@17c20000 { > -- > 2.42.0.869.gea05f2083d-goog > Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
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 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") Reviewed-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Stephen Boyd <swboyd@chromium.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> --- Changes in v2: - Fixed typo in commit message. arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)