Skip to contentSkip to conversation

ARM: dts: OMAP4+: Correct L3 interrupts

PATCH New Jon Hunter 3 participants 5 messages Apr 4, 2013 – Apr 5, 2013 Device tree bindings

lore
Share & tools
lore

Jon Hunter

author
#0 lore raw

PATCH 1/1 ARM: dts: OMAP4+: Correct L3 interrupts

The L3 interrupt numbers are incorrect for OMAP4+ and are conflicting with some of the timer interrupts causing the allocation of timer interrupts to fail.

The problem is caused by adding 32 to the interrupt number for the L3 interrupts to account for per processor interrupts (PPI) and software generated interrupts (SGI) which typically are mapped to the first 32 interrupts in the ARM GIC. This is not necessary because the first parameter of the ARM GIC interrupt property specifies the GIC interrupt type (ie. SGI, PPI, etc). Hence, fix the interrupt number fo the L3 interrupts by substracting 32.

Cc Santosh Shilimkar <[email protected]>

---

Please note that this problem is observed in Benoit's for_3.10/dts branch [1].

[1] http://git.kernel.org/cgit/linux/kernel/git/bcousson/linux-omap-dt.git

 arch/arm/boot/dts/omap4.dtsi |    4 ++--
 arch/arm/boot/dts/omap5.dtsi |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/omap4.dtsi +2 -2
index 3329140..3ae6a3f 100644
@@ -97,8 +97,8 @@
 		reg = <0x44000000 0x1000>,
 		      <0x44800000 0x2000>,
 		      <0x45000000 0x1000>;
