ARM: Make pgtbl macro more robust
Subsystems (2)
PATCH 1/1 ARM: Make pgtbl macro more robust
The pgtbl macro couldn't handle the specific (TEXT_OFFSET - PG_DIR_SIZE) value that the combination of MSM platforms and LPAE created:
head.S:163: Error: invalid constant (203000) after fixup
Regardless of whether this combination of configuration options will work on currently support platforms at run time, make it at least assemble properly.
--- arch/arm/kernel/head.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/kernel/head.S +2 -1
@@ -52,7 +52,8 @@ .equ swapper_pg_dir, KERNEL_RAM_VADDR - PG_DIR_SIZE .macro pgtbl, rd, phys - add \rd, \phys, #TEXT_OFFSET - PG_DIR_SIZE + add \rd, \phys, #TEXT_OFFSET + sub \rd, \rd, #PG_DIR_SIZE .endm /*
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by the Linux Foundation.
Quoted 11 lines · Christopher Covington
The pgtbl macro couldn't handle the specific (
TEXT_OFFSET-PG_DIR_SIZE) value that the combination of MSM platforms and LPAE created:head.S:163: Error: invalid constant (203000) after fixup
Regardless of whether this combination of configuration options will work on currently support platforms at run time, make it at least assemble properly.
Signed-off-by Christopher Covington <[email protected]>
Looks good to me.
I think you can put it in the patch tracker. Russell?
Quoted 18 lines
--- arch/arm/kernel/head.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/arm/kernel/head.S +2
-1@@ -52,7 +52,8 @@ .equ swapper_pg_dir, KERNEL_RAM_VADDR - PG_DIR_SIZE .macro pgtbl, rd, phys - add \rd, \phys, #TEXT_OFFSET - PG_DIR_SIZE + add \rd, \phys, #TEXT_OFFSET + sub \rd, \rd, #PG_DIR_SIZE .endm /*
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 11 lines · Stephen Boyd
Quoted 10 lines · Christopher Covington
The pgtbl macro couldn't handle the specific (
TEXT_OFFSET-PG_DIR_SIZE) value that the combination of MSM platforms and LPAE created:head.S:163: Error: invalid constant (203000) after fixup
Regardless of whether this combination of configuration options will work on currently support platforms at run time, make it at least assemble properly.
Quoted 7 lines
Quoted 1 line
Signed-off-by Christopher Covington <[email protected]>Looks good to me.
Reviewed-by Stephen Boyd <[email protected]>I think you can put it in the patch tracker. Russell?
Added as
http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7947/1
Regards,
Christopher
Signature · 3 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by the Linux Foundation.