[PATCH 0/3] Add watchdog nodes to msm8226 & msm8974

[PATCH 0/3] Add watchdog nodes to msm8226 & msm8974

[Luca Weiss]

Document the compatible for the watchdog found on both SoCs, and add
them to the SoC dtsi file. And especially for the case where the
bootloader has already enabled the watchdog we need to start petting it
on time, otherwise the system gets rebooted.

It's worth noting that the watchdog behaves a bit unexpectedly.
It appears the watchdog counts down significantly slower when there's no
load on the system and can last far longer than 30 seconds until they
bark. Only when putting load on the system, e.g. with stress-ng does the
watchdog interrupt fire and kill the system within an expected amount of
time.

This behavior has been observed on both msm8974 and msm8226 smartphones.

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
Matti Lehtimäki (3):
      dt-bindings: watchdog: qcom-wdt: Add MSM8226 and MSM8974 compatibles
      ARM: dts: qcom: msm8226: Add watchdog node
      ARM: dts: qcom: msm8974: Add watchdog node

 Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml | 2 ++
 arch/arm/boot/dts/qcom/qcom-msm8226.dtsi                 | 8 ++++++++
 arch/arm/boot/dts/qcom/qcom-msm8974.dtsi                 | 8 ++++++++
 3 files changed, 18 insertions(+)
---
base-commit: 2933a1156742d8c47550493a77af8e2d81cf3c84
change-id: 20231011-msm8226-msm8974-watchdog-a88e45f4e2a4

Best regards,
-- 
Luca Weiss <luca@z3ntu.xyz>

[PATCH 1/3] dt-bindings: watchdog: qcom-wdt: Add MSM8226 and MSM8974 compatibles

[Luca Weiss]

From: Matti Lehtimäki <matti.lehtimaki@gmail.com>

Add compatibles for the MSM8226 and MSM8974 platforms to the Qualcomm
watchdog binding.

Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
 Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
index 5046dfa55f13..c12bc852aedc 100644
--- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
@@ -21,6 +21,8 @@ properties:
               - qcom,apss-wdt-ipq5018
               - qcom,apss-wdt-ipq5332
               - qcom,apss-wdt-ipq9574
+              - qcom,apss-wdt-msm8226
+              - qcom,apss-wdt-msm8974
               - qcom,apss-wdt-msm8994
               - qcom,apss-wdt-qcm2290
               - qcom,apss-wdt-qcs404

-- 
2.42.0

[PATCH 2/3] ARM: dts: qcom: msm8226: Add watchdog node

[Luca Weiss]

From: Matti Lehtimäki <matti.lehtimaki@gmail.com>

Add watchdog for MSM8226 platform.

Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
 arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi
index 97a377b5a0ec..b5e715858211 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi
@@ -185,6 +185,14 @@ apcs: syscon@f9011000 {
 			reg = <0xf9011000 0x1000>;
 		};
 
