| Message ID | 1467358570-24417-3-git-send-email-wxt@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jul 01, 2016 at 03:36:10PM +0800, Caesar Wang wrote: > As the Marc posted the patches [0] to support Partitioning per-cpu > interrupts. Let's add this patch to match it on rk3399 SoCs. > > [0]: > https://lkml.org/lkml/2016/4/11/182 The core IRQ support is merged, but it's worth noting that the perf code doesn't use it yet. So we still need a patch adding support to the perf code before we can change the dts. I think Marc had a prototype of that somewhere. Marc? > Signed-off-by: Caesar Wang <wxt@rock-chips.com> > Cc: Heiko Stuebner <heiko@sntech.de> > Cc: Will Deacon <will.deacon@arm.com> > Cc: Marc Zyngier <marc.zyngier@arm.com> > CC: linux-arm-kernel@lists.infradead.org > > --- > > arch/arm64/boot/dts/rockchip/rk3399.dtsi | 26 ++++++++++++++++++++++++++ > 1 file changed, 26 insertions(+) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi > index 8f0a069..b260f62 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi > @@ -165,6 +165,22 @@ > <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW 0>; > }; > > + pmu_a53 { > + compatible = "arm,cortex-a53-pmu"; > + interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW &part0>; > + interrupt-affinity = <&cpu_l0>, > + <&cpu_l1>, > + <&cpu_l2>, > + <&cpu_l3>; > + }; I'm not keen on having to redundantly describe the affinity in interrupt-affinity and the partition's affinity property. Those will almost certainly be out-of-sync in some DTs, and it'll be very painful to deal with. I think that for partitioned PPIs the PMU driver should use the affinity from the PPI, and not have an interrupt-affinity property. Hopefully that's relatively simple to handle. Thanks, Mark. > + > + pmu_a72 { > + compatible = "arm,cortex-a72-pmu"; > + interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW &part1>; > + interrupt-affinity = <&cpu_b0>, > + <&cpu_b1>; > + }; > + > xin24m: xin24m { > compatible = "fixed-clock"; > clock-frequency = <24000000>; > @@ -296,6 +312,16 @@ > msi-controller; > reg = <0x0 0xfee20000 0x0 0x20000>; > }; > + > + ppi-partitions { > + part0: interrupt-partition-0 { > + affinity = <&cpu_l0 &cpu_l1 &cpu_l2 &cpu_l3>; > + }; > + > + part1: interrupt-partition-1 { > + affinity = <&cpu_b0 &cpu_b1>; > + }; > + }; > }; > > i2c1: i2c@ff110000 { > -- > 1.9.1 >
On 01/07/16 11:26, Mark Rutland wrote: > On Fri, Jul 01, 2016 at 03:36:10PM +0800, Caesar Wang wrote: >> As the Marc posted the patches [0] to support Partitioning per-cpu >> interrupts. Let's add this patch to match it on rk3399 SoCs. >> >> [0]: >> https://lkml.org/lkml/2016/4/11/182 > > The core IRQ support is merged, but it's worth noting that the perf code > doesn't use it yet. So we still need a patch adding support to the perf > code before we can change the dts. > > I think Marc had a prototype of that somewhere. > > Marc? I posted something in the original discussion, but need to respin it. Stay tuned. Thanks, M.
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 8f0a069..b260f62 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -165,6 +165,22 @@ <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW 0>; }; + pmu_a53 { + compatible = "arm,cortex-a53-pmu"; + interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW &part0>; + interrupt-affinity = <&cpu_l0>, + <&cpu_l1>, + <&cpu_l2>, + <&cpu_l3>; + }; + + pmu_a72 { + compatible = "arm,cortex-a72-pmu"; + interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW &part1>; + interrupt-affinity = <&cpu_b0>, + <&cpu_b1>; + }; + xin24m: xin24m { compatible = "fixed-clock"; clock-frequency = <24000000>; @@ -296,6 +312,16 @@ msi-controller; reg = <0x0 0xfee20000 0x0 0x20000>; }; + + ppi-partitions { + part0: interrupt-partition-0 { + affinity = <&cpu_l0 &cpu_l1 &cpu_l2 &cpu_l3>; + }; + + part1: interrupt-partition-1 { + affinity = <&cpu_b0 &cpu_b1>; + }; + }; }; i2c1: i2c@ff110000 {
As the Marc posted the patches [0] to support Partitioning per-cpu interrupts. Let's add this patch to match it on rk3399 SoCs. [0]: https://lkml.org/lkml/2016/4/11/182 Signed-off-by: Caesar Wang <wxt@rock-chips.com> Cc: Heiko Stuebner <heiko@sntech.de> Cc: Will Deacon <will.deacon@arm.com> Cc: Marc Zyngier <marc.zyngier@arm.com> CC: linux-arm-kernel@lists.infradead.org --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)