summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge G. Davis <davis_g@mvista.com>2006-09-22 18:36:38 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-09-27 09:35:05 +0100
commit4052ebb7a2729bd7c28260cdf8e470c0d81b9c56 (patch)
treebe3d93df979ab49c9607f290265f955f2198ddd9
parent4b053e7a320882fbdbc6613cec60a929553b4215 (diff)
downloadop-kernel-dev-4052ebb7a2729bd7c28260cdf8e470c0d81b9c56.zip
op-kernel-dev-4052ebb7a2729bd7c28260cdf8e470c0d81b9c56.tar.gz
[ARM] 3859/1: Fix devicemaps_init() XIP_KERNEL odd 1MiB XIP_PHYS_ADDR translation error
The ARM XIP_KERNEL map created in devicemaps_init() is wrong. The map.pfn is rounded down to an even 1MiB section boundary which results in va/pa translations errors when XIP_PHYS_ADDR starts on an odd 1MiB boundary and this causes the kernel to hang. This patch fixes ARM XIP_KERNEL translation errors for the odd 1MiB XIP_PHYS_ADDR boundary case. Signed-off-by: George G. Davis <gdavis@mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mm/init.c4
-rw-r--r--include/asm-arm/pgtable.h7
2 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 1099af6..64262bd 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -434,9 +434,9 @@ static void __init devicemaps_init(struct machine_desc *mdesc)
* It is always first in the modulearea.
*/
#ifdef CONFIG_XIP_KERNEL
- map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & PGDIR_MASK);
+ map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
map.virtual = MODULE_START;
- map.length = ((unsigned long)&_etext - map.virtual + ~PGDIR_MASK) & PGDIR_MASK;
+ map.length = ((unsigned long)&_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
map.type = MT_ROM;
create_mapping(&map);
#endif
diff --git a/include/asm-arm/pgtable.h b/include/asm-arm/pgtable.h
index 8d3919c..38b2b55 100644
--- a/include/asm-arm/pgtable.h
+++ b/include/asm-arm/pgtable.h
@@ -136,6 +136,13 @@ extern void __pgd_error(const char *file, int line, unsigned long val);
#define USER_PTRS_PER_PGD ((TASK_SIZE/PGDIR_SIZE) - FIRST_USER_PGD_NR)
/*
+ * section address mask and size definitions.
+ */
+#define SECTION_SHIFT 20
+#define SECTION_SIZE (1UL << SECTION_SHIFT)
+#define SECTION_MASK (~(SECTION_SIZE-1))
+
+/*
* ARMv6 supersection address mask and size definitions.
*/
#define SUPERSECTION_SHIFT 24
OpenPOWER on IntegriCloud