| Message ID | 1432657876-1362-7-git-send-email-mark.rutland@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, May 26, 2015 at 05:31:16PM +0100, Mark Rutland wrote: > The A57 and A53 PMUs in Juno support different events, so describe them > separately. > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > Cc: Liviu Dudau <liviu.dudau@arm.com> > Cc: Will Deacon <will.deacon@arm.com> Hi Mark, Arnd has pulled my patches that add juno-r1.dts to the mix and he is going to send a pull request for v4.2. Care to respin this patch to add support for Juno R1 as well? Best regards, Liviu > --- > arch/arm64/boot/dts/arm/juno.dts | 18 +++++++++++------- > 1 file changed, 11 insertions(+), 7 deletions(-) > > diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts > index 5e9110a..015be74 100644 > --- a/arch/arm64/boot/dts/arm/juno.dts > +++ b/arch/arm64/boot/dts/arm/juno.dts > @@ -118,17 +118,21 @@ > <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(6) | IRQ_TYPE_LEVEL_LOW)>; > }; > > - pmu { > - compatible = "arm,armv8-pmuv3"; > + pmu_a57 { > + compatible = "arm,cortex-a57-pmu"; > interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>, > - <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>, > - <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-affinity = <&A57_0>, > + <&A57_1>; > + }; > + > + pmu_a53 { > + compatible = "arm,cortex-a53-pmu"; > + interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; > - interrupt-affinity = <&A57_0>, > - <&A57_1>, > - <&A53_0>, > + interrupt-affinity = <&A53_0>, > <&A53_1>, > <&A53_2>, > <&A53_3>; > -- > 1.9.1 >
On Tue, Jun 02, 2015 at 11:47:43AM +0100, Liviu Dudau wrote: > On Tue, May 26, 2015 at 05:31:16PM +0100, Mark Rutland wrote: > > The A57 and A53 PMUs in Juno support different events, so describe them > > separately. > > > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > > Cc: Liviu Dudau <liviu.dudau@arm.com> > > Cc: Will Deacon <will.deacon@arm.com> > > Hi Mark, > > Arnd has pulled my patches that add juno-r1.dts to the mix and he is going > to send a pull request for v4.2. Care to respin this patch to add support > for Juno R1 as well? Sure. Is there a branch out there with just the juno DT patch(es) in? The DT patch only makes sense after the code changes, and those are currently based on Will's perf/updates branch (atop of v4.1-rc1), which doesn't have the DT changes. Mark.
On Wed, Jun 10, 2015 at 10:25:36AM +0100, Mark Rutland wrote: > On Tue, Jun 02, 2015 at 11:47:43AM +0100, Liviu Dudau wrote: > > On Tue, May 26, 2015 at 05:31:16PM +0100, Mark Rutland wrote: > > > The A57 and A53 PMUs in Juno support different events, so describe them > > > separately. > > > > > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > > > Cc: Liviu Dudau <liviu.dudau@arm.com> > > > Cc: Will Deacon <will.deacon@arm.com> > > > > Hi Mark, > > > > Arnd has pulled my patches that add juno-r1.dts to the mix and he is going > > to send a pull request for v4.2. Care to respin this patch to add support > > for Juno R1 as well? > > Sure. Is there a branch out there with just the juno DT patch(es) in? Yes, git://linux-arm.org/linux-ld.git for-upstream/juno-dts > > The DT patch only makes sense after the code changes, and those are > currently based on Will's perf/updates branch (atop of v4.1-rc1), which > doesn't have the DT changes. Not sure I parse what you meant here. Best regards, Liviu > > Mark. >
On Thu, Jun 11, 2015 at 11:31:44AM +0100, Liviu Dudau wrote: > On Wed, Jun 10, 2015 at 10:25:36AM +0100, Mark Rutland wrote: > > On Tue, Jun 02, 2015 at 11:47:43AM +0100, Liviu Dudau wrote: > > > On Tue, May 26, 2015 at 05:31:16PM +0100, Mark Rutland wrote: > > > > The A57 and A53 PMUs in Juno support different events, so describe them > > > > separately. > > > > > > > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > > > > Cc: Liviu Dudau <liviu.dudau@arm.com> > > > > Cc: Will Deacon <will.deacon@arm.com> > > > > > > Hi Mark, > > > > > > Arnd has pulled my patches that add juno-r1.dts to the mix and he is going > > > to send a pull request for v4.2. Care to respin this patch to add support > > > for Juno R1 as well? > > > > Sure. Is there a branch out there with just the juno DT patch(es) in? > > Yes, git://linux-arm.org/linux-ld.git for-upstream/juno-dts Cheers! > > The DT patch only makes sense after the code changes, and those are > > currently based on Will's perf/updates branch (atop of v4.1-rc1), which > > doesn't have the DT changes. > > Not sure I parse what you meant here. My dts patch alone won't work with a current kernel (though a kernel with my perf patches will support existing and new DTBs). So my dts change shouldn't go through before the code change. I'd like to base the dts patch on a branch with both your existing dts changes and my perf code changes to ensure that. Thanks, Mark.
diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts index 5e9110a..015be74 100644 --- a/arch/arm64/boot/dts/arm/juno.dts +++ b/arch/arm64/boot/dts/arm/juno.dts @@ -118,17 +118,21 @@ <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(6) | IRQ_TYPE_LEVEL_LOW)>; }; - pmu { - compatible = "arm,armv8-pmuv3"; + pmu_a57 { + compatible = "arm,cortex-a57-pmu"; interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>; + interrupt-affinity = <&A57_0>, + <&A57_1>; + }; + + pmu_a53 { + compatible = "arm,cortex-a53-pmu"; + interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; - interrupt-affinity = <&A57_0>, - <&A57_1>, - <&A53_0>, + interrupt-affinity = <&A53_0>, <&A53_1>, <&A53_2>, <&A53_3>;
The A57 and A53 PMUs in Juno support different events, so describe them separately. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Liviu Dudau <liviu.dudau@arm.com> Cc: Will Deacon <will.deacon@arm.com> --- arch/arm64/boot/dts/arm/juno.dts | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)