On Mon, Aug 8, 2016 at 4:03 PM, John Stultz <[email protected]> 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 <[email protected]> > Cc: Guodong Xu <[email protected]> > Cc: Haojian Zhuang <[email protected]> > Cc: Wei Xu <[email protected]> > Cc: Rob Herring <[email protected]> > Cc: Mark Rutland <[email protected]> > Cc: Catalin Marinas <[email protected]> > Cc: Will Deacon <[email protected]> > Cc: [email protected] > Cc: [email protected] > Signed-off-by: John Stultz <[email protected]> > --- > arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts > b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts > index b2683e4..9140306 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,7 +41,21 @@ > <0x00000000 0x05f00000 0x00000000 0x00001000>, > <0x00000000 0x05f02000 0x00000000 0x00efd000>, > <0x00000000 0x06e00000 0x00000000 0x0060f000>, > - <0x00000000 0x07410000 0x00000000 0x36bf0000>; > + <0x00000000 0x07410000 0x00000000 0x1aaf0000>, > + <0x00000000 0x22000000 0x00000000 0x1c000000>; > + }; > + > + pstore: pstore@0x21f00000 { > + no-map; > + reg = <0x0 0x21f00000 0x0 0x00100000>; /* pstore buffer */ > + }; > + > + ramoops { > + compatible = "ramoops"; > + memory-region = <&pstore>; > + record-size = <0x0 0x00020000>; > + console-size = <0x0 0x00020000>; > + ftrace-size = <0x0 0x00020000>; > }; > > reboot-mode-syscon@5f01000 {
Heh, sorry, we changed the pstore DT format out from under you. :) http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=529182e204db083cb7bda832d1c5c6d9278ba1cb But otherwise, sure! -Kees -- Kees Cook Nexus Security