-		interrupts = <0 41 0x4>,
-			     <0 42 0x4>;
+		interrupts = <0 9 0x4>,
+			     <0 10 0x4>;
 
 		counter32k: counter at 4a304000 {
 			compatible = "ti,omap-counter32k";
arch/arm/boot/dts/omap5.dtsi +2 -2
index f4c71d9..86f784e 100644
@@ -90,8 +90,8 @@
 		reg = <0x44000000 0x2000>,
 		      <0x44800000 0x3000>,
 		      <0x45000000 0x4000>;
-		interrupts = <0 41 0x4>,
-			     <0 42 0x4>;
+		interrupts = <0 9 0x4>,
+			     <0 10 0x4>;
 
 		counter32k: counter at 4ae04000 {
 			compatible = "ti,omap-counter32k";
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 ARM: dts: OMAP4+: Correct L3 interrupts

Quoted 12 lines · Jon Hunter

The L3 interrupt numbers are incorrect for OMAP4+ and are conflicting with some of the timer interrupts causing the allocation of timer interrupts to fail.

The problem is caused by adding 32 to the interrupt number for the L3 interrupts to account for per processor interrupts (PPI) and software generated interrupts (SGI) which typically are mapped to the first 32 interrupts in the ARM GIC. This is not necessary because the first parameter of the ARM GIC interrupt property specifies the GIC interrupt type (ie. SGI, PPI, etc). Hence, fix the interrupt number fo the L3 interrupts by substracting 32.

Quoted 8 lines
Cc Santosh Shilimkar <[email protected]>

---

Please note that this problem is observed in Benoit's for_3.10/dts branch [1].

[1] http://git.kernel.org/cgit/linux/kernel/git/bcousson/linux-omap-dt.git

Thats correct. I overlooked the 32 addition part. This patch should also be pulled into Benoit's 3.10 tree.

For the patch,

#2 lore raw

PATCH 1/1 ARM: dts: OMAP4+: Correct L3 interrupts

Quoted 17 lines · Santosh Shilimkar
Quoted 16 lines · Jon Hunter

The L3 interrupt numbers are incorrect for OMAP4+ and are conflicting with some of the timer interrupts causing the allocation of timer interrupts to fail.

The problem is caused by adding 32 to the interrupt number for the L3 interrupts to account for per processor interrupts (PPI) and software generated interrupts (SGI) which typically are mapped to the first 32 interrupts in the ARM GIC. This is not necessary because the first parameter of the ARM GIC interrupt property specifies the GIC interrupt type (ie. SGI, PPI, etc). Hence, fix the interrupt number fo the L3 interrupts by substracting 32.

Cc Santosh Shilimkar <[email protected]>

---

Quoted 6 lines
Quoted 4 lines

Please note that this problem is observed in Benoit's for_3.10/dts branch [1].

[1] http://git.kernel.org/cgit/linux/kernel/git/bcousson/linux-omap-dt.git

Thats correct. I overlooked the 32 addition part. This patch should also be pulled into Benoit's 3.10 tree.

Done. I've just applied it. But I will probably merge it with the original patch, because having a broken patch and the fix in the same pull request does not look right.

Quoted 2 lines

For the patch,

Thanks,
Benoit

#3 lore raw

PATCH 1/1 ARM: dts: OMAP4+: Correct L3 interrupts

Santosh and Jon,

Quoted 20 lines · Benoit Cousson
Quoted 19 lines · Santosh Shilimkar
Quoted 18 lines · Jon Hunter

The L3 interrupt numbers are incorrect for OMAP4+ and are conflicting with some of the timer interrupts causing the allocation of timer interrupts to fail.

The problem is caused by adding 32 to the interrupt number for the L3 interrupts to account for per processor interrupts (PPI) and software generated interrupts (SGI) which typically are mapped to the first 32 interrupts in the ARM GIC. This is not necessary because the first parameter of the ARM GIC interrupt property specifies the GIC interrupt type (ie. SGI, PPI, etc). Hence, fix the interrupt number fo the L3 interrupts by substracting 32.

Cc Santosh Shilimkar <[email protected]>

---

Please note that this problem is observed in Benoit's for_3.10/dts branch [1].

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

[1] http://git.kernel.org/cgit/linux/kernel/git/bcousson/linux-omap-dt.git

Thats correct. I overlooked the 32 addition part. This patch should also be pulled into Benoit's 3.10 tree.

Done. I've just applied it. But I will probably merge it with the original patch, because having a broken patch and the fix in the same pull request does not look right.

Please find below the fixed version.

Regards,
Benoit

Quoted 1 line

From 90c2d172ef86d6c3283df43358d4425f9016be48 Mon Sep 17 00:00:00 2001

From: Santosh Shilimkar <[email protected]>
Date: Tue, 26 Feb 2013 17:36:14 +0530
Subject: [PATCH] ARM: dts: OMAP4/5: Update l3-noc DT nodes

Add l3-noc node for OMAP4 and OMAP5 devices.

[jon-hunter at ti.com: Fix the problem caused by adding 32 to the interrupt number for the L3 interrupts to account for per processor interrupts (PPI) and software generated interrupts (SGI) which typically are mapped to the first 32 interrupts in the ARM GIC. This is not necessary because the first parameter of the ARM GIC interrupt property specifies the GIC interrupt type (ie. SGI, PPI, etc). Hence, fix the interrupt number for the L3 interrupts by substracting 32]

---
 arch/arm/boot/dts/omap4.dtsi |    5 +++++
 arch/arm/boot/dts/omap5.dtsi |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/boot/dts/omap4.dtsi +5 -0
index ddfc54a..3ae6a3f 100644
@@ -94,6 +94,11 @@
 		#size-cells = <1>;
 		ranges;
 		ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";
+		reg = <0x44000000 0x1000>,
+		      <0x44800000 0x2000>,
+		      <0x45000000 0x1000>;
+		interrupts = <0 9 0x4>,
+			     <0 10 0x4>;
 
 		counter32k: counter at 4a304000 {
 			compatible = "ti,omap-counter32k";
arch/arm/boot/dts/omap5.dtsi +5 -0
index e539258..94b5ec9 100644
@@ -87,6 +87,11 @@
 		#size-cells = <1>;
 		ranges;
 		ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";
+		reg = <0x44000000 0x2000>,
+		      <0x44800000 0x3000>,
+		      <0x45000000 0x4000>;
+		interrupts = <0 9 0x4>,
+			     <0 10 0x4>;
 
 		counter32k: counter at 4ae04000 {
 			compatible = "ti,omap-counter32k";
Signature · 1 line
1.7.0.4
#4 lore raw

PATCH 1/1 ARM: dts: OMAP4+: Correct L3 interrupts

Quoted 25 lines · Benoit Cousson

Santosh and Jon,

Quoted 22 lines · Benoit Cousson
Quoted 21 lines · Santosh Shilimkar
Quoted 20 lines · Jon Hunter

The L3 interrupt numbers are incorrect for OMAP4+ and are conflicting with some of the timer interrupts causing the allocation of timer interrupts to fail.

The problem is caused by adding 32 to the interrupt number for the L3 interrupts to account for per processor interrupts (PPI) and software generated interrupts (SGI) which typically are mapped to the first 32 interrupts in the ARM GIC. This is not necessary because the first parameter of the ARM GIC interrupt property specifies the GIC interrupt type (ie. SGI, PPI, etc). Hence, fix the interrupt number fo the L3 interrupts by substracting 32.

Cc Santosh Shilimkar <[email protected]>

---

Please note that this problem is observed in Benoit's for_3.10/dts branch [1].

[1] http://git.kernel.org/cgit/linux/kernel/git/bcousson/linux-omap-dt.git

Quoted 9 lines
Quoted 6 lines
Quoted 2 lines

Thats correct. I overlooked the 32 addition part. This patch should also be pulled into Benoit's 3.10 tree.

Done. I've just applied it. But I will probably merge it with the original patch, because having a broken patch and the fix in the same pull request does not look right.

Please find below the fixed version.

Thanks Benoit. Patch looks fine to me.

Regards,
Santosh