From 7d8f8f87df6100e4718b05f06b59715f6c4eb6ea Mon Sep 17 00:00:00 2001 From: Branden Bonaby Date: Tue, 11 Aug 2020 12:11:56 -0700 Subject: [PATCH 1/6] dt-bindings: msm: Update msm watchdog documentation Remove watchdog properties that are no longer being used due to the creation of the watchdog framework. Change-Id: If9b313b1d8b1936155a9032a7ed6a3fd53d07f32 --- bindings/arm/msm/msm_watchdog.yaml | 33 ------------------------------ 1 file changed, 33 deletions(-) diff --git a/bindings/arm/msm/msm_watchdog.yaml b/bindings/arm/msm/msm_watchdog.yaml index 8309dacc..186d67e1 100644 --- a/bindings/arm/msm/msm_watchdog.yaml +++ b/bindings/arm/msm/msm_watchdog.yaml @@ -44,35 +44,6 @@ properties: Value type: Definition: should contain bark and bite irq numbers - qcom,pet-time: - Usage: required - Value type: - Definition: Non zero time interval at which watchdog should be pet in ms. - - qcom,bark-time: - Usage: required - Value type: - Definition: Non zero timeout value for a watchdog bark in ms. - - qcom,userspace-watchdog: - Usage: optional - Value type: - Definition: Allow enabling the userspace-watchdog feature. This feature - requires userspace to pet the watchdog every qcom,pet-time interval - in addition to the existing kernel-level checks. - This feature is supported through device sysfs files. - - qcom,ipi-ping: - Usage: optional - Value type: - Definition: send keep alive ping to other cpus if present - - qcom,wakeup-enable: - Usage: optional - Value type: - Definition: enable non secure watchdog to freeze / unfreeze - automatically across suspend / resume path. - example: - | wdog: qcom,wdt@17c10000{ @@ -81,9 +52,5 @@ example: reg-names = "wdt-base"; interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>, <0 1 IRQ_TYPE_LEVEL_HIGH>; - qcom,bark-time = <11000>; - qcom,pet-time = <9360>; - qcom,ipi-ping; - qcom,wakeup-enable; }; ... From 9a81d0ce21d4dc8bb072bf5fb036629802670a6b Mon Sep 17 00:00:00 2001 From: Branden Bonaby Date: Tue, 11 Aug 2020 12:38:02 -0700 Subject: [PATCH 2/6] ARM: dts: qcom: Remove msm watchdog node properties Due to the creation of a watchdog framework the bark time, pet time, wakeup-enable, ipi-ping and userspace pet enable properties have moved to configs in the kernel instead of as properties of the device. This enables the ability to set these without the need to change them in the device tree. Change-Id: I738fae367aeded48a10aa56e08846ffc8c352bea --- qcom/lahaina.dtsi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/qcom/lahaina.dtsi b/qcom/lahaina.dtsi index 2ee56ffa..06ee3994 100644 --- a/qcom/lahaina.dtsi +++ b/qcom/lahaina.dtsi @@ -4121,10 +4121,6 @@ reg-names = "wdt-base"; interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>, <0 1 IRQ_TYPE_LEVEL_HIGH>; - qcom,bark-time = <11000>; - qcom,pet-time = <9360>; - qcom,ipi-ping; - qcom,wakeup-enable; }; tsens0:tsens@c222000 { From 7615125d967e5f5d3a8842d2af9e2ba6f7baa340 Mon Sep 17 00:00:00 2001 From: Branden Bonaby Date: Tue, 11 Aug 2020 12:58:41 -0700 Subject: [PATCH 3/6] dt-bindings: msm: Add haven watchdog documentation Add binding documentation for the haven virtual watchdog. Change-Id: I1a118bb96a1d419cf41a27e74d238ba228e69e30 --- bindings/arm/msm/hh_watchdog.yaml | 39 +++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 bindings/arm/msm/hh_watchdog.yaml diff --git a/bindings/arm/msm/hh_watchdog.yaml b/bindings/arm/msm/hh_watchdog.yaml new file mode 100644 index 00000000..469eab1c --- /dev/null +++ b/bindings/arm/msm/hh_watchdog.yaml @@ -0,0 +1,39 @@ +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/bindings/arm/msm/hh_watchdog.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: QTI HH Watchdog + +maintainers: + +description: |+ + Watchdog timer is configured with a bark and a bite time. + If the watchdog is not "pet" at regular intervals, the system + is assumed to have become non responsive and needs to be reset. + A warning in the form of a bark timeout leads to a bark interrupt + and a kernel panic. If the watchdog timer is still not reset, + a bite timeout occurs, which leads to a reset of the VM via + the hypervisor. The driver needs the petting time, and the bark + timeout to be programmed into the watchdog, as well as the bark irq. + + The device tree parameters for the watchdog are: + +properties: + compatible: + Usage: required + Value type: + Definition: Must be "qcom,hh-watchdog" + + interrupts: + Usage: required + Value type: + Definition: should contain the bark irq number + +example: + - | + wdog_hh: qcom,wdt_hh { + compatible = "qcom,hh-watchdog"; + interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>; + }; +... From e0693f53763c3a791df4101cfc63cff1018fef9d Mon Sep 17 00:00:00 2001 From: Branden Bonaby Date: Tue, 11 Aug 2020 13:04:28 -0700 Subject: [PATCH 4/6] ARM: dts: qcom: Remove unused bite irq from msm watchdog The bite irq is no longer used in the msm watchdog, so the removal of this property is needed. Change-Id: I11d5bfe94d7086e402c9da43e90daa95c1569a05 --- qcom/lahaina.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qcom/lahaina.dtsi b/qcom/lahaina.dtsi index 06ee3994..95abcc8a 100644 --- a/qcom/lahaina.dtsi +++ b/qcom/lahaina.dtsi @@ -4119,8 +4119,7 @@ compatible = "qcom,msm-watchdog"; reg = <0x17c10000 0x1000>; reg-names = "wdt-base"; - interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>, - <0 1 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>; }; tsens0:tsens@c222000 { From 84003867e6edbe0bac242101017324feec70f5e2 Mon Sep 17 00:00:00 2001 From: Neeraj Upadhyay Date: Thu, 13 Aug 2020 11:40:18 +0530 Subject: [PATCH 5/6] ARM: dts: msm: Remove msm watchdog node properties for Shima Due to the creation of a watchdog framework the bark time, pet time, wakeup-enable, ipi-ping and userspace pet enable properties have moved to configs in the kernel instead of as properties of the device. This enables the ability to to set these without the need to change them in the device tree. Change-Id: I65b24de8003bca72113ce5abdd18ebbaff9c1152 --- qcom/shima.dtsi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/qcom/shima.dtsi b/qcom/shima.dtsi index e6c61131..67aef54f 100644 --- a/qcom/shima.dtsi +++ b/qcom/shima.dtsi @@ -514,10 +514,6 @@ reg-names = "wdt-base"; interrupts = , ; - qcom,bark-time = <11000>; - qcom,pet-time = <9360>; - qcom,ipi-ping; - qcom,wakeup-enable; }; arch_timer: timer { From 41fd46db99b18a025e1ccf3a3d6881ef3995339d Mon Sep 17 00:00:00 2001 From: Neeraj Upadhyay Date: Thu, 13 Aug 2020 11:41:59 +0530 Subject: [PATCH 6/6] ARM: dts: msm: Remove unused bite irq from msm watchdog for Shima The bite irq is no longer used in the msm watchdog, so the removal of this property is needed. Change-Id: I586297e11dcd18504264c5e0c3831b7bcbf89880 --- qcom/shima.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qcom/shima.dtsi b/qcom/shima.dtsi index 67aef54f..89f115ed 100644 --- a/qcom/shima.dtsi +++ b/qcom/shima.dtsi @@ -512,8 +512,7 @@ compatible = "qcom,msm-watchdog"; reg = <0x17c10000 0x1000>; reg-names = "wdt-base"; - interrupts = , - ; + interrupts = ; }; arch_timer: timer {