From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 6 Aug 2013 11:16:25 +0000 (+0800)
Subject: rk30: reset better check panic
X-Git-Tag: firefly_0821_release~6740
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=50a051eb6ab12d3317b78618db786745e2efe08b;p=firefly-linux-kernel-4.4.55.git

rk30: reset better check panic
---

diff --git a/arch/arm/mach-rk30/reset.c b/arch/arm/mach-rk30/reset.c
index f897f7849450..5bfb2c4ff15f 100644
--- a/arch/arm/mach-rk30/reset.c
+++ b/arch/arm/mach-rk30/reset.c
@@ -8,6 +8,25 @@
 #include <mach/board.h>
 #include <mach/pmu.h>
 
+static bool is_panic = false;
+
+static int panic_event(struct notifier_block *this, unsigned long event, void *ptr)
+{
+	is_panic = true;
+	return NOTIFY_DONE;
+}
+
+static struct notifier_block panic_block = {
+	.notifier_call	= panic_event,
+};
+
+static int __init arch_reset_init(void)
+{
+	atomic_notifier_chain_register(&panic_notifier_list, &panic_block);
+	return 0;
+}
+core_initcall(arch_reset_init);
+
 static void rk30_arch_reset(char mode, const char *cmd)
 {
 	u32 boot_flag = 0;
@@ -21,7 +40,7 @@ static void rk30_arch_reset(char mode, const char *cmd)
 		else if (!strcmp(cmd, "charge"))
 			boot_mode = BOOT_MODE_CHARGE;
 	} else {
-		if (system_state != SYSTEM_RESTART)
+		if (is_panic)
 			boot_mode = BOOT_MODE_PANIC;
 	}
 	writel_relaxed(boot_flag, RK30_PMU_BASE + PMU_SYS_REG0);	// for loader