Message ID | 1476238456-20420-1-git-send-email-jun.nie@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, Oct 12, 2016 at 10:14:15AM +0800, Jun Nie wrote: > GICR for multiple CPU can be described with start address and stride, > or with multiple address. Current multiple address and stride are > both used. Fix it. I think we need to tell the full story about this boot failure in commit log, i.e. it boots fine on v4.8-rc and fails on linux-next because of the mm/vmalloc.c changes. Shawn > > Signed-off-by: Jun Nie <jun.nie@linaro.org> > --- > arch/arm64/boot/dts/zte/zx296718.dtsi | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/boot/dts/zte/zx296718.dtsi b/arch/arm64/boot/dts/zte/zx296718.dtsi > index a223066..6b239a3 100644 > --- a/arch/arm64/boot/dts/zte/zx296718.dtsi > +++ b/arch/arm64/boot/dts/zte/zx296718.dtsi > @@ -239,16 +239,11 @@ > compatible = "arm,gic-v3"; > #interrupt-cells = <3>; > #address-cells = <0>; > - #redistributor-regions = <6>; > - redistributor-stride = <0x0 0x40000>; > + #redistributor-regions = <1>; > + redistributor-stride = <0x20000>; > interrupt-controller; > reg = <0x02a00000 0x10000>, > - <0x02b00000 0x20000>, > - <0x02b20000 0x20000>, > - <0x02b40000 0x20000>, > - <0x02b60000 0x20000>, > - <0x02b80000 0x20000>, > - <0x02ba0000 0x20000>; > + <0x02b00000 0xc0000>; > interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; > }; > > -- > 1.9.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/arch/arm64/boot/dts/zte/zx296718.dtsi b/arch/arm64/boot/dts/zte/zx296718.dtsi index a223066..6b239a3 100644 --- a/arch/arm64/boot/dts/zte/zx296718.dtsi +++ b/arch/arm64/boot/dts/zte/zx296718.dtsi @@ -239,16 +239,11 @@ compatible = "arm,gic-v3"; #interrupt-cells = <3>; #address-cells = <0>; - #redistributor-regions = <6>; - redistributor-stride = <0x0 0x40000>; + #redistributor-regions = <1>; + redistributor-stride = <0x20000>; interrupt-controller; reg = <0x02a00000 0x10000>, - <0x02b00000 0x20000>, - <0x02b20000 0x20000>, - <0x02b40000 0x20000>, - <0x02b60000 0x20000>, - <0x02b80000 0x20000>, - <0x02ba0000 0x20000>; + <0x02b00000 0xc0000>; interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; };
GICR for multiple CPU can be described with start address and stride, or with multiple address. Current multiple address and stride are both used. Fix it. Signed-off-by: Jun Nie <jun.nie@linaro.org> --- arch/arm64/boot/dts/zte/zx296718.dtsi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)