| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1288736227-800-2-git-send-email-Dinh.Nguyen@freescale.com>
Date: Tue, 2 Nov 2010 17:17:07 -0500
From: <Dinh.Nguyen@...escale.com>
To: <linux-kernel@...r.kernel.org>
CC: <linux-arm-kernel@...ts.infradead.org>, <linux@....linux.org.uk>,
<s.hauer@...gutronix.de>, <u.kleine-koenig@...gutronix.de>,
<valentin.longchamp@...l.ch>, <daniel@...aq.de>,
<grant.likely@...retlab.ca>, <amit.kucheria@...onical.com>,
<xiao-lizhang@...escale.com>,
Dinh Nguyen <Dinh.Nguyen@...escale.com>
Subject: [PATCH 2/2] ARM: imx: Add mx53 support to common msl functions.
From: Dinh Nguyen <Dinh.Nguyen@...escale.com>
Add mx53 support to cpu.c and mm.c.
Signed-off by: Dinh Nguyen <Dinh.Nguyen@...escale.com>
---
arch/arm/mach-mx5/cpu.c | 40 +++++++++++++++++++++++++++++++----
arch/arm/mach-mx5/mm.c | 52 ++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 84 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-mx5/cpu.c b/arch/arm/mach-mx5/cpu.c
index eaacb6e..532a96b 100644
--- a/arch/arm/mach-mx5/cpu.c
+++ b/arch/arm/mach-mx5/cpu.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
*
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License
@@ -24,9 +24,14 @@ static int cpu_silicon_rev = -1;
static void query_silicon_parameter(void)
{
- void __iomem *rom = ioremap(MX51_IROM_BASE_ADDR, MX51_IROM_SIZE);
+ void __iomem *rom;
u32 rev;
+ if (cpu_is_mx51())
+ rom = ioremap(MX51_IROM_BASE_ADDR, MX51_IROM_SIZE);
+ else if (cpu_is_mx53())
+ rom = ioremap(MX53_IROM_BASE_ADDR, MX53_IROM_SIZE);
+
if (!rom) {
cpu_silicon_rev = -EINVAL;
return;
@@ -89,15 +94,36 @@ static int __init mx51_neon_fixup(void)
late_initcall(mx51_neon_fixup);
#endif
+/*
+ * Returns:
+ * the silicon revision of the cpu
+ * -EINVAL - not a mx53
+ */
+int mx53_revision(void)
+{
+ if (!cpu_is_mx53())
+ return -EINVAL;
+
+ if (cpu_silicon_rev == -1)
+ query_silicon_parameter();
+
+ return cpu_silicon_rev;
+}
+EXPORT_SYMBOL(mx53_revision);
+
static int __init post_cpu_init(void)
{
unsigned int reg;
void __iomem *base;
- if (!cpu_is_mx51())
+ if (!cpu_is_mx51() || !cpu_is_mx53())
return 0;
- base = MX51_IO_ADDRESS(MX51_AIPS1_BASE_ADDR);
+ if (cpu_is_mx51())
+ base = ioremap(MX51_IO_ADDRESS(MX51_AIPS1_BASE_ADDR), SZ_4K);
+ else
+ base = ioremap(MX53_IO_ADDRESS(MX53_AIPS1_BASE_ADDR), SZ_4K);
+
__raw_writel(0x0, base + 0x40);
__raw_writel(0x0, base + 0x44);
__raw_writel(0x0, base + 0x48);
@@ -105,7 +131,11 @@ static int __init post_cpu_init(void)
reg = __raw_readl(base + 0x50) & 0x00FFFFFF;
__raw_writel(reg, base + 0x50);
- base = MX51_IO_ADDRESS(MX51_AIPS2_BASE_ADDR);
+ if (cpu_is_mx51())
+ base = ioremap(MX51_IO_ADDRESS(MX51_AIPS2_BASE_ADDR), SZ_4K);
+ else
+ base = ioremap(MX53_IO_ADDRESS(MX53_AIPS2_BASE_ADDR), SZ_4K);
+
__raw_writel(0x0, base + 0x40);
__raw_writel(0x0, base + 0x44);
__raw_writel(0x0, base + 0x48);
diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c
index bc3f30d..d2b9f2c 100644
--- a/arch/arm/mach-mx5/mm.c
+++ b/arch/arm/mach-mx5/mm.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
*
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License
@@ -23,7 +23,7 @@
/*
* Define the MX51 memory map.
*/
-static struct map_desc mxc_io_desc[] __initdata = {
+static struct map_desc mx51_mxc_io_desc[] __initdata = {
{
.virtual = MX51_IRAM_BASE_ADDR_VIRT,
.pfn = __phys_to_pfn(MX51_IRAM_BASE_ADDR),
@@ -53,6 +53,28 @@ static struct map_desc mxc_io_desc[] __initdata = {
};
/*
+ * Define the MX53 memory map.
+ */
+static struct map_desc mx53_mxc_io_desc[] __initdata = {
+ {
+ .virtual = MX53_AIPS1_BASE_ADDR_VIRT,
+ .pfn = __phys_to_pfn(MX53_AIPS1_BASE_ADDR),
+ .length = MX53_AIPS1_SIZE,
+ .type = MT_DEVICE
+ }, {
+ .virtual = MX53_SPBA0_BASE_ADDR_VIRT,
+ .pfn = __phys_to_pfn(MX53_SPBA0_BASE_ADDR),
+ .length = MX53_SPBA0_SIZE,
+ .type = MT_DEVICE
+ }, {
+ .virtual = MX53_AIPS2_BASE_ADDR_VIRT,
+ .pfn = __phys_to_pfn(MX53_AIPS2_BASE_ADDR),
+ .length = MX53_AIPS2_SIZE,
+ .type = MT_DEVICE
+ },
+};
+
+/*
* This function initializes the memory map. It is called during the
* system startup to create static physical to virtual memory mappings
* for the IO modules.
@@ -62,10 +84,19 @@ void __init mx51_map_io(void)
mxc_set_cpu_type(MXC_CPU_MX51);
mxc_iomux_v3_init(MX51_IO_ADDRESS(MX51_IOMUXC_BASE_ADDR));
mxc_arch_reset_init(MX51_IO_ADDRESS(MX51_WDOG_BASE_ADDR));
- iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc));
+ iotable_init(mx51_mxc_io_desc, ARRAY_SIZE(mx51_mxc_io_desc));
+}
+
+void __init mx53_map_io(void)
+{
+ mxc_set_cpu_type(MXC_CPU_MX53);
+ mxc_iomux_v3_init(MX53_IO_ADDRESS(MX53_IOMUXC_BASE_ADDR));
+ mxc_arch_reset_init(MX53_IO_ADDRESS(MX53_WDOG_BASE_ADDR));
+ iotable_init(mx53_mxc_io_desc, ARRAY_SIZE(mx53_mxc_io_desc));
}
int imx51_register_gpios(void);
+int imx53_register_gpios(void);
void __init mx51_init_irq(void)
{
@@ -84,3 +115,18 @@ void __init mx51_init_irq(void)
tzic_init_irq(tzic_virt);
imx51_register_gpios();
}
+
+void __init mx53_init_irq(void)
+{
+ unsigned long tzic_addr;
+ void __iomem *tzic_virt;
+
+ tzic_addr = MX53_TZIC_BASE_ADDR;
+
+ tzic_virt = ioremap(tzic_addr, SZ_16K);
+ if (!tzic_virt)
+ panic("unable to map TZIC interrupt controller\n");
+
+ tzic_init_irq(tzic_virt);
+ imx53_register_gpios();
+}
--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists