From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 09/10] ARM: VFxxx: Add code to detect cpu variant
Date: Sat, 14 Apr 2018 10:50:23 -0700 [thread overview]
Message-ID: <20180414175024.9962-10-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/include/mach/vf610-regs.h | 3 ++
arch/arm/mach-imx/include/mach/vf610.h | 51 +++++++++++++++++++++++++++++
2 files changed, 54 insertions(+)
create mode 100644 arch/arm/mach-imx/include/mach/vf610.h
diff --git a/arch/arm/mach-imx/include/mach/vf610-regs.h b/arch/arm/mach-imx/include/mach/vf610-regs.h
index 8be220b68..2afdf7edc 100644
--- a/arch/arm/mach-imx/include/mach/vf610-regs.h
+++ b/arch/arm/mach-imx/include/mach/vf610-regs.h
@@ -107,4 +107,7 @@
#define VF610_MSCM_IRSPRC_CP0_EN 1
#define VF610_MSCM_IRSPRC_NUM 112
+#define VF610_MSCM_CPxCOUNT 0x00c
+#define VF610_MSCM_CPxCFG1 0x014
+
#endif
diff --git a/arch/arm/mach-imx/include/mach/vf610.h b/arch/arm/mach-imx/include/mach/vf610.h
new file mode 100644
index 000000000..6d00d2e45
--- /dev/null
+++ b/arch/arm/mach-imx/include/mach/vf610.h
@@ -0,0 +1,51 @@
+#ifndef __MACH_VF610_H
+#define __MACH_VF610_H
+
+#include <io.h>
+#include <mach/generic.h>
+#include <mach/vf610-regs.h>
+#include <mach/revision.h>
+
+#define VF610_CPUTYPE_VFx10 0x010
+
+#define VF610_CPUTYPE_VF610 0x610
+#define VF610_CPUTYPE_VF600 0x600
+#define VF610_CPUTYPE_VF510 0x510
+#define VF610_CPUTYPE_VF500 0x500
+
+#define VF610_ROM_VERSION_OFFSET 0x80
+
+static inline int __vf610_cpu_type(void)
+{
+ void __iomem *mscm = IOMEM(VF610_MSCM_BASE_ADDR);
+ const u32 cpxcount = readl(mscm + VF610_MSCM_CPxCOUNT);
+ const u32 cpxcfg1 = readl(mscm + VF610_MSCM_CPxCFG1);
+ int cpu_type;
+
+ cpu_type = cpxcount ? VF610_CPUTYPE_VF600 : VF610_CPUTYPE_VF500;
+
+ return cpxcfg1 ? cpu_type | VF610_CPUTYPE_VFx10 : cpu_type;
+}
+
+static inline int vf610_cpu_type(void)
+{
+ if (!cpu_is_vf610())
+ return 0;
+
+ return __vf610_cpu_type();
+}
+
+static inline int vf610_cpu_revision(void)
+{
+ if (!cpu_is_vf610())
+ return IMX_CHIP_REV_UNKNOWN;
+
+ /*
+ * There doesn't seem to be a documented way of retreiving
+ * silicon revision on VFxxx cpus, so we just report Mask ROM
+ * version instead
+ */
+ return readl(VF610_ROM_VERSION_OFFSET) & 0xff;
+}
+
+#endif
--
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 ` [PATCH 08/10] ARM: VFxxx: Add code to detect reset reason Andrey Smirnov
2018-04-16 7:19 ` Sascha Hauer
2018-04-16 13:12 ` Andrey Smirnov
2018-04-14 17:50 ` Andrey Smirnov [this message]
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-10-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