mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v2 03/10] ARM: i.MX6: Record reset reason as a part of startup
Date: Fri, 20 Apr 2018 18:05:31 -0700	[thread overview]
Message-ID: <20180421010538.16488-4-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180421010538.16488-1-andrew.smirnov@gmail.com>

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 arch/arm/mach-imx/imx6.c                      | 13 ++++++++++++-
 arch/arm/mach-imx/include/mach/reset-reason.h |  2 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c
index 88165adee..49610bf08 100644
--- a/arch/arm/mach-imx/imx6.c
+++ b/arch/arm/mach-imx/imx6.c
@@ -19,6 +19,7 @@
 #include <mach/imx6.h>
 #include <mach/generic.h>
 #include <mach/revision.h>
+#include <mach/reset-reason.h>
 #include <mach/imx6-anadig.h>
 #include <mach/imx6-regs.h>
 #include <mach/generic.h>
@@ -173,10 +174,20 @@ int imx6_cpu_revision(void)
 	return soc_revision;
 }
 
+static const struct imx_reset_reason imx6_reset_reasons[] = {
+	{ IMX_SRC_SRSR_IPP_RESET,     RESET_POR,  0 },
+	{ IMX_SRC_SRSR_WDOG1_RESET,   RESET_WDG,  0 },
+	{ IMX_SRC_SRSR_JTAG_RESET,    RESET_JTAG, 0 },
+	{ IMX_SRC_SRSR_JTAG_SW_RESET, RESET_JTAG, 0 },
+	{ IMX_SRC_SRSR_WARM_BOOT,     RESET_RST,  0 },
+	{ /* sentinel */ }
+};
+
 int imx6_init(void)
 {
 	const char *cputypestr;
 	u32 mx6_silicon_revision;
+	void __iomem *src = IOMEM(MX6_SRC_BASE_ADDR);
 
 	imx6_init_lowlevel();
 
@@ -221,7 +232,7 @@ int imx6_init(void)
 	}
 
 	imx_set_silicon_revision(cputypestr, mx6_silicon_revision);
-
+	imx_set_reset_reason(src + IMX6_SRC_SRSR, imx6_reset_reasons);
 	imx6_setup_ipu_qos();
 	imx6ul_enet_clk_init();
 
diff --git a/arch/arm/mach-imx/include/mach/reset-reason.h b/arch/arm/mach-imx/include/mach/reset-reason.h
index 39afc4b28..f2544a303 100644
--- a/arch/arm/mach-imx/include/mach/reset-reason.h
+++ b/arch/arm/mach-imx/include/mach/reset-reason.h
@@ -14,6 +14,8 @@
 #define IMX_SRC_SRSR_TEMPSENSE_RESET	BIT(9)
 #define IMX_SRC_SRSR_WARM_BOOT		BIT(16)
 
+#define IMX6_SRC_SRSR	0x008
+
 struct imx_reset_reason {
 	uint32_t mask;
 	enum reset_src_type type;
-- 
2.14.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2018-04-21  1:06 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-21  1:05 [PATCH v2 00/10] i.MX reset reason detection support Andrey Smirnov
2018-04-21  1:05 ` [PATCH v2 01/10] common: reset_source: Add the notion of "reset source instance" Andrey Smirnov
2018-04-21  1:05 ` [PATCH v2 02/10] ARM: i.MX: Add infrastructure to record SoC reset reason Andrey Smirnov
2018-04-21  1:05 ` Andrey Smirnov [this message]
2018-05-02 14:42   ` [PATCH v2 03/10] ARM: i.MX6: Record reset reason as a part of startup Jan Lübbe
2018-05-02 17:46     ` Andrey Smirnov
2018-05-03  7:36       ` Jan Lübbe
2018-04-21  1:05 ` [PATCH v2 04/10] ARM: i.MX7: " Andrey Smirnov
2018-04-21  1:05 ` [PATCH v2 05/10] common: reset_source: Introduce reset_source_name() Andrey Smirnov
2018-04-21  1:05 ` [PATCH v2 06/10] ARM: i.MX: Log detected reset reason Andrey Smirnov
2018-04-21  1:05 ` [PATCH v2 07/10] ARM: i.MX: Print "revision unknown" if that is the case Andrey Smirnov
2018-04-21  1:05 ` [PATCH v2 08/10] ARM: VFxxx: Add code to detect cpu variant Andrey Smirnov
2018-04-21  1:05 ` [PATCH v2 09/10] ARM: VFxxx: Detect cpu variant on start Andrey Smirnov
2018-04-21  1:05 ` [PATCH v2 10/10] ARM: VFxxx: Record reset reason as a part of startup Andrey Smirnov
2018-04-26 12:54 ` [PATCH v2 00/10] i.MX reset reason detection support Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180421010538.16488-4-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox