]> www.infradead.org Git - users/hch/misc.git/commitdiff
arm64: dts: rockchip: adjust SMMU interrupt type on rk3588
authorPatrick Wildt <patrick@blueri.se>
Mon, 10 Feb 2025 21:37:29 +0000 (22:37 +0100)
committerHeiko Stuebner <heiko@sntech.de>
Tue, 11 Feb 2025 20:28:13 +0000 (21:28 +0100)
The SMMU architecture requires wired interrupts to be edge triggered,
which does not align with the DT description for the RK3588.  This leads
to interrupt storms, as the SMMU continues to hold the pin high and only
pulls it down for a short amount when issuing an IRQ.  Update the DT
description to be in line with the spec and perceived reality.

Signed-off-by: Patrick Wildt <patrick@blueri.se>
Fixes: cd81d3a0695c ("arm64: dts: rockchip: add rk3588 pcie and php IOMMUs")
Reviewed-by: Niklas Cassel <cassel@kernel.org>
Link: https://lore.kernel.org/r/Z6pxme2Chmf3d3uK@windev.fritz.box
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
arch/arm64/boot/dts/rockchip/rk3588-base.dtsi

index 978de506d4348e4cf91a0f4c1e78944ea138047c..c3abdfb04f8f4a14540d55c6ba79929c83e973b2 100644 (file)
        mmu600_pcie: iommu@fc900000 {
                compatible = "arm,smmu-v3";
                reg = <0x0 0xfc900000 0x0 0x200000>;
-               interrupts = <GIC_SPI 369 IRQ_TYPE_LEVEL_HIGH 0>,
-                            <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH 0>,
-                            <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH 0>,
-                            <GIC_SPI 367 IRQ_TYPE_LEVEL_HIGH 0>;
+               interrupts = <GIC_SPI 369 IRQ_TYPE_EDGE_RISING 0>,
+                            <GIC_SPI 371 IRQ_TYPE_EDGE_RISING 0>,
+                            <GIC_SPI 374 IRQ_TYPE_EDGE_RISING 0>,
+                            <GIC_SPI 367 IRQ_TYPE_EDGE_RISING 0>;
                interrupt-names = "eventq", "gerror", "priq", "cmdq-sync";
                #iommu-cells = <1>;
        };
        mmu600_php: iommu@fcb00000 {
                compatible = "arm,smmu-v3";
                reg = <0x0 0xfcb00000 0x0 0x200000>;
-               interrupts = <GIC_SPI 381 IRQ_TYPE_LEVEL_HIGH 0>,
-                            <GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH 0>,
-                            <GIC_SPI 386 IRQ_TYPE_LEVEL_HIGH 0>,
-                            <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH 0>;
+               interrupts = <GIC_SPI 381 IRQ_TYPE_EDGE_RISING 0>,
+                            <GIC_SPI 383 IRQ_TYPE_EDGE_RISING 0>,
+                            <GIC_SPI 386 IRQ_TYPE_EDGE_RISING 0>,
+                            <GIC_SPI 379 IRQ_TYPE_EDGE_RISING 0>;
                interrupt-names = "eventq", "gerror", "priq", "cmdq-sync";
                #iommu-cells = <1>;
                status = "disabled";