Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Heiko Stuebner]

Am Montag, 24. Juli 2017, 10:32:07 CEST schrieb Simon Xue:
> Add H265e/VEPU/VPU/VDEC/VOP iommu nodes
> 
> Signed-off-by: Simon Xue 

applied for 4.14 (after adapting the subject a bit)


Thanks
Heiko

Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Heiko Stuebner]

Am Montag, 24. Juli 2017, 10:32:07 CEST schrieb Simon Xue:
> Add H265e/VEPU/VPU/VDEC/VOP iommu nodes
> 
> Signed-off-by: Simon Xue 

applied for 4.14 (after adapting the subject a bit)


Thanks
Heiko

Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Joerg Roedel]

On Thu, Jul 27, 2017 at 02:26:26PM +0200, Heiko Stübner wrote:
> Am Donnerstag, 27. Juli 2017, 14:15:18 CEST schrieb Joerg Roedel:
> > ARM64: dts: rockchip: rk3328 add iommu nodes
> > ARM: dts: rockchip: rk322x add iommu nodes
> > ARM64: dts: rockchip: rk3368 add iommu nodes
> > ARM64: dts: rockchip: rk3399 add iommu nodes
> > ARM64: dts: rockchip: rk3328 add iommu nodes
> > ARM: dts: rockchip: rk322x add iommu nodes
> > ARM64: dts: rockchip: rk3368 add iommu nodes
> > ARM64: dts: rockchip: rk3399 add iommu nodes

> Interestingly it seems you had the dts patches 2 times each
> likely from v1 and v2. But they're gone now, so all good :-)

Heh, you are right, I got confused by all these rk numbers and
thought it were patch-sets for different hardware :-)

Even more interesting that they applied almost cleanly.


Joerg

Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Joerg Roedel]

On Thu, Jul 27, 2017 at 02:26:26PM +0200, Heiko Stübner wrote:
> Am Donnerstag, 27. Juli 2017, 14:15:18 CEST schrieb Joerg Roedel:
> > ARM64: dts: rockchip: rk3328 add iommu nodes
> > ARM: dts: rockchip: rk322x add iommu nodes
> > ARM64: dts: rockchip: rk3368 add iommu nodes
> > ARM64: dts: rockchip: rk3399 add iommu nodes
> > ARM64: dts: rockchip: rk3328 add iommu nodes
> > ARM: dts: rockchip: rk322x add iommu nodes
> > ARM64: dts: rockchip: rk3368 add iommu nodes
> > ARM64: dts: rockchip: rk3399 add iommu nodes

> Interestingly it seems you had the dts patches 2 times each
> likely from v1 and v2. But they're gone now, so all good :-)

Heh, you are right, I got confused by all these rk numbers and
thought it were patch-sets for different hardware :-)

Even more interesting that they applied almost cleanly.


Joerg

Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Heiko Stübner]

Hi Joerg,

Am Donnerstag, 27. Juli 2017, 14:15:18 CEST schrieb Joerg Roedel:
> Hey Heiko,
> 
> On Wed, Jul 26, 2017 at 03:53:06PM +0200, Heiko Stübner wrote:
> > Having code and dts changes go through different trees is no problem, as
> > they don't have a compile-time dependencies on each other and come
> > together nicely in linux-next again.
> 
> Okay, I removed
> 
> ARM64: dts: rockchip: rk3328 add iommu nodes
> ARM: dts: rockchip: rk322x add iommu nodes
> ARM64: dts: rockchip: rk3368 add iommu nodes
> ARM64: dts: rockchip: rk3399 add iommu nodes
> ARM64: dts: rockchip: rk3328 add iommu nodes
> ARM: dts: rockchip: rk322x add iommu nodes
> ARM64: dts: rockchip: rk3368 add iommu nodes
> ARM64: dts: rockchip: rk3399 add iommu nodes
>
> from my tree again and kept
> 
> Docs: dt: rockchip: add rockchip,disable-mmu-reset property
> iommu/rockchip: add multi irqs support
> iommu/rockchip: ignore isp mmu reset operation

great, thanks.

Interestingly it seems you had the dts patches 2 times each
likely from v1 and v2. But they're gone now, so all good :-)


Heiko

Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Heiko Stübner]

Hi Joerg,

Am Donnerstag, 27. Juli 2017, 14:15:18 CEST schrieb Joerg Roedel:
> Hey Heiko,
> 
> On Wed, Jul 26, 2017 at 03:53:06PM +0200, Heiko Stübner wrote:
> > Having code and dts changes go through different trees is no problem, as
> > they don't have a compile-time dependencies on each other and come
> > together nicely in linux-next again.
> 
> Okay, I removed
> 
> ARM64: dts: rockchip: rk3328 add iommu nodes
> ARM: dts: rockchip: rk322x add iommu nodes
> ARM64: dts: rockchip: rk3368 add iommu nodes
> ARM64: dts: rockchip: rk3399 add iommu nodes
> ARM64: dts: rockchip: rk3328 add iommu nodes
> ARM: dts: rockchip: rk322x add iommu nodes
> ARM64: dts: rockchip: rk3368 add iommu nodes
> ARM64: dts: rockchip: rk3399 add iommu nodes
>
> from my tree again and kept
> 
> Docs: dt: rockchip: add rockchip,disable-mmu-reset property
> iommu/rockchip: add multi irqs support
> iommu/rockchip: ignore isp mmu reset operation

great, thanks.

Interestingly it seems you had the dts patches 2 times each
likely from v1 and v2. But they're gone now, so all good :-)


Heiko

Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Joerg Roedel]

Hey Heiko,

On Wed, Jul 26, 2017 at 03:53:06PM +0200, Heiko Stübner wrote:
> Having code and dts changes go through different trees is no problem, as they 
> don't have a compile-time dependencies on each other and come together nicely 
> in linux-next again.

Okay, I removed

ARM64: dts: rockchip: rk3328 add iommu nodes
ARM: dts: rockchip: rk322x add iommu nodes
ARM64: dts: rockchip: rk3368 add iommu nodes
ARM64: dts: rockchip: rk3399 add iommu nodes
ARM64: dts: rockchip: rk3328 add iommu nodes
ARM: dts: rockchip: rk322x add iommu nodes
ARM64: dts: rockchip: rk3368 add iommu nodes
ARM64: dts: rockchip: rk3399 add iommu nodes

from my tree again and kept

Docs: dt: rockchip: add rockchip,disable-mmu-reset property
iommu/rockchip: add multi irqs support
iommu/rockchip: ignore isp mmu reset operation


Regards,

Joerg

Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Joerg Roedel]

Hey Heiko,

On Wed, Jul 26, 2017 at 03:53:06PM +0200, Heiko Stübner wrote:
> Having code and dts changes go through different trees is no problem, as they 
> don't have a compile-time dependencies on each other and come together nicely 
> in linux-next again.

Okay, I removed

ARM64: dts: rockchip: rk3328 add iommu nodes
ARM: dts: rockchip: rk322x add iommu nodes
ARM64: dts: rockchip: rk3368 add iommu nodes
ARM64: dts: rockchip: rk3399 add iommu nodes
ARM64: dts: rockchip: rk3328 add iommu nodes
ARM: dts: rockchip: rk322x add iommu nodes
ARM64: dts: rockchip: rk3368 add iommu nodes
ARM64: dts: rockchip: rk3399 add iommu nodes

from my tree again and kept

Docs: dt: rockchip: add rockchip,disable-mmu-reset property
iommu/rockchip: add multi irqs support
iommu/rockchip: ignore isp mmu reset operation


Regards,

Joerg

Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Heiko Stübner]

Hi Joerg,

Am Mittwoch, 26. Juli 2017, 14:27:53 CEST schrieb Joerg Roedel:
> On Wed, Jul 26, 2017 at 01:44:02PM +0200, Heiko Stübner wrote:
> > I really would prefer iommu dt-nodes going through my tree :-)
> > 
> > Especially as parts of these conflict with already pending patches for
> > graphics support and with the iommu nodes sitting in your tree these
> > would need to wait another kernel release.
> 
> Sure, no problem. I have nothing pushed yet, so it's easy to remove
> again. Do you want to take all three patch-sets from Simon through your
> tree or just this one?

no, I'm of course fine with (and even very much in favor of) iommu-code
going through your tree :-) . I just want to keep the devicetree changes
together to prevent conflicts (and unnecessary wait times).

Having code and dts changes go through different trees is no problem, as they 
don't have a compile-time dependencies on each other and come together nicely 
in linux-next again.


Heiko

Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Heiko Stübner]

Hi Joerg,

