From patchwork Wed Jan 6 04:53:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 59220 Delivered-To: patches@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp6365024lbb; Tue, 5 Jan 2016 20:54:00 -0800 (PST) X-Received: by 10.98.71.18 with SMTP id u18mr137498884pfa.107.1452056037050; Tue, 05 Jan 2016 20:53:57 -0800 (PST) Return-Path: Received: from mail-pf0-x22e.google.com (mail-pf0-x22e.google.com. [2607:f8b0:400e:c00::22e]) by mx.google.com with ESMTPS id n88si53856107pfb.107.2016.01.05.20.53.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Jan 2016 20:53:57 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::22e as permitted sender) client-ip=2607:f8b0:400e:c00::22e; Authentication-Results: mx.google.com; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::22e as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dkim=pass header.i=@linaro.org Received: by mail-pf0-x22e.google.com with SMTP id 65so187047672pff.3 for ; Tue, 05 Jan 2016 20:53:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+vE0RfTT7UkL9dD+ghCbF4mm3n5Y71WNUobotsjrMv4=; b=dROQVtH7qFzC+Oz42beC6lXJRZSLneqKm9XQbEeemHZFc2p28zh6zP9lC4Z8JMKnsC 8pt8pDpoDVGipVAz7DUA6wXXsBbJwXwUsyCMPiVMX9DOzSezn2XG89AdCKP6Xkgl9Xsd WDfn54BKNpqX2p07HwdntqEJYLlsdBDINDKhY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+vE0RfTT7UkL9dD+ghCbF4mm3n5Y71WNUobotsjrMv4=; b=D4j6AQWl0TGGkFyL8KPutpZwuZgxf6Ousfp1XQBPxG6A2gQKVle11eJwivx68slfud uFl0bJy2LG+/OjXcxrdZbRPKM10LO9Vl0pLmC4/oEA7Zd9tzY0heJyZnByiY28iQrJel HJRdaMuzGY9F5kkJTC+EcmZFxpgRTvo7wjvtXAMb2l/2WwNIoRFJuGFJkXCu6FXAFpV7 tylmkaxFWnWrzec2XXwS74B0kBJCG4SDWDxzel/mjcHCytblq+90B0B59RdiMHZRES0Q vStGSzygWLFACvU/DbFGwZIS9f9M+wayRjRX2GTstJwQE0R+J0y2gEq0vNoibofmV0cZ b5ag== X-Gm-Message-State: ALoCoQkTVGwfzGK3yVCiddYHocfINsXYI1pwSOJYzDsNpLLa8xFsWytTDq+oAZj4WnMj3rHSEKaWSepVe4l8UahWpmEIT4UjRg== X-Received: by 10.98.32.74 with SMTP id g71mr107445370pfg.46.1452056036703; Tue, 05 Jan 2016 20:53:56 -0800 (PST) Return-Path: Received: from localhost.localdomain (c-76-115-103-22.hsd1.or.comcast.net. [76.115.103.22]) by smtp.gmail.com with ESMTPSA id n62sm68671345pfa.14.2016.01.05.20.53.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Jan 2016 20:53:56 -0800 (PST) From: John Stultz To: dev Cc: John Stultz , Rob Herring , Arnd Bergmann , Haojian Zhuang , Guodong Xu , Vishal Bhoj Subject: [PATCH 2/2] hikey: dts: Add pstore support for HiKey Date: Tue, 5 Jan 2016 20:53:51 -0800 Message-Id: <1452056031-672-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452056031-672-1-git-send-email-john.stultz@linaro.org> References: <1452056031-672-1-git-send-email-john.stultz@linaro.org> 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 Cc: Arnd Bergmann Cc: Haojian Zhuang Cc: Guodong Xu Cc: Vishal Bhoj Signed-off-by: John Stultz --- arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 13 +++++++++++++ arch/arm64/configs/hikey_defconfig | 7 +++++++ 2 files changed, 20 insertions(+) -- 1.9.1 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