+		watchdog@f9017000 {
+			compatible = "qcom,apss-wdt-msm8226", "qcom,kpss-wdt";
+			reg = <0xf9017000 0x1000>;
+			interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>,
+				     <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
+			clocks = <&sleep_clk>;
+		};
+
 		sdhc_1: mmc@f9824900 {
 			compatible = "qcom,msm8226-sdhci", "qcom,sdhci-msm-v4";
 			reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;

-- 
2.42.0

[PATCH 3/3] ARM: dts: qcom: msm8974: Add watchdog node

[Luca Weiss]

From: Matti Lehtimäki <matti.lehtimaki@gmail.com>

Add watchdog for MSM8974 platform.

Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
 arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
index 0bc2e66d15b1..fbeadd43c9ad 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
@@ -346,6 +346,14 @@ apcs: syscon@f9011000 {
 			reg = <0xf9011000 0x1000>;
 		};
 
+		watchdog@f9017000 {
+			compatible = "qcom,apss-wdt-msm8974", "qcom,kpss-wdt";
+			reg = <0xf9017000 0x1000>;
+			interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>,
+				     <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
+			clocks = <&sleep_clk>;
+		};
+
 		timer@f9020000 {
 			#address-cells = <1>;
 			#size-cells = <1>;

-- 
2.42.0

Re: [PATCH 1/3] dt-bindings: watchdog: qcom-wdt: Add MSM8226 and MSM8974 compatibles

[Krzysztof Kozlowski]

On 11/10/2023 18:33, Luca Weiss wrote:
> From: Matti Lehtimäki <matti.lehtimaki@gmail.com>
> 
> Add compatibles for the MSM8226 and MSM8974 platforms to the Qualcomm
> watchdog binding.
> 
> Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [PATCH 2/3] ARM: dts: qcom: msm8226: Add watchdog node

[Konrad Dybcio]

On 10/11/23 18:33, Luca Weiss wrote:
> From: Matti Lehtimäki <matti.lehtimaki@gmail.com>
> 
> Add watchdog for MSM8226 platform.
> 
> Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad

Re: [PATCH 3/3] ARM: dts: qcom: msm8974: Add watchdog node

[Konrad Dybcio]

On 10/11/23 18:33, Luca Weiss wrote:
> From: Matti Lehtimäki <matti.lehtimaki@gmail.com>
> 
> Add watchdog for MSM8974 platform.
> 
> Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad

Re: [PATCH 1/3] dt-bindings: watchdog: qcom-wdt: Add MSM8226 and MSM8974 compatibles

[Guenter Roeck]

On Wed, Oct 11, 2023 at 06:33:13PM +0200, Luca Weiss wrote:
> From: Matti Lehtimäki <matti.lehtimaki@gmail.com>
> 
> Add compatibles for the MSM8226 and MSM8974 platforms to the Qualcomm
> watchdog binding.
> 
> Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
> index 5046dfa55f13..c12bc852aedc 100644
> --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
> +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
> @@ -21,6 +21,8 @@ properties:
>                - qcom,apss-wdt-ipq5018
>                - qcom,apss-wdt-ipq5332
>                - qcom,apss-wdt-ipq9574
> +              - qcom,apss-wdt-msm8226
> +              - qcom,apss-wdt-msm8974
>                - qcom,apss-wdt-msm8994
>                - qcom,apss-wdt-qcm2290
>                - qcom,apss-wdt-qcs404
> 
> -- 
> 2.42.0
> 

Re: (subset) [PATCH 0/3] Add watchdog nodes to msm8226 & msm8974

[Bjorn Andersson]

On Wed, 11 Oct 2023 18:33:12 +0200, Luca Weiss wrote:
> Document the compatible for the watchdog found on both SoCs, and add
> them to the SoC dtsi file. And especially for the case where the
> bootloader has already enabled the watchdog we need to start petting it
> on time, otherwise the system gets rebooted.
> 
> It's worth noting that the watchdog behaves a bit unexpectedly.
> It appears the watchdog counts down significantly slower when there's no
> load on the system and can last far longer than 30 seconds until they
> bark. Only when putting load on the system, e.g. with stress-ng does the
> watchdog interrupt fire and kill the system within an expected amount of
> time.
> 
> [...]

Applied, thanks!

[3/3] ARM: dts: qcom: msm8974: Add watchdog node
      commit: 95053f6bc8ffca438a261400d7c06bd74e3f106e

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>

Re: (subset) [PATCH 0/3] Add watchdog nodes to msm8226 & msm8974

[Luca Weiss]

On Sonntag, 3. Dezember 2023 05:54:39 CET Bjorn Andersson wrote:
> On Wed, 11 Oct 2023 18:33:12 +0200, Luca Weiss wrote:
> > Document the compatible for the watchdog found on both SoCs, and add
> > them to the SoC dtsi file. And especially for the case where the
> > bootloader has already enabled the watchdog we need to start petting it
> > on time, otherwise the system gets rebooted.
> > 
> > It's worth noting that the watchdog behaves a bit unexpectedly.
> > It appears the watchdog counts down significantly slower when there's no
> > load on the system and can last far longer than 30 seconds until they
> > bark. Only when putting load on the system, e.g. with stress-ng does the
> > watchdog interrupt fire and kill the system within an expected amount of
> > time.
> > 
> > [...]
> 
> Applied, thanks!
> 
> [3/3] ARM: dts: qcom: msm8974: Add watchdog node
>       commit: 95053f6bc8ffca438a261400d7c06bd74e3f106e

Hi Bjorn,

Any reason you didn't pick up the msm8226 patch? Doesn't seem to be just your
ty email, I only see the msm8974 patch in 
https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git/log/?h=arm32-for-6.8

Regards
Luca

> 
> Best regards,