Am Mittwoch, 26. Juli 2017, 14:27:53 CEST schrieb Joerg Roedel:
> On Wed, Jul 26, 2017 at 01:44:02PM +0200, Heiko Stübner wrote:
> > I really would prefer iommu dt-nodes going through my tree :-)
> > 
> > Especially as parts of these conflict with already pending patches for
> > graphics support and with the iommu nodes sitting in your tree these
> > would need to wait another kernel release.
> 
> Sure, no problem. I have nothing pushed yet, so it's easy to remove
> again. Do you want to take all three patch-sets from Simon through your
> tree or just this one?

no, I'm of course fine with (and even very much in favor of) iommu-code
going through your tree :-) . I just want to keep the devicetree changes
together to prevent conflicts (and unnecessary wait times).

Having code and dts changes go through different trees is no problem, as they 
don't have a compile-time dependencies on each other and come together nicely 
in linux-next again.


Heiko

Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Joerg Roedel]

Hey Heiko,

On Wed, Jul 26, 2017 at 01:44:02PM +0200, Heiko Stübner wrote:
> I really would prefer iommu dt-nodes going through my tree :-)
> 
> Especially as parts of these conflict with already pending patches for
> graphics support and with the iommu nodes sitting in your tree these
> would need to wait another kernel release.

Sure, no problem. I have nothing pushed yet, so it's easy to remove
again. Do you want to take all three patch-sets from Simon through your
tree or just this one?


Regards,

Joerg

Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Joerg Roedel]

Hey Heiko,

On Wed, Jul 26, 2017 at 01:44:02PM +0200, Heiko Stübner wrote:
> I really would prefer iommu dt-nodes going through my tree :-)
> 
> Especially as parts of these conflict with already pending patches for
> graphics support and with the iommu nodes sitting in your tree these
> would need to wait another kernel release.

Sure, no problem. I have nothing pushed yet, so it's easy to remove
again. Do you want to take all three patch-sets from Simon through your
tree or just this one?


Regards,

Joerg

Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Heiko Stübner]

Hi Joerg,

Am Mittwoch, 26. Juli 2017, 12:58:19 CEST schrieb Joerg Roedel:
> On Mon, Jul 24, 2017 at 10:32:07AM +0800, Simon Xue wrote:
> > Add H265e/VEPU/VPU/VDEC/VOP iommu nodes
> > 
> > Signed-off-by: Simon Xue 
> > ---
> > 
> > changes since V2:
> >  - none
> >  
> >  arch/arm64/boot/dts/rockchip/rk3328.dtsi | 45
> >   1 file changed, 45 insertions(+)
> 
> Applied all, thanks.

I really would prefer iommu dt-nodes going through my tree :-)

Especially as parts of these conflict with already pending patches for
graphics support and with the iommu nodes sitting in your tree these
would need to wait another kernel release.


Heiko

Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Heiko Stübner]

Hi Joerg,

Am Mittwoch, 26. Juli 2017, 12:58:19 CEST schrieb Joerg Roedel:
> On Mon, Jul 24, 2017 at 10:32:07AM +0800, Simon Xue wrote:
> > Add H265e/VEPU/VPU/VDEC/VOP iommu nodes
> > 
> > Signed-off-by: Simon Xue 
> > ---
> > 
> > changes since V2:
> >  - none
> >  
> >  arch/arm64/boot/dts/rockchip/rk3328.dtsi | 45
> >   1 file changed, 45 insertions(+)
> 
> Applied all, thanks.

I really would prefer iommu dt-nodes going through my tree :-)

Especially as parts of these conflict with already pending patches for
graphics support and with the iommu nodes sitting in your tree these
would need to wait another kernel release.


Heiko

Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Joerg Roedel]

On Mon, Jul 24, 2017 at 10:32:07AM +0800, Simon Xue wrote:
> Add H265e/VEPU/VPU/VDEC/VOP iommu nodes
> 
> Signed-off-by: Simon Xue 
> ---
> changes since V2:
>  - none
> 
>  arch/arm64/boot/dts/rockchip/rk3328.dtsi | 45 
> 
>  1 file changed, 45 insertions(+)

Applied all, thanks.

Re: [PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Joerg Roedel]

On Mon, Jul 24, 2017 at 10:32:07AM +0800, Simon Xue wrote:
> Add H265e/VEPU/VPU/VDEC/VOP iommu nodes
> 
> Signed-off-by: Simon Xue 
> ---
> changes since V2:
>  - none
> 
>  arch/arm64/boot/dts/rockchip/rk3328.dtsi | 45 
> 
>  1 file changed, 45 insertions(+)

