From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 1/3] ARM: i.MX51: Use IIM for detecting silicon revision
Date: Mon, 17 Jun 2013 11:17:51 +0200 [thread overview]
Message-ID: <1371460673-14284-1-git-send-email-s.hauer@pengutronix.de> (raw)
The IROM is located at physical address 0x0, so reading the
silicon revision from it leads to a NULL pointer dereference
if done too late when the MMU is already enabled. Use the IIM
instead which is also done in the Kernel. This limits the silicon
revisions to 2.0 and 3.0, but I assume the earlier versions are
not seen in the wild anyway.
This also moves the call to imx_set_silicon_revision() out of
imx51_silicon_revision() so that imx51_silicon_revision() can be called
in early init context.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-imx/imx51.c | 28 ++++++++--------------------
1 file changed, 8 insertions(+), 20 deletions(-)
diff --git a/arch/arm/mach-imx/imx51.c b/arch/arm/mach-imx/imx51.c
index fdf2374..c9f88f5 100644
--- a/arch/arm/mach-imx/imx51.c
+++ b/arch/arm/mach-imx/imx51.c
@@ -22,40 +22,28 @@
#include <mach/clock-imx51_53.h>
#include <mach/generic.h>
-#define SI_REV 0x48
+#define IIM_SREV 0x24
static int imx51_silicon_revision(void)
{
- void __iomem *rom = MX51_IROM_BASE_ADDR;
- u32 mx51_silicon_revision;
- u32 rev;
+ void __iomem *iim_base = IOMEM(MX51_IIM_BASE_ADDR);
+ u32 rev = readl(iim_base + IIM_SREV) & 0xff;
- rev = readl(rom + SI_REV);
switch (rev) {
- case 0x1:
- mx51_silicon_revision = IMX_CHIP_REV_1_0;
- break;
- case 0x2:
- mx51_silicon_revision = IMX_CHIP_REV_1_1;
- break;
+ case 0x0:
+ return IMX_CHIP_REV_2_0;
case 0x10:
- mx51_silicon_revision = IMX_CHIP_REV_2_0;
- break;
- case 0x20:
- mx51_silicon_revision = IMX_CHIP_REV_3_0;
- break;
+ return IMX_CHIP_REV_3_0;
default:
- mx51_silicon_revision = 0;
+ return IMX_CHIP_REV_UNKNOWN;
}
- imx_set_silicon_revision("i.MX51", mx51_silicon_revision);
-
return 0;
}
static int imx51_init(void)
{
- imx51_silicon_revision();
+ imx_set_silicon_revision("i.MX51", imx51_silicon_revision());
imx51_boot_save_loc((void *)MX51_SRC_BASE_ADDR);
if (of_get_root_node())
--
1.8.3.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2013-06-17 9:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-17 9:17 Sascha Hauer [this message]
2013-06-17 9:17 ` [PATCH 2/3] ARM: i.MX51: Make imx51_init_lowlevel callable from early init Sascha Hauer
2013-06-17 9:17 ` [PATCH 3/3] ARM: i.MX51 efikasb: call imx51_lowlevel_init from lowlevel init 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=1371460673-14284-1-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--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