diff mbox series

arm64: tegra: Use correct interrupts for Tegra234 TKE

Message ID 20231012124311.3009393-1-thierry.reding@gmail.com
State Accepted
Headers show
Series arm64: tegra: Use correct interrupts for Tegra234 TKE | expand

Commit Message

Thierry Reding Oct. 12, 2023, 12:43 p.m. UTC
From: Thierry Reding <treding@nvidia.com>

The shared interrupts 0-9 of the TKE are mapped to interrupts 0-9, but
shared interrupts 10-15 are mapped to 256-261. Correct the mapping for
the final 6 interrupts. This prevents the TKE from requesting the RTC
interrupt (along with several GTE and watchdog interrupts).

Reported-by: Shubhi Garg <shgarg@nvidia.com>
Fixes: 28d860ed02c2 ("arm64: tegra: Enable native timers on Tegra234")
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 arch/arm64/boot/dts/nvidia/tegra234.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Jon Hunter Oct. 12, 2023, 4:32 p.m. UTC | #1
On 12/10/2023 13:43, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> The shared interrupts 0-9 of the TKE are mapped to interrupts 0-9, but
> shared interrupts 10-15 are mapped to 256-261. Correct the mapping for
> the final 6 interrupts. This prevents the TKE from requesting the RTC
> interrupt (along with several GTE and watchdog interrupts).
> 
> Reported-by: Shubhi Garg <shgarg@nvidia.com>
> Fixes: 28d860ed02c2 ("arm64: tegra: Enable native timers on Tegra234")
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
>   arch/arm64/boot/dts/nvidia/tegra234.dtsi | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
> index 7cf31862d68b..cc11cfe34edb 100644
> --- a/arch/arm64/boot/dts/nvidia/tegra234.dtsi
> +++ b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
> @@ -43,12 +43,12 @@ timer@2080000 {
>   				     <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
>   				     <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
>   				     <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
> -				     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
> -				     <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
> -				     <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
> -				     <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
> -				     <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
> -				     <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
> +				     <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 257 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 258 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 259 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
>   			status = "okay";
>   		};
>   

Thanks!

Reviewed-by: Jon Hunter <jonathanh@nvidia.com>

Jon
Thierry Reding Oct. 13, 2023, 12:43 p.m. UTC | #2
From: Thierry Reding <treding@nvidia.com>


On Thu, 12 Oct 2023 14:43:11 +0200, Thierry Reding wrote:
> The shared interrupts 0-9 of the TKE are mapped to interrupts 0-9, but
> shared interrupts 10-15 are mapped to 256-261. Correct the mapping for
> the final 6 interrupts. This prevents the TKE from requesting the RTC
> interrupt (along with several GTE and watchdog interrupts).
> 
> 

Applied, thanks!

[1/1] arm64: tegra: Use correct interrupts for Tegra234 TKE
      commit: c0b80988eb78d6423249ab530bfbc6b238790a26

Best regards,
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
index 7cf31862d68b..cc11cfe34edb 100644
--- a/arch/arm64/boot/dts/nvidia/tegra234.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
@@ -43,12 +43,12 @@  timer@2080000 {
 				     <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+				     <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 257 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 258 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 259 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
 			status = "okay";
 		};