Applied all, thanks.

[PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Simon Xue]

Add H265e/VEPU/VPU/VDEC/VOP iommu nodes

Signed-off-by: Simon Xue 
---
changes since V2:
 - none

 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 45 
 1 file changed, 45 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi 
b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 0be96ce..bdd7711 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -320,6 +320,51 @@
status = "disabled";
};
 
+   h265e_mmu: iommu@ff330200 {
+   compatible = "rockchip,iommu";
+   reg = <0x0 0xff330200 0 0x100>;
+   interrupts = ;
+   interrupt-names = "h265e_mmu";
+   #iommu-cells = <0>;
+   status = "disabled";
+   };
+
+   vepu_mmu: iommu@ff340800 {
+   compatible = "rockchip,iommu";
+   reg = <0x0 0xff340800 0x0 0x40>;
+   interrupts = ;
+   interrupt-names = "vepu_mmu";
+   #iommu-cells = <0>;
+   status = "disabled";
+   };
+
+   vpu_mmu: iommu@ff350800 {
+   compatible = "rockchip,iommu";
+   reg = <0x0 0xff350800 0x0 0x40>;
+   interrupts = ;
+   interrupt-names = "vpu_mmu";
+   #iommu-cells = <0>;
+   status = "disabled";
+   };
+
+   rkvdec_mmu: iommu@ff360480 {
+   compatible = "rockchip,iommu";
+   reg = <0x0 0xff360480 0x0 0x40>, <0x0 0xff3604c0 0x0 0x40>;
+   interrupts = ;
+   interrupt-names = "rkvdec_mmu";
+   #iommu-cells = <0>;
+   status = "disabled";
+   };
+
+   vop_mmu: iommu@ff373f00 {
+   compatible = "rockchip,iommu";
+   reg = <0x0 0xff373f00 0x0 0x100>;
+   interrupts = ;
+   interrupt-names = "vop_mmu";
+   #iommu-cells = <0>;
+   status = "disabled";
+   };
+
cru: clock-controller@ff44 {
compatible = "rockchip,rk3328-cru", "rockchip,cru", "syscon";
reg = <0x0 0xff44 0x0 0x1000>;
-- 
1.9.1

[PATCH V3 1/4] ARM64: dts: rockchip: rk3328 add iommu nodes

[Simon Xue]

Add H265e/VEPU/VPU/VDEC/VOP iommu nodes

Signed-off-by: Simon Xue 
---
changes since V2:
 - none

 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 45 
 1 file changed, 45 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi 
b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 0be96ce..bdd7711 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -320,6 +320,51 @@
status = "disabled";
};
 
+   h265e_mmu: iommu@ff330200 {
+   compatible = "rockchip,iommu";
+   reg = <0x0 0xff330200 0 0x100>;
+   interrupts = ;
+   interrupt-names = "h265e_mmu";
+   #iommu-cells = <0>;
+   status = "disabled";
+   };
+
+   vepu_mmu: iommu@ff340800 {
+   compatible = "rockchip,iommu";
+   reg = <0x0 0xff340800 0x0 0x40>;
+   interrupts = ;
+   interrupt-names = "vepu_mmu";
+   #iommu-cells = <0>;
+   status = "disabled";
+   };
+
+   vpu_mmu: iommu@ff350800 {
+   compatible = "rockchip,iommu";
+   reg = <0x0 0xff350800 0x0 0x40>;
+   interrupts = ;
+   interrupt-names = "vpu_mmu";
+   #iommu-cells = <0>;
+   status = "disabled";
+   };
+
+   rkvdec_mmu: iommu@ff360480 {
+   compatible = "rockchip,iommu";
+   reg = <0x0 0xff360480 0x0 0x40>, <0x0 0xff3604c0 0x0 0x40>;
+   interrupts = ;
+   interrupt-names = "rkvdec_mmu";
+   #iommu-cells = <0>;
+   status = "disabled";
+   };
+
+   vop_mmu: iommu@ff373f00 {
+   compatible = "rockchip,iommu";
+   reg = <0x0 0xff373f00 0x0 0x100>;
+   interrupts = ;
+   interrupt-names = "vop_mmu";
+   #iommu-cells = <0>;
+   status = "disabled";
+   };
+
cru: clock-controller@ff44 {
compatible = "rockchip,rk3328-cru", "rockchip,cru", "syscon";
reg = <0x0 0xff44 0x0 0x1000>;
-- 
1.9.1