From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 08/10] ARM: VFxxx: Add code to detect reset reason
Date: Sat, 14 Apr 2018 10:50:22 -0700 [thread overview]
Message-ID: <20180414175024.9962-9-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180414175024.9962-1-andrew.smirnov@gmail.com>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
arch/arm/mach-imx/imx.c | 78 +++++++++++++++++----------
arch/arm/mach-imx/include/mach/reset-reason.h | 11 ++++
2 files changed, 62 insertions(+), 27 deletions(-)
diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c
index fb1160de9..e84713766 100644
--- a/arch/arm/mach-imx/imx.c
+++ b/arch/arm/mach-imx/imx.c
@@ -158,6 +158,7 @@ void imx_set_reset_reason(void __iomem *srsr)
{
enum reset_src_type type = RESET_UKWN;
const u32 reg = readl(srsr);
+ const bool is_vf610 = cpu_is_vf610();
/*
* SRSR register captures ALL reset event that occured since
@@ -166,37 +167,60 @@ void imx_set_reset_reason(void __iomem *srsr)
*/
writel(reg, srsr);
- switch (reg) {
- case IMX_SRC_SRSR_IPP_RESET: /* FALLTHROUGH */
- case IMX_SRC_SRSR_IPP_RESET | IMX_SRC_SRSR_WDOG1_RESET:
- type = RESET_POR;
- break;
- case IMX_SRC_SRSR_WDOG3_RESET: /* FALLTHROUGH */
- case IMX_SRC_SRSR_WDOG4_RESET: /* FALLTHROUGH */
- case IMX_SRC_SRSR_WDOG1_RESET:
- type = RESET_WDG;
- break;
- case IMX_SRC_SRSR_JTAG_RESET: /* FALLTHROUGH */
- case IMX_SRC_SRSR_JTAG_SW_RESET:
- type = RESET_JTAG;
- break;
- case IMX_SRC_SRSR_TEMPSENSE_RESET:
- type = RESET_THERM;
- break;
- case IMX_SRC_SRSR_WARM_BOOT:
- type = RESET_RST;
- break;
+ if (is_vf610) {
+ /*
+ * Layout of SRSR on Vybrid is quite different so we
+ * handle it separately.
+ */
+ if (reg & VF610_SRC_SRSR_POR_RST) {
+ type = RESET_POR;
+ } else if (reg & VF610_SRC_SRSR_WDOG_xx) {
+ type = RESET_WDG;
+ } else if (reg & VF610_SRC_SRSR_JTAG_RST) {
+ type = RESET_JTAG;
+ } else if (reg & VF610_SRC_SRSR_SW_RST) {
+ type = RESET_RST;
+ } else if (reg & VF610_SRC_SRSR_RESETB) {
+ type = RESET_EXT;
+ }
+ } else {
+ switch (reg) {
+ case IMX_SRC_SRSR_IPP_RESET: /* FALLTHROUGH */
+ case IMX_SRC_SRSR_IPP_RESET | IMX_SRC_SRSR_WDOG1_RESET:
+ type = RESET_POR;
+ break;
+ case IMX_SRC_SRSR_WDOG3_RESET: /* FALLTHROUGH */
+ case IMX_SRC_SRSR_WDOG4_RESET: /* FALLTHROUGH */
+ case IMX_SRC_SRSR_WDOG1_RESET:
+ type = RESET_WDG;
+ break;
+ case IMX_SRC_SRSR_JTAG_RESET: /* FALLTHROUGH */
+ case IMX_SRC_SRSR_JTAG_SW_RESET:
+ type = RESET_JTAG;
+ break;
+ case IMX_SRC_SRSR_TEMPSENSE_RESET:
+ type = RESET_THERM;
+ break;
+ case IMX_SRC_SRSR_WARM_BOOT:
+ type = RESET_RST;
+ break;
+ }
}
reset_source_set(type);
- switch (reg) {
- case IMX_SRC_SRSR_WDOG3_RESET:
- reset_source_set_instance(type, 1);
- break;
- case IMX_SRC_SRSR_WDOG4_RESET:
- reset_source_set_instance(type, 2);
- break;
+ if (is_vf610) {
+ if (reg & VF610_SRC_SRSR_WDOG_M4)
+ reset_source_set_instance(type, 1);
+ } else {
+ switch (reg) {
+ case IMX_SRC_SRSR_WDOG3_RESET:
+ reset_source_set_instance(type, 1);
+ break;
+ case IMX_SRC_SRSR_WDOG4_RESET:
+ reset_source_set_instance(type, 2);
+ break;
+ }
}
pr_info("i.MX reset reason %s (SRSR: 0x%08x)\n",
diff --git a/arch/arm/mach-imx/include/mach/reset-reason.h b/arch/arm/mach-imx/include/mach/reset-reason.h
index a8a9dc682..543fec4a1 100644
--- a/arch/arm/mach-imx/include/mach/reset-reason.h
+++ b/arch/arm/mach-imx/include/mach/reset-reason.h
@@ -14,6 +14,17 @@
#define IMX6_SRC_SRSR 0x008
#define IMX7_SRC_SRSR 0x05c
+#define VF610_SRC_SRSR 0x008
+
+
+#define VF610_SRC_SRSR_SW_RST BIT(18)
+#define VF610_SRC_SRSR_RESETB BIT(7)
+#define VF610_SRC_SRSR_JTAG_RST BIT(5)
+#define VF610_SRC_SRSR_WDOG_M4 BIT(4)
+#define VF610_SRC_SRSR_WDOG_A5 BIT(3)
+#define VF610_SRC_SRSR_WDOG_xx (VF610_SRC_SRSR_WDOG_A5 | \
+ VF610_SRC_SRSR_WDOG_M4)
+#define VF610_SRC_SRSR_POR_RST BIT(0)
void imx_set_reset_reason(void __iomem *srsr);
--
2.14.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2018-04-14 17:50 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-14 17:50 [PATCH 00/10] i.MX reset reason detection support Andrey Smirnov
2018-04-14 17:50 ` [PATCH 01/10] common: reset_source: Add the notion of "reset source instance" Andrey Smirnov
2018-04-14 17:50 ` [PATCH 02/10] ARM: i.MX: Add infrastructure to record SoC reset reason Andrey Smirnov
2018-04-18 15:23 ` Philipp Zabel
2018-04-19 22:19 ` Andrey Smirnov
2018-04-14 17:50 ` [PATCH 03/10] ARM: i.MX6: Record reset reason as a part of startup Andrey Smirnov
2018-04-16 7:13 ` Sascha Hauer
2018-04-16 13:28 ` Andrey Smirnov
2018-04-17 6:49 ` Sascha Hauer
2018-04-17 15:35 ` Andrey Smirnov
2018-04-18 8:23 ` Sascha Hauer
2018-04-14 17:50 ` [PATCH 04/10] ARM: i.MX7: " Andrey Smirnov
2018-04-16 7:13 ` Sascha Hauer
2018-04-14 17:50 ` [PATCH 05/10] common: reset_source: Introduce reset_source_name() Andrey Smirnov
2018-04-14 17:50 ` [PATCH 06/10] ARM: i.MX: Log detected reset reason Andrey Smirnov
2018-04-14 17:50 ` [PATCH 07/10] ARM: i.MX: Print "revision unknown" if that is the case Andrey Smirnov
2018-04-14 17:50 ` Andrey Smirnov [this message]
2018-04-16 7:19 ` [PATCH 08/10] ARM: VFxxx: Add code to detect reset reason Sascha Hauer
2018-04-16 13:12 ` Andrey Smirnov
2018-04-14 17:50 ` [PATCH 09/10] ARM: VFxxx: Add code to detect cpu variant Andrey Smirnov
2018-04-14 17:50 ` [PATCH 10/10] ARM: VFxxx: Detect cpu variant and reset source on start Andrey Smirnov
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=20180414175024.9962-9-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