[PATCH 0/5] Fix ESM source interrupts

[PATCH 0/5] Fix ESM source interrupts

[Judith Mendez]

The following patch series fixes ESM source interrupts
for Sitara K3 platforms, currently watchdog cannot reset
the CPU because of misconfiguration or missing ESM node
in DT.

ESM node was added for am62ax and am62px ESM source interrupts
are fixed. Comments were also added for clarity on what
source interrupts are routed to ESM based on device datasheets.

Judith Mendez (4):
  arm64: dts: ti: k3-am62a: Add ESM support
  arm64: dts: ti: k3-am62p: Fix ESM interrupt sources
  arm64: dts: ti: k3-am6*: Add comment for ESM interrupt sources
  arm64: dts: ti: k3-am6*: Fix comment in watchdog nodes

Santhosh Kumar K (1):
  arm64: dts: ti: k3-am62p: Remove 'reserved' status

 arch/arm64/boot/dts/ti/k3-am62-main.dtsi               | 1 +
 arch/arm64/boot/dts/ti/k3-am62a-main.dtsi              | 7 +++++++
 arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi               | 8 +++++++-
 arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 3 ++-
 arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi  | 3 +--
 arch/arm64/boot/dts/ti/k3-am64-main.dtsi               | 1 +
 6 files changed, 19 insertions(+), 4 deletions(-)

-- 
2.45.2

[PATCH 1/5] arm64: dts: ti: k3-am62a: Add ESM support

[Judith Mendez]

Add Error Signaling Module (ESM) instances in MCU and MAIN domains.

Signed-off-by: Judith Mendez <jm@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 6 ++++++
 arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi  | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
index 916fcf3cc57d1..fb5a3006e20ac 100644
--- a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
@@ -265,6 +265,12 @@ main_pmx0: pinctrl@f4000 {
 		pinctrl-single,function-mask = <0xffffffff>;
 	};
 
+	main_esm: esm@420000 {
+		compatible = "ti,j721e-esm";
+		reg = <0x0 0x420000 0x0 0x1000>;
+		ti,esm-pins = <192>, <193>, <195>, <204>, <209>, <210>;
+	};
+
 	main_timer0: timer@2400000 {
 		compatible = "ti,am654-timer";
 		reg = <0x00 0x2400000 0x00 0x400>;
diff --git a/arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi
index 8c36e56f41388..cea0e1d4caaa0 100644
--- a/arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi
@@ -15,6 +15,12 @@ mcu_pmx0: pinctrl@4084000 {
 		status = "disabled";
 	};
 
+	mcu_esm: esm@4100000 {
+		compatible = "ti,j721e-esm";
+		reg = <0x0 0x4100000 0x0 0x1000>;
+		ti,esm-pins = <0>, <1>, <2>, <85>;
+	};
+
 	/*
 	 * The MCU domain timer interrupts are routed only to the ESM module,
 	 * and not currently available for Linux. The MCU domain timers are
-- 
2.45.2

[PATCH 2/5] arm64: dts: ti: k3-am62p: Fix ESM interrupt sources

[Judith Mendez]

Fix interrupt sources routed to the ESM0 as per [0], in
10.4.7 ESM0_INTERRUPT_MAP.

[0] https://www.ti.com/lit/ug/spruj83/spruj83.pdf

Fixes: b5080c7c1f7e ("arm64: dts: ti: k3-am62p: Add nodes for more IPs")
Signed-off-by: Judith Mendez <jm@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
index 9701fc69aed94..dc401290f13dd 100644
--- a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
@@ -260,7 +260,7 @@ main_pmx0: pinctrl@f4000 {
 	main_esm: esm@420000 {
 		compatible = "ti,j721e-esm";
 		reg = <0x00 0x420000 0x00 0x1000>;
-		ti,esm-pins = <160>, <161>, <162>, <163>, <177>, <178>;
+		ti,esm-pins = <224>, <225>, <227>, <241>, <242>, <248>;
 		bootph-pre-ram;
 	};
 
-- 
2.45.2

[PATCH 3/5] arm64: dts: ti: k3-am62p: Remove 'reserved' status

[Judith Mendez]

From: Santhosh Kumar K <s-k6@ti.com>

Remove 'reserved' status for MCU ESM node in AM62P device tree.

Signed-off-by: Santhosh Kumar K <s-k6@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
index e65db6ce02bf6..d913e6319bad8 100644
--- a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
@@ -27,7 +27,6 @@ mcu_esm: esm@4100000 {
 		compatible = "ti,j721e-esm";
 		reg = <0x00 0x4100000 0x00 0x1000>;
 		ti,esm-pins = <0>, <1>, <2>, <85>;
-		status = "reserved";
 		bootph-pre-ram;
 	};
 
-- 
2.45.2

Re: [PATCH 3/5] arm64: dts: ti: k3-am62p: Remove 'reserved' status

[Nishanth Menon]

On 16:46-20240806, Judith Mendez wrote:
> From: Santhosh Kumar K <s-k6@ti.com>
> 
> Remove 'reserved' status for MCU ESM node in AM62P device tree.

Why?
> 
> Signed-off-by: Santhosh Kumar K <s-k6@ti.com>
> ---
>  arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
> index e65db6ce02bf6..d913e6319bad8 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
> @@ -27,7 +27,6 @@ mcu_esm: esm@4100000 {
>  		compatible = "ti,j721e-esm";
>  		reg = <0x00 0x4100000 0x00 0x1000>;
>  		ti,esm-pins = <0>, <1>, <2>, <85>;
> -		status = "reserved";
>  		bootph-pre-ram;
>  	};
>  
> -- 
> 2.45.2
> 

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

Re: [PATCH 3/5] arm64: dts: ti: k3-am62p: Remove 'reserved' status

[Judith Mendez]

Hi Nishanth,

On 8/7/24 6:46 AM, Nishanth Menon wrote:
> On 16:46-20240806, Judith Mendez wrote:
>> From: Santhosh Kumar K <s-k6@ti.com>
>>
>> Remove 'reserved' status for MCU ESM node in AM62P device tree.
> 
> Why?

Main ESM reset is routed to the MCU ESM, hense enable
MCU ESM in DT to be able to reset the CPU.


>>
>> Signed-off-by: Santhosh Kumar K <s-k6@ti.com>
>> ---
>>   arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi | 1 -
>>   1 file changed, 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
>> index e65db6ce02bf6..d913e6319bad8 100644
>> --- a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
>> +++ b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
>> @@ -27,7 +27,6 @@ mcu_esm: esm@4100000 {
>>   		compatible = "ti,j721e-esm";
>>   		reg = <0x00 0x4100000 0x00 0x1000>;
>>   		ti,esm-pins = <0>, <1>, <2>, <85>;
>> -		status = "reserved";
>>   		bootph-pre-ram;
>>   	};
>>   
>> -- 
>> 2.45.2
>>
> 

Re: [PATCH 3/5] arm64: dts: ti: k3-am62p: Remove 'reserved' status

[Nishanth Menon]

On 10:13-20240807, Judith Mendez wrote:
> Hi Nishanth,
> 
> On 8/7/24 6:46 AM, Nishanth Menon wrote:
> > On 16:46-20240806, Judith Mendez wrote:
> > > From: Santhosh Kumar K <s-k6@ti.com>
> > > 
> > > Remove 'reserved' status for MCU ESM node in AM62P device tree.
> > 
> > Why?
> 
> Main ESM reset is routed to the MCU ESM, hense enable
> MCU ESM in DT to be able to reset the CPU.

please document that in the commit message - please review the rest
of the patches as well. Is this problem present on other related AM6
products as well - will be good to audit and fixup in the series?

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

Re: [PATCH 3/5] arm64: dts: ti: k3-am62p: Remove 'reserved' status

[Judith Mendez]

On 8/7/24 10:26 AM, Nishanth Menon wrote:
> On 10:13-20240807, Judith Mendez wrote:
>> Hi Nishanth,
>>
>> On 8/7/24 6:46 AM, Nishanth Menon wrote:
>>> On 16:46-20240806, Judith Mendez wrote:
>>>> From: Santhosh Kumar K <s-k6@ti.com>
>>>>
>>>> Remove 'reserved' status for MCU ESM node in AM62P device tree.
>>>
>>> Why?
>>
>> Main ESM reset is routed to the MCU ESM, hense enable
>> MCU ESM in DT to be able to reset the CPU.
> 
> please document that in the commit message - please review the rest
> of the patches as well. Is this problem present on other related AM6
> products as well - will be good to audit and fixup in the series?


Sure, am62x and am64x should be fine, only platform left to check is 
am65x. So will verify that and send v2 with commit message fixed,
thanks for reviewing!


~ Judith

[PATCH 4/5] arm64: dts: ti: k3-am6*: Add comment for ESM interrupt sources

[Judith Mendez]

For all am6* devices, add comment to clarify which interrupt sources
are routed to ESM0.

There is no functional change.

Signed-off-by: Judith Mendez <jm@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am62-main.dtsi               | 1 +
 arch/arm64/boot/dts/ti/k3-am62a-main.dtsi              | 1 +
 arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 1 +
 arch/arm64/boot/dts/ti/k3-am64-main.dtsi               | 1 +
 4 files changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
index 328929c740dc0..5b92aef5b284b 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
@@ -241,6 +241,7 @@ main_esm: esm@420000 {
 		bootph-pre-ram;
 		compatible = "ti,j721e-esm";
 		reg = <0x00 0x420000 0x00 0x1000>;
+		/* Interrupt sources: rti0, rti1, rti15, wrti0, rti2, rti3 */
 		ti,esm-pins = <160>, <161>, <162>, <163>, <177>, <178>;
 	};
 
diff --git a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
index fb5a3006e20ac..2c04c1cc99c17 100644
--- a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
@@ -268,6 +268,7 @@ main_pmx0: pinctrl@f4000 {
 	main_esm: esm@420000 {
 		compatible = "ti,j721e-esm";
 		reg = <0x0 0x420000 0x0 0x1000>;
+		/* Interrupt sources: rti0, rti1, wrti0, rti4, rti2, rti3 */
 		ti,esm-pins = <192>, <193>, <195>, <204>, <209>, <210>;
 	};
 
diff --git a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
index dc401290f13dd..7941aab09cf72 100644
--- a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
@@ -260,6 +260,7 @@ main_pmx0: pinctrl@f4000 {
 	main_esm: esm@420000 {
 		compatible = "ti,j721e-esm";
 		reg = <0x00 0x420000 0x00 0x1000>;
+		/* Interrupt sources: rti0, rti1, wrti0 rti2, rti3, rti15 */
 		ti,esm-pins = <224>, <225>, <227>, <241>, <242>, <248>;
 		bootph-pre-ram;
 	};
diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
index f8370dd033502..331cb01d80ce2 100644
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
@@ -389,6 +389,7 @@ main_esm: esm@420000 {
 		bootph-pre-ram;
 		compatible = "ti,j721e-esm";
 		reg = <0x00 0x420000 0x00 0x1000>;
+		/* Interrupt sources: rti0, rti1 */
 		ti,esm-pins = <160>, <161>;
 	};
 
-- 
2.45.2

[PATCH 5/5] arm64: dts: ti: k3-am6*: Fix comment in watchdog nodes

[Judith Mendez]

The am62ax and am62p devices have an MCU R5F and not an
M4F, the following comment is not correct:

/* Tightly coupled to M4F */

so fix the comment in watchdog nodes.

There is no functional change.

Signed-off-by: Judith Mendez <jm@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi              | 2 +-
 arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi
index cea0e1d4caaa0..a5a33491b51bb 100644
--- a/arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi
@@ -146,7 +146,7 @@ mcu_rti0: watchdog@4880000 {
 		power-domains = <&k3_pds 131 TI_SCI_PD_EXCLUSIVE>;
 		assigned-clocks = <&k3_clks 131 0>;
 		assigned-clock-parents = <&k3_clks 131 2>;
-		/* Tightly coupled to M4F */
+		/* Tightly coupled to R5F */
 		status = "reserved";
 	};
 
diff --git a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
index d913e6319bad8..d5a498479cba2 100644
--- a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
@@ -154,7 +154,7 @@ mcu_rti0: watchdog@4880000 {
 		power-domains = <&k3_pds 131 TI_SCI_PD_EXCLUSIVE>;
 		assigned-clocks = <&k3_clks 131 0>;
 		assigned-clock-parents = <&k3_clks 131 2>;
-		/* Tightly coupled to M4F */
+		/* Tightly coupled to R5F */
 		status = "reserved";
 	};
 
-- 
2.45.2