sharpsl_param.c: ARM: pxa: fix invalid memory access
PATCH v4 1/1 sharpsl_param.c: ARM: pxa: fix invalid memory access
After commit 72662e01088394577be4a3f14da94cf87bea2591
ARM: head.S: only include __turn_mmu_on in the initial identity mapping
Zaurus PXA devices call sharpsl_save_param() during fixup and hang on boot because memcpy refers to physical addresses no longer valid if the MMU is setup.
Zaurus collie (SA1100) is unaffected (function is called in init_machine).
The code was making assumptions and for PXA the virtual address should have been used before.
Signed-off-by Marko Katic <[email protected]>
Signed-off-by Andrea Adami <[email protected]>
--- arch/arm/common/sharpsl_param.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm/common/sharpsl_param.c +4 -1
@@ -15,6 +15,7 @@#include <linux/module.h> #include <linux/string.h> #include <asm/mach/sharpsl_param.h> +#include <asm/memory.h> /* * Certain hardware parameters determined at the time of device manufacture,
@@ -25,8 +26,10 @@*/ #ifdef CONFIG_ARCH_SA1100 #define PARAM_BASE 0xe8ffc000 +#define param_start (x) (void *)(x)#else #define PARAM_BASE 0xa0000a00 +#define param_start (x) __va(x)#endif #define MAGIC_CHG (a,b,c,d) ( ( d << 24 ) | ( c << 16 ) | ( b << 8 ) | a )
@@ -41,7 +44,7 @@ EXPORT_SYMBOL(sharpsl_param);void sharpsl_save_param (void ) { -memcpy (&sharpsl_param, (void *)PARAM_BASE ,sizeof (struct sharpsl_param_info )); +memcpy (&sharpsl_param,param_start (PARAM_BASE ),sizeof (struct sharpsl_param_info ));if (sharpsl_param.comadj_keyword !=COMADJ_MAGIC ) sharpsl_param.comadj=-1 ;
Signature · 1 line
1.8.1.5