Skip to contentSkip to conversation

arm64: dts: qcom: sc7180: Add APSS watchdog node

PATCH In review Sai Prakash Ranjan 3 participants 9 messages Dec 11, 2019 – Dec 16, 2019 1 message not in the archive

Subsystems (4)
lore
Share & tools
lore
#1 lore raw

PATCH 1/3 arm64: dts: qcom: sc7180: Add APSS watchdog node

In reply to a message not in the archive

Add APSS (Application Processor Subsystem) watchdog DT node for SC7180 SoC.

---
 arch/arm64/boot/dts/qcom/sc7180.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm64/boot/dts/qcom/sc7180.dtsi +6 -0
index 666e9b92c7ad..a6773ad3738b 100644
@@ -1038,6 +1038,12 @@
 			};
 		};
 
+		watchdog@17c10000 {
+			compatible = "qcom,apss-wdt-sc7180", "qcom,kpss-wdt";
+			reg = <0 0x17c10000 0 0x1000>;
+			clocks = <&sleep_clk>;
+		};
+
 		timer@17c20000{
 			#address-cells = <2>;
 			#size-cells = <2>;
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
#6 lore raw

PATCH 2/3 arm64: dts: qcom: sm8150: Add APSS watchdog node

In reply to a message not in the archive

Add APSS (Application Processor Subsystem) watchdog DT node for SM8150 SoC.

---
 arch/arm64/boot/dts/qcom/sm8150.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm64/boot/dts/qcom/sm8150.dtsi +6 -0
index 8f23fcadecb8..4224f6474a9d 100644
@@ -387,6 +387,12 @@
 			#mbox-cells = <1>;
 		};
 
+		watchdog@17c10000 {
+			compatible = "qcom,apss-wdt-sm8150", "qcom,kpss-wdt";
+			reg = <0 0x17c10000 0 0x1000>;
+			clocks = <&sleep_clk>;
+		};
+
 		timer@17c20000 {
 			#address-cells = <2>;
 			#size-cells = <2>;
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
#8 lore raw

PATCH 3/3 arm64: dts: qcom: sc7180: Add Last level cache controller node

In reply to a message not in the archive

Add device tree node for LLCC aka system cache controller for SC7180 SoC.

---
 arch/arm64/boot/dts/qcom/sc7180.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)
arch/arm64/boot/dts/qcom/sc7180.dtsi +7 -0
index a6773ad3738b..e1567109adc4 100644
@@ -911,6 +911,13 @@
 			status = "disabled";
 		};
 
+		system-cache-controller@9200000 {
+			compatible = "qcom,sc7180-llcc";
+			reg = <0 0x09200000 0 0x200000>, <0 0x09600000 0 0x50000>;
+			reg-names = "llcc_base", "llcc_broadcast_base";
+			interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;
+		};
+
 		spmi_bus: spmi@c440000 {
 			compatible = "qcom,spmi-pmic-arb";
 			reg = <0 0x0c440000 0 0x1100>,

---

This patch depends on the llcc binding change already reviewed at:
- https://patchwork.kernel.org/patch/11246055/

--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

#5 lore raw

PATCH 1/3 arm64: dts: qcom: sc7180: Add APSS watchdog node

In reply to a message not in the archive

Add APSS (Application Processor Subsystem) watchdog DT node for SC7180 SoC.

---
 arch/arm64/boot/dts/qcom/sc7180.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm64/boot/dts/qcom/sc7180.dtsi +6 -0
index 666e9b92c7ad..a6773ad3738b 100644
@@ -1038,6 +1038,12 @@
 			};
 		};
 
+		watchdog@17c10000 {
+			compatible = "qcom,apss-wdt-sc7180", "qcom,kpss-wdt";
+			reg = <0 0x17c10000 0 0x1000>;
+			clocks = <&sleep_clk>;
+		};
+
 		timer@17c20000{
 			#address-cells = <2>;
 			#size-cells = <2>;
Signature · 8 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#7 lore raw

PATCH 2/3 arm64: dts: qcom: sm8150: Add APSS watchdog node

In reply to a message not in the archive

Add APSS (Application Processor Subsystem) watchdog DT node for SM8150 SoC.

---
 arch/arm64/boot/dts/qcom/sm8150.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm64/boot/dts/qcom/sm8150.dtsi +6 -0
index 8f23fcadecb8..4224f6474a9d 100644
@@ -387,6 +387,12 @@
 			#mbox-cells = <1>;
 		};
 
+		watchdog@17c10000 {
+			compatible = "qcom,apss-wdt-sm8150", "qcom,kpss-wdt";
+			reg = <0 0x17c10000 0 0x1000>;
+			clocks = <&sleep_clk>;
+		};
+
 		timer@17c20000 {
 			#address-cells = <2>;
 			#size-cells = <2>;
Signature · 8 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#9 lore raw

PATCH 3/3 arm64: dts: qcom: sc7180: Add Last level cache controller node

In reply to a message not in the archive

Add device tree node for LLCC aka system cache controller for SC7180 SoC.

---
 arch/arm64/boot/dts/qcom/sc7180.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)
arch/arm64/boot/dts/qcom/sc7180.dtsi +7 -0
index a6773ad3738b..e1567109adc4 100644
@@ -911,6 +911,13 @@
 			status = "disabled";
 		};
 
+		system-cache-controller@9200000 {
+			compatible = "qcom,sc7180-llcc";
+			reg = <0 0x09200000 0 0x200000>, <0 0x09600000 0 0x50000>;
+			reg-names = "llcc_base", "llcc_broadcast_base";
+			interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;
+		};
+
 		spmi_bus: spmi@c440000 {
 			compatible = "qcom,spmi-pmic-arb";
 			reg = <0 0x0c440000 0 0x1100>,

---

This patch depends on the llcc binding change already reviewed at:
- https://patchwork.kernel.org/patch/11246055/

--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#2 lore raw
In reply to Sai Prakash Ranjan

Sai,

Quoted 14 lines · Sai Prakash Ranjan

Add APSS (Application Processor Subsystem) watchdog DT node for SC7180 SoC.

---
 arch/arm64/boot/dts/qcom/sc7180.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm64/boot/dts/qcom/sc7180.dtsi +0 -0
index 666e9b92c7ad..a6773ad3738b 100644

arch/arm64/boot/dts/qcom/sc7180.dtsi line 1042

Quoted 5 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +2 -0
@@ -1038,6 +1038,12 @@
                        };
                };
 
+               watchdog@17c10000 {
+                       compatible = "qcom,apss-wdt-sc7180", "qcom,kpss-wdt";

If you haven't already done it (I couldn't find it), can you please add this to "Documentation/devicetree/bindings/watchdog/qcom-wdt.txt"?
Presumably at the same time it would be good to change the format of
that file to .yaml.

Unrelated to sc7180, but it also feels like something is awfully screwy here in terms of the various Qualcomm device tree files referring to watchdog timers. It feels wrong, but perhaps you can educate me on how it works and I'll see the light. Specifically:

1. It seems like the same node is used for two things on other Qualcomm SoCs

If I grep the bindings for "qcom,kpss-timer" or "qcom,scss-timer", I get two hits:

Documentation/devicetree/bindings/timer/qcom,msm-timer.txt Documentation/devicetree/bindings/watchdog/qcom-wdt.txt

...and, in fact, there appear to be two drivers claiming compatibility here:

drivers/clocksource/timer-qcom.c
drivers/watchdog/qcom-wdt.c

That seems super odd to me. Is that really right? We have two drivers probing against the same device tree nodes? ...and that's OK?
If so, why does only one of the bindings list the SoC-specific
bindings names?

2. The actual nodes look really wonky. A few examples below:

2a) arch/arm/boot/dts/qcom-apq8064.dtsi:
compatible = "qcom,kpss-timer", "qcom,kpss-wdt-apq8064", "qcom,msm-timer";

...why is the SoC-specific compatible string in the middle? The SoC-specific one should be first.

2b) arch/arm/boot/dts/qcom-ipq4019.dtsi:
compatible = "qcom,kpss-wdt", "qcom,kpss-wdt-ipq4019";

...same question, but in this case there is no "msm-timer" at the end?

2c) arch/arm64/boot/dts/qcom/qcs404.dtsi
compatible = "qcom,kpss-wdt";

