Skip to contentSkip to conversation

ARM: zynq: reserve space for jump target in secondary trampoline

PATCH New Nathan Lynch 2 participants 2 messages Jul 17, 2015 – Jul 20, 2015

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/Zynq architecture
lore
Share & tools
lore

Nathan Lynch

author
#0 lore raw

PATCH 1/1 ARM: zynq: reserve space for jump target in secondary trampoline

Add a zero argument to the .word directive in zynq_secondary_trampoline. Without an expression the assembler emits nothing for the .word directive.

This makes it so that the intended range is communicated to ioremap and outer_flush_range in zynq_cpun_start; e.g. for LE trampoline_code_size evaluates to 12 now instead of 8.

Found by inspection. I'm not aware of any real problem this fixes. Tested by doing on online/offline loop on ZC702.

Signed-off-by Nathan Lynch <[email protected]>
---
 arch/arm/mach-zynq/headsmp.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-zynq/headsmp.S +1 -1
index 045c72720a4d..f6d5de073e34 100644
@@ -18,7 +18,7 @@ ARM_BE8(rev	r0, r0)
 .globl zynq_secondary_trampoline_jump
 zynq_secondary_trampoline_jump:
 	/* Space for jumping address */
-	.word	/* cpu 1 */
+	.word	0	/* cpu 1 */
 .globl zynq_secondary_trampoline_end
 zynq_secondary_trampoline_end:
 ENDPROC(zynq_secondary_trampoline)
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/1 ARM: zynq: reserve space for jump target in secondary trampoline

Quoted 22 lines · Nathan Lynch

Add a zero argument to the .word directive in zynq_secondary_trampoline. Without an expression the assembler emits nothing for the .word directive.

This makes it so that the intended range is communicated to ioremap and outer_flush_range in zynq_cpun_start; e.g. for LE trampoline_code_size evaluates to 12 now instead of 8.

Found by inspection. I'm not aware of any real problem this fixes. Tested by doing on online/offline loop on ZC702.

Signed-off-by Nathan Lynch <[email protected]>
---
 arch/arm/mach-zynq/headsmp.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-zynq/headsmp.S +0 -0
index 045c72720a4d..f6d5de073e34 100644

arch/arm/mach-zynq/headsmp.S ARM_BE8(rev r0, r0) · line 24

Quoted 8 lines
arch/arm/mach-zynq/headsmp.S +1 -1
@@ -18,7 +18,7 @@ ARM_BE8(rev	r0, r0)
 .globl zynq_secondary_trampoline_jump
 zynq_secondary_trampoline_jump:
 	/* Space for jumping address */
-	.word	/* cpu 1 */
+	.word	0	/* cpu 1 */
 .globl zynq_secondary_trampoline_end
 zynq_secondary_trampoline_end:
 ENDPROC(zynq_secondary_trampoline)

Tested and applied to zynq/cleanup.

Thanks,
Michal