| Message ID | 1471906085-16682-4-git-send-email-john.stultz@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Aug 22, 2016 at 3:48 PM, John Stultz <john.stultz@linaro.org> wrote: > This patch reserves some memory in the DTS and sets up a > pstore device tree node to enable pstore support on HiKey. > > Cc: Kees Cook <keescook@chromium.org> > Cc: Guodong Xu <guodong.xu@linaro.org> > Cc: Haojian Zhuang <haojian.zhuang@linaro.org> > Cc: Wei Xu <xuwei5@hisilicon.com> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: devicetree@vger.kernel.org > Reviewed-by: Kees Cook <keescook@chromium.org> > Signed-off-by: John Stultz <john.stultz@linaro.org> I'm going through old emails -- did this get picked up by anyone? I don't see an "applied" reply or similar, though I could have easily missed it. :) -Kees > --- > arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 19 ++++++++++++++++++- > 1 file changed, 18 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts > index 4492a15..9508f28 100644 > --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts > +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts > @@ -32,6 +32,7 @@ > * 0x05f0,1000 - 0x05f0,1fff: Reboot reason > * 0x06df,f000 - 0x06df,ffff: Mailbox message data > * 0x0740,f000 - 0x0740,ffff: MCU firmware section > + * 0x21f0,0000 - 0x21ff,ffff: pstore/ramoops buffer > * 0x3e00,0000 - 0x3fff,ffff: OP-TEE > */ > memory@0 { > @@ -40,9 +41,25 @@ > <0x00000000 0x05f00000 0x00000000 0x00001000>, > <0x00000000 0x05f02000 0x00000000 0x00efd000>, > <0x00000000 0x06e00000 0x00000000 0x0060f000>, > - <0x00000000 0x07410000 0x00000000 0x36bf0000>; > + <0x00000000 0x07410000 0x00000000 0x1aaf0000>, > + <0x00000000 0x22000000 0x00000000 0x1c000000>; > }; > > + reserved-memory { > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; > + > + ramoops@0x21f00000 { > + compatible = "ramoops"; > + reg = <0x0 0x21f00000 0x0 0x00100000>; > + record-size = <0x00020000>; > + console-size = <0x00020000>; > + ftrace-size = <0x00020000>; > + }; > + }; > + > + > reboot-mode-syscon@5f01000 { > compatible = "syscon", "simple-mfd"; > reg = <0x0 0x05f01000 0x0 0x00001000>; > -- > 1.9.1 >
On Thu, Sep 8, 2016 at 5:12 PM, Kees Cook <keescook@chromium.org> wrote: > On Mon, Aug 22, 2016 at 3:48 PM, John Stultz <john.stultz@linaro.org> wrote: >> This patch reserves some memory in the DTS and sets up a >> pstore device tree node to enable pstore support on HiKey. >> >> Cc: Kees Cook <keescook@chromium.org> >> Cc: Guodong Xu <guodong.xu@linaro.org> >> Cc: Haojian Zhuang <haojian.zhuang@linaro.org> >> Cc: Wei Xu <xuwei5@hisilicon.com> >> Cc: Rob Herring <robh+dt@kernel.org> >> Cc: Mark Rutland <mark.rutland@arm.com> >> Cc: Catalin Marinas <catalin.marinas@arm.com> >> Cc: Will Deacon <will.deacon@arm.com> >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: devicetree@vger.kernel.org >> Reviewed-by: Kees Cook <keescook@chromium.org> >> Signed-off-by: John Stultz <john.stultz@linaro.org> > > I'm going through old emails -- did this get picked up by anyone? I > don't see an "applied" reply or similar, though I could have easily > missed it. :) Wei said he picked up the set, but it hasn't shown up in -next yet, as his tree isn't automatically pulled in apparently. thanks -john
Hi Kess and John, On 09/09/2016 01:17, John Stultz wrote: > On Thu, Sep 8, 2016 at 5:12 PM, Kees Cook <keescook@chromium.org> wrote: >> On Mon, Aug 22, 2016 at 3:48 PM, John Stultz <john.stultz@linaro.org> wrote: >>> This patch reserves some memory in the DTS and sets up a >>> pstore device tree node to enable pstore support on HiKey. >>> >>> Cc: Kees Cook <keescook@chromium.org> >>> Cc: Guodong Xu <guodong.xu@linaro.org> >>> Cc: Haojian Zhuang <haojian.zhuang@linaro.org> >>> Cc: Wei Xu <xuwei5@hisilicon.com> >>> Cc: Rob Herring <robh+dt@kernel.org> >>> Cc: Mark Rutland <mark.rutland@arm.com> >>> Cc: Catalin Marinas <catalin.marinas@arm.com> >>> Cc: Will Deacon <will.deacon@arm.com> >>> Cc: linux-arm-kernel@lists.infradead.org >>> Cc: devicetree@vger.kernel.org >>> Reviewed-by: Kees Cook <keescook@chromium.org> >>> Signed-off-by: John Stultz <john.stultz@linaro.org> >> >> I'm going through old emails -- did this get picked up by anyone? I >> don't see an "applied" reply or similar, though I could have easily >> missed it. :) > > Wei said he picked up the set, but it hasn't shown up in -next yet, as > his tree isn't automatically pulled in apparently. I have picked up this series and sent the pull request as [1]. Thanks for your interesting! [1] http://www.spinics.net/lists/arm-kernel/msg528380.html Best Regards, Wei > > thanks > -john > > . >
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts index 4492a15..9508f28 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts @@ -32,6 +32,7 @@ * 0x05f0,1000 - 0x05f0,1fff: Reboot reason * 0x06df,f000 - 0x06df,ffff: Mailbox message data * 0x0740,f000 - 0x0740,ffff: MCU firmware section + * 0x21f0,0000 - 0x21ff,ffff: pstore/ramoops buffer * 0x3e00,0000 - 0x3fff,ffff: OP-TEE */ memory@0 { @@ -40,9 +41,25 @@ <0x00000000 0x05f00000 0x00000000 0x00001000>, <0x00000000 0x05f02000 0x00000000 0x00efd000>, <0x00000000 0x06e00000 0x00000000 0x0060f000>, - <0x00000000 0x07410000 0x00000000 0x36bf0000>; + <0x00000000 0x07410000 0x00000000 0x1aaf0000>, + <0x00000000 0x22000000 0x00000000 0x1c000000>; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + ramoops@0x21f00000 { + compatible = "ramoops"; + reg = <0x0 0x21f00000 0x0 0x00100000>; + record-size = <0x00020000>; + console-size = <0x00020000>; + ftrace-size = <0x00020000>; + }; + }; + + reboot-mode-syscon@5f01000 { compatible = "syscon", "simple-mfd"; reg = <0x0 0x05f01000 0x0 0x00001000>;