diff mbox

[2/2] hikey: dts: Add pstore support for HiKey

Message ID 1452056031-672-3-git-send-email-john.stultz@linaro.org
State New
Headers show

Commit Message

John Stultz Jan. 6, 2016, 4:53 a.m. UTC 
This patch reserves some memory in the DTS and sets up a
pstore device tree node to enable pstore support on HiKey.

This also enables the needed config options in the defconfig.

Cc: Rob Herring <rob.herring@linaro.org>
Cc: Arnd Bergmann <arnd.bergmann@linaro.org>
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Guodong Xu <guodong.xu@linaro.org>
Cc: Vishal Bhoj <vishal.bhoj@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>

---
 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 13 +++++++++++++
 arch/arm64/configs/hikey_defconfig             |  7 +++++++
 2 files changed, 20 insertions(+)

-- 
1.9.1
diff mbox

Patch

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index f0cd5fa..36d300f 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -61,6 +61,19 @@ 
 			no-map;
 			reg = <0x0 0x06dff000 0x0 0x00001000>;	/* Mailbox message buf */
 		};
+
+		pstore: pstore@0x21f00000 {
+			no-map;
+			reg = <0x0 0x21f00000 0x0 0x00100000>;  /* pstore/ramoops buffer */
+		};
+	};
+
+	ramoops {
+		compatible = "ramoops";
+		memory-region = <&pstore>;
+		record-size	= <0x0 0x00020000>;
+		console-size	= <0x0 0x00020000>;
+		ftrace-size	= <0x0 0x00020000>;
 	};
 
 	reboot_reason: reboot-reason@05f01000 {
diff --git a/arch/arm64/configs/hikey_defconfig b/arch/arm64/configs/hikey_defconfig
index e3cd02d..c8c6511 100644
--- a/arch/arm64/configs/hikey_defconfig
+++ b/arch/arm64/configs/hikey_defconfig
@@ -354,6 +354,7 @@  CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_REBOOT_REASON_SRAM=y
 CONFIG_EFI_VARS=y
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_BTRFS_FS=y
@@ -371,6 +372,10 @@  CONFIG_TMPFS=y
 CONFIG_HUGETLBFS=y
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_XZ=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_CONSOLE=y
+CONFIG_PSTORE_PMSG=y
+CONFIG_PSTORE_RAM=y
 CONFIG_NFS_FS=y
 # CONFIG_NFS_V2 is not set
 CONFIG_NFS_V3_ACL=y
@@ -385,6 +390,8 @@  CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_INFO=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_LOCKUP_DETECTOR=y
+CONFIG_PANIC_ON_OOPS=y
+CONFIG_PANIC_TIMEOUT=10
 # CONFIG_SCHED_DEBUG is not set
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y