* [PATCH] arm64: dts: rockchip: Re-add interrupt-names for RK3399's vpu
@ 2021-08-22 11:57 Alex Bee
2021-08-22 14:37 ` Ezequiel Garcia
2021-08-23 18:42 ` Heiko Stuebner
0 siblings, 2 replies; 6+ messages in thread
From: Alex Bee @ 2021-08-22 11:57 UTC (permalink / raw)
To: Heiko Stuebner
Cc: Rob Herring, Johan Jonker, linux-arm-kernel, linux-rockchip,
linux-kernel, Alex Bee
Commit a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
intended to remove the interrupt-names property for mmu nodes, but it
also removed it for the vpu node in rk3399.dtsi. That makes the driver
fail probing currently.
Fix this by re-adding the property for this node.
Fixes: a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
Signed-off-by: Alex Bee <knaerzche@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 9db9484ca38f..44def886b391 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1240,6 +1240,7 @@ vpu: video-codec@ff650000 {
reg = <0x0 0xff650000 0x0 0x800>;
interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH 0>,
<GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH 0>;
+ interrupt-names = "vepu", "vdpu";
clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
clock-names = "aclk", "hclk";
iommus = <&vpu_mmu>;
base-commit: 5936c9eb785b46fdc5563d1c5c34b5558e3fa156
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] arm64: dts: rockchip: Re-add interrupt-names for RK3399's vpu
2021-08-22 11:57 [PATCH] arm64: dts: rockchip: Re-add interrupt-names for RK3399's vpu Alex Bee
@ 2021-08-22 14:37 ` Ezequiel Garcia
2021-08-22 20:25 ` Heiko Stuebner
2021-08-23 18:42 ` Heiko Stuebner
1 sibling, 1 reply; 6+ messages in thread
From: Ezequiel Garcia @ 2021-08-22 14:37 UTC (permalink / raw)
To: Alex Bee
Cc: Heiko Stuebner, Rob Herring, Johan Jonker, linux-arm-kernel,
open list:ARM/Rockchip SoC..., Linux Kernel Mailing List
Hi Alex, Heiko,
On Sun, 22 Aug 2021 at 08:58, Alex Bee <knaerzche@gmail.com> wrote:
>
> Commit a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
> intended to remove the interrupt-names property for mmu nodes, but it
> also removed it for the vpu node in rk3399.dtsi. That makes the driver
> fail probing currently.
> Fix this by re-adding the property for this node.
>
> Fixes: a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
AFAICS a728c10dd62a removed lots of interrupt-names properties
from devices other than IOMMU.
Maybe it's best to revert it?
Thanks,
Ezequiel
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] arm64: dts: rockchip: Re-add interrupt-names for RK3399's vpu
2021-08-22 14:37 ` Ezequiel Garcia
@ 2021-08-22 20:25 ` Heiko Stuebner
2021-08-22 21:24 ` Alex Bee
2021-08-23 13:29 ` Ezequiel Garcia
0 siblings, 2 replies; 6+ messages in thread
From: Heiko Stuebner @ 2021-08-22 20:25 UTC (permalink / raw)
To: Alex Bee, Ezequiel Garcia
Cc: Rob Herring, Johan Jonker, linux-arm-kernel,
open list:ARM/Rockchip SoC..., Linux Kernel Mailing List
Hi,
Am Sonntag, 22. August 2021, 16:37:24 CEST schrieb Ezequiel Garcia:
> Hi Alex, Heiko,
>
> On Sun, 22 Aug 2021 at 08:58, Alex Bee <knaerzche@gmail.com> wrote:
> >
> > Commit a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
> > intended to remove the interrupt-names property for mmu nodes, but it
> > also removed it for the vpu node in rk3399.dtsi. That makes the driver
> > fail probing currently.
> > Fix this by re-adding the property for this node.
> >
> > Fixes: a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
>
> AFAICS a728c10dd62a removed lots of interrupt-names properties
> from devices other than IOMMU.
>
> Maybe it's best to revert it?
where did you see more mistakes in it?
I.e. first of all, at least when grepping through my kernel history, I only see
commit 53a05c8f6e8e ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
with a different hash and at least there I see a lot of iommu interrupt removals
and this one line removing the vpu irqs in error.
So from my glance at it, applying Alex' patch should solve the issue?
Heiko
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] arm64: dts: rockchip: Re-add interrupt-names for RK3399's vpu
2021-08-22 20:25 ` Heiko Stuebner
@ 2021-08-22 21:24 ` Alex Bee
2021-08-23 13:29 ` Ezequiel Garcia
1 sibling, 0 replies; 6+ messages in thread
From: Alex Bee @ 2021-08-22 21:24 UTC (permalink / raw)
To: Heiko Stuebner, Ezequiel Garcia
Cc: Rob Herring, Johan Jonker, linux-arm-kernel,
open list:ARM/Rockchip SoC..., Linux Kernel Mailing List
Hi Heiko, Hi Ezequiel,
Am 22.08.21 um 22:25 schrieb Heiko Stuebner:
> Hi,
>
> Am Sonntag, 22. August 2021, 16:37:24 CEST schrieb Ezequiel Garcia:
>> Hi Alex, Heiko,
>>
>> On Sun, 22 Aug 2021 at 08:58, Alex Bee <knaerzche@gmail.com> wrote:
>>> Commit a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
>>> intended to remove the interrupt-names property for mmu nodes, but it
>>> also removed it for the vpu node in rk3399.dtsi. That makes the driver
>>> fail probing currently.
>>> Fix this by re-adding the property for this node.
>>>
>>> Fixes: a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
>> AFAICS a728c10dd62a removed lots of interrupt-names properties
>> from devices other than IOMMU.
>>
>> Maybe it's best to revert it?
> where did you see more mistakes in it?
Yes, all the other removals in that commit are for iommu nodes.
>
> I.e. first of all, at least when grepping through my kernel history, I only see
> commit 53a05c8f6e8e ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
Oops, yes: I took the commit id of my local tree: could you please fix
the commit message with the correct id, before applying?
Thanks,
Alex
> with a different hash and at least there I see a lot of iommu interrupt removals
> and this one line removing the vpu irqs in error.
>
> So from my glance at it, applying Alex' patch should solve the issue?
>
> Heiko
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] arm64: dts: rockchip: Re-add interrupt-names for RK3399's vpu
2021-08-22 20:25 ` Heiko Stuebner
2021-08-22 21:24 ` Alex Bee
@ 2021-08-23 13:29 ` Ezequiel Garcia
1 sibling, 0 replies; 6+ messages in thread
From: Ezequiel Garcia @ 2021-08-23 13:29 UTC (permalink / raw)
To: Heiko Stuebner
Cc: Alex Bee, Rob Herring, Johan Jonker, linux-arm-kernel,
open list:ARM/Rockchip SoC..., Linux Kernel Mailing List
On Sun, 22 Aug 2021 at 17:25, Heiko Stuebner <heiko@sntech.de> wrote:
>
> Hi,
>
> Am Sonntag, 22. August 2021, 16:37:24 CEST schrieb Ezequiel Garcia:
> > Hi Alex, Heiko,
> >
> > On Sun, 22 Aug 2021 at 08:58, Alex Bee <knaerzche@gmail.com> wrote:
> > >
> > > Commit a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
> > > intended to remove the interrupt-names property for mmu nodes, but it
> > > also removed it for the vpu node in rk3399.dtsi. That makes the driver
> > > fail probing currently.
> > > Fix this by re-adding the property for this node.
> > >
> > > Fixes: a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
> >
> > AFAICS a728c10dd62a removed lots of interrupt-names properties
> > from devices other than IOMMU.
> >
> > Maybe it's best to revert it?
>
> where did you see more mistakes in it?
>
> I.e. first of all, at least when grepping through my kernel history, I only see
> commit 53a05c8f6e8e ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
> with a different hash and at least there I see a lot of iommu interrupt removals
> and this one line removing the vpu irqs in error.
>
> So from my glance at it, applying Alex' patch should solve the issue?
>
Ah, seems you are right. Sorry for the noise!
Thanks,
Ezequiel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] arm64: dts: rockchip: Re-add interrupt-names for RK3399's vpu
2021-08-22 11:57 [PATCH] arm64: dts: rockchip: Re-add interrupt-names for RK3399's vpu Alex Bee
2021-08-22 14:37 ` Ezequiel Garcia
@ 2021-08-23 18:42 ` Heiko Stuebner
1 sibling, 0 replies; 6+ messages in thread
From: Heiko Stuebner @ 2021-08-23 18:42 UTC (permalink / raw)
To: Alex Bee
Cc: Heiko Stuebner, linux-arm-kernel, linux-kernel, Johan Jonker,
linux-rockchip, Rob Herring
On Sun, 22 Aug 2021 13:57:55 +0200, Alex Bee wrote:
> Commit a728c10dd62a ("arm64: dts: rockchip: remove interrupt-names from iommu nodes")
> intended to remove the interrupt-names property for mmu nodes, but it
> also removed it for the vpu node in rk3399.dtsi. That makes the driver
> fail probing currently.
> Fix this by re-adding the property for this node.
Applied, thanks!
[1/1] arm64: dts: rockchip: Re-add interrupt-names for RK3399's vpu
commit: 6b9b7968ff78d5b9a079da2f8decba873af54192
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-08-23 18:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-22 11:57 [PATCH] arm64: dts: rockchip: Re-add interrupt-names for RK3399's vpu Alex Bee
2021-08-22 14:37 ` Ezequiel Garcia
2021-08-22 20:25 ` Heiko Stuebner
2021-08-22 21:24 ` Alex Bee
2021-08-23 13:29 ` Ezequiel Garcia
2021-08-23 18:42 ` Heiko Stuebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox