Skip to contentSkip to conversation

arm64: Fix size of __early_cpu_boot_status

PATCH In review Arun KS 3 participants 3 messages May 15, 2019 – May 16, 2019 arm64

lore
Share & tools
lore

Arun KS

author
#0 lore raw

PATCH 1/1 arm64: Fix size of __early_cpu_boot_status

__early_cpu_boot_status is of type int. Fix up the calls to update_early_cpu_boot_status, to use a w register.

---
 arch/arm64/include/asm/smp.h | 2 +-
 arch/arm64/kernel/head.S     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/include/asm/smp.h +1 -1
index 18553f3..59e80ab 100644
@@ -96,7 +96,7 @@ struct secondary_data {
 };
 
 extern struct secondary_data secondary_data;
-extern long __early_cpu_boot_status;
+extern int __early_cpu_boot_status;
 extern void secondary_entry(void);
 
 extern void arch_send_call_function_single_ipi(int cpu);
arch/arm64/kernel/head.S +3 -3
index fcae3f8..c7175fb 100644
@@ -778,7 +778,7 @@ ENTRY(__enable_mmu)
 	ubfx	x2, x2, #ID_AA64MMFR0_TGRAN_SHIFT, 4
 	cmp	x2, #ID_AA64MMFR0_TGRAN_SUPPORTED
 	b.ne	__no_granule_support
-	update_early_cpu_boot_status 0, x2, x3
+	update_early_cpu_boot_status 0, x2, w3
 	adrp	x2, idmap_pg_dir
 	phys_to_ttbr x1, x1
 	phys_to_ttbr x2, x2
@@ -810,7 +810,7 @@ ENTRY(__cpu_secondary_check52bitva)
 	cbnz	x0, 2f
 
 	update_early_cpu_boot_status \
-		CPU_STUCK_IN_KERNEL | CPU_STUCK_REASON_52_BIT_VA, x0, x1
+		CPU_STUCK_IN_KERNEL | CPU_STUCK_REASON_52_BIT_VA, x0, w1
 1:	wfe
 	wfi
 	b	1b
@@ -822,7 +822,7 @@ ENDPROC(__cpu_secondary_check52bitva)
 __no_granule_support:
 	/* Indicate that this CPU can't boot and is stuck in the kernel */
 	update_early_cpu_boot_status \
-		CPU_STUCK_IN_KERNEL | CPU_STUCK_REASON_NO_GRAN, x1, x2
+		CPU_STUCK_IN_KERNEL | CPU_STUCK_REASON_NO_GRAN, x1, w2
 1:
 	wfe
 	wfi
Signature · 1 line
1.9.1
#2 lore raw
Quoted 12 lines · Will Deacon
Quoted 9 lines · Arun KS

__early_cpu_boot_status is of type int. Fix up the calls to update_early_cpu_boot_status, to use a w register.

---
 arch/arm64/include/asm/smp.h | 2 +-
 arch/arm64/kernel/head.S     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
Quoted 5 lines

Your original patch is now in mainline:

https://git.kernel.org/linus/61cf61d81e32

Is this still needed?

Thanks for pointing that out. We can ignore this patch.

Regards,
Arun

Quoted 2 lines

Will