...no SoC-specific string at all?

Thanks!

-Doug

#3 lore raw

Hi Doug,

Quoted 5 lines · Doug Anderson

If you haven't already done it (I couldn't find it), can you please add this to "Documentation/devicetree/bindings/watchdog/qcom-wdt.txt"?
Presumably at the same time it would be good to change the format of
that file to .yaml.

This was the copy paste mistake from sdm845, I will convert the wdog bindings to yaml and add missing SoC specific compatible for SC7180, SDM845 and SM8150.

Quoted 16 lines

Unrelated to sc7180, but it also feels like something is awfully screwy here in terms of the various Qualcomm device tree files referring to watchdog timers. It feels wrong, but perhaps you can educate me on how it works and I'll see the light. Specifically:

1. It seems like the same node is used for two things on other Qualcomm SoCs

If I grep the bindings for "qcom,kpss-timer" or "qcom,scss-timer", I get two hits:

Documentation/devicetree/bindings/timer/qcom,msm-timer.txt Documentation/devicetree/bindings/watchdog/qcom-wdt.txt

...and, in fact, there appear to be two drivers claiming compatibility here:

Quoted 8 lines

drivers/clocksource/timer-qcom.c
drivers/watchdog/qcom-wdt.c

That seems super odd to me. Is that really right? We have two drivers probing against the same device tree nodes? ...and that's OK?
If so, why does only one of the bindings list the SoC-specific
bindings names?

This was before my time, but scratching my head and some internal docs and git history reveals that watchdog was part of the timer block in APQ8064, MSM8960. However in IPQ4019, watchdog was standalone and split from timer block.

Below links gives us some more background:

https://groups.google.com/forum/#!topic/linux.kernel/UnDgqU8QgLU
https://patchwork.kernel.org/patch/5868261/

Quoted 8 lines

2. The actual nodes look really wonky. A few examples below:

2a) arch/arm/boot/dts/qcom-apq8064.dtsi:
compatible = "qcom,kpss-timer", "qcom,kpss-wdt-apq8064", "qcom,msm-timer";

...why is the SoC-specific compatible string in the middle? The SoC-specific one should be first.

Yes, SoC specific compatible should come first, I guess they just didn't care when it was merged.

Quoted 6 lines

2b) arch/arm/boot/dts/qcom-ipq4019.dtsi:
compatible = "qcom,kpss-wdt", "qcom,kpss-wdt-ipq4019";

...same question, but in this case there is no "msm-timer" at the end?

IPQ4019 had watchdog as standalone outside of timer block as explained above.

Quoted 5 lines

2c) arch/arm64/boot/dts/qcom/qcs404.dtsi
compatible = "qcom,kpss-wdt";

...no SoC-specific string at all?

Needs a SoC specific compatible, I am going to add this in my coming patch.

Thanks,
Sai

Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
#4 lore raw
In reply to Doug Anderson

Quoting Doug Anderson (2019-12-11 11:25:23)

Quoted 18 lines

On Tue, Dec 10, 2019 at 8:30 PM Sai Prakash Ranjan <[email protected]> wrote:

Unrelated to sc7180, but it also feels like something is awfully screwy here in terms of the various Qualcomm device tree files referring to watchdog timers. It feels wrong, but perhaps you can educate me on how it works and I'll see the light. Specifically:

1. It seems like the same node is used for two things on other Qualcomm SoCs

If I grep the bindings for "qcom,kpss-timer" or "qcom,scss-timer", I get two hits:

Documentation/devicetree/bindings/timer/qcom,msm-timer.txt Documentation/devicetree/bindings/watchdog/qcom-wdt.txt

...and, in fact, there appear to be two drivers claiming compatibility here:

Quoted 7 lines

drivers/clocksource/timer-qcom.c
drivers/watchdog/qcom-wdt.c

That seems super odd to me. Is that really right? We have two drivers probing against the same device tree nodes? ...and that's OK?
If so, why does only one of the bindings list the SoC-specific
bindings names?

The drivers/clocksource/timer-qcom.c file isn't a "driver", at least not in the linux device driver model. It's a clocksource driver that probes early so in this case the clocksource code runs early and then the qcom-wdt driver probes later as a platform device driver.

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel