ARM: proc-v7: Put stack in data section, handle XIP case
Subsystems (2)
PATCH 1/1 ARM: proc-v7: Put stack in data section, handle XIP case
From: Magnus Damm <[email protected]>
Adjust the ARM v7 setup code to put the temporary stack in the data section and also use PLAT_PHYS_OFFSET to handle the XIP case.
The common case of XIP=n the code is considered to be position independent while for XIP=y PLAT_PHYS_OFFSET is fixed. This is based on that early code in head.S invoking PROCINFO_INITFUNC seems position independent.
At this point two places in proc-v7.S make use of the temporary stack so the PLAT_PHYS_OFFSET calculation is duplicated.
The XIP=n case has been tested with CPU Hotplug on r8a7779 (Cortex A9 Quad) and Chris [CCed] has tested the XIP=y case.
---
Please let me know if considering XIP=y position independent is overkill, or if it is better to share code somehow.
arch/arm/mm/proc-v7.S | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
arch/arm/mm/proc-v7.S +23 -2
@@ -274,7 +274,15 @@ __v7_ca15mp_setup: __v7_b15mp_setup: __v7_ca17mp_setup: mov r10, #0 -1: adr r12, __v7_setup_stack @ the local stack +1: adr r11, __v7_setup_stack_ptr @ pointer to local stack + ldmia r11, {r0, r12} +#ifdef CONFIG_XIP_KERNEL + ldr r11, =PLAT_PHYS_OFFSET @ fixed address +#else + sub r11, r11, r0 @ position independent offset +#endif + add r12, r12, r11 @ phys address + sub r12, #PAGE_OFFSET stmia r12, {r0-r5, lr} @ v7_invalidate_l1 touches r0-r6 bl v7_invalidate_l1 ldmia r12, {r0-r5, lr}
@@ -415,7 +423,15 @@ __v7_pj4b_setup: #endif /* CONFIG_CPU_PJ4B */ __v7_setup: - adr r12, __v7_setup_stack @ the local stack + adr r11, __v7_setup_stack_ptr @ pointer to local stack + ldmia r11, {r0, r12} +#ifdef CONFIG_XIP_KERNEL + ldr r11, =PLAT_PHYS_OFFSET @ fixed address +#else + sub r11, r11, r0 @ position independent offset +#endif + add r12, r12, r11 @ phys address + sub r12, #PAGE_OFFSET stmia r12, {r0-r5, lr} @ v7_invalidate_l1 touches r0-r6 bl v7_invalidate_l1 ldmia r12, {r0-r5, lr}
@@ -482,6 +498,11 @@ __errata_finish: ret lr @ return to head.S:__ret ENDPROC(__v7_setup) +__v7_setup_stack_ptr: + .long . + .long __v7_setup_stack + + .data .align 2 __v7_setup_stack: .space 4 * 7 @ 12 registers
PATCH 1/1 ARM: proc-v7: Put stack in data section, handle XIP case
Quoted 13 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Adjust the ARM v7 setup code to put the temporary stack in the data section and also use
PLAT_PHYS_OFFSETto handle the XIP case.The common case of XIP=n the code is considered to be position independent while for XIP=y
PLAT_PHYS_OFFSETis fixed. This is based on that early code inhead.SinvokingPROCINFO_INITFUNCseems position independent.At this point two places in
proc-v7.Smake use of the temporary stack so thePLAT_PHYS_OFFSETcalculation is duplicated.
Quoted 6 lines
The XIP=n case has been tested with CPU Hotplug on r8a7779 (Cortex A9 Quad) and Chris [CCed] has tested the XIP=y case.
Signed-off-by Magnus Damm <[email protected]>Tested-by Chris.Brandt at renesas.com
Sorry, but what's the problem with XIP=n ? The above seems to avoid describing what the problem is there, but it spends an awful lot of words describing the XIP=n scenario and few describing the XIP=y scenario.
I think the commit message needs improving.
Thanks.
Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net.
PATCH 1/1 ARM: proc-v7: Put stack in data section, handle XIP case
Hi Russell,
Quoted 18 lines · Russell King - ARM Linux
Quoted 17 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Adjust the ARM v7 setup code to put the temporary stack in the data section and also use
PLAT_PHYS_OFFSETto handle the XIP case.The common case of XIP=n the code is considered to be position independent while for XIP=y
PLAT_PHYS_OFFSETis fixed. This is based on that early code inhead.SinvokingPROCINFO_INITFUNCseems position independent.At this point two places in
proc-v7.Smake use of the temporary stack so thePLAT_PHYS_OFFSETcalculation is duplicated.The XIP=n case has been tested with CPU Hotplug on r8a7779 (Cortex A9 Quad) and Chris [CCed] has tested the XIP=y case.
Quoted 7 lines
Quoted 2 lines
Signed-off-by Magnus Damm <[email protected]>Tested-by Chris.Brandt at renesas.comSorry, but what's the problem with XIP=n ? The above seems to avoid describing what the problem is there, but it spends an awful lot of words describing the XIP=n scenario and few describing the XIP=y scenario.
My apologies for the confusing commit message!
There is currently no problem with XIP=n, however to support XIP=y the temporary stack needs to move into the data section. My plan is doing that regardless of if XIP is enabled or not, but that makes the XIP=n case a bit more complex.
If we move the stack into the data section then the "adr" instruction may no longer be able to perform PC-relative addressing. Which requires a rework of the code to not rely on "adr". That in turn requires us to handle that the MMU is disabled. And unless I'm mistaken the executing environment in case of XIP=n may not execute at the actual link address, so because of an offset adjustment calculation is also mandatory.
Quoted 3 lines
I think the commit message needs improving.
Thanks.
Sure, will do! Apart from that, do you agree with the offset calculation and the duplication of the code? I'd be happy to rework things if needed.
Thanks,
/ magnus