Commit 4b998ff1 authored by Suzuki K. Poulose's avatar Suzuki K. Poulose Committed by Catalin Marinas
Browse files

arm64: Delay cpuinfo_store_boot_cpu 



At the moment the boot CPU stores the cpuinfo long before the
PERCPU areas are initialised by the kernel. This could be problematic
as the non-boot CPU data structures might get copied with the data
from the boot CPU, giving us no chance to detect if a particular CPU
updated its cpuinfo. This patch delays the boot cpu store to
smp_prepare_boot_cpu().

Also kills the setup_processor() which no longer does meaningful
work.

Signed-off-by: default avatarSuzuki K. Poulose <suzuki.poulose@arm.com>
Tested-by: default avatarDave Martin <Dave.Martin@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 3a75578e

arch/arm64/kernel/setup.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -286,13 +286,6 @@ void __init setup_cpu_features(void) 
#endif

#endif

}

}





static void __init setup_processor(void)

{

	pr_info("Boot CPU: AArch64 Processor [%08x]\n", read_cpuid_id());

	sprintf(init_utsname()->machine, ELF_PLATFORM);

	cpuinfo_store_boot_cpu();

}



static void __init setup_machine_fdt(phys_addr_t dt_phys)

static void __init setup_machine_fdt(phys_addr_t dt_phys)

{

{

	void *dt_virt = fixmap_remap_fdt(dt_phys);

	void *dt_virt = fixmap_remap_fdt(dt_phys);
@@ -404,8 +397,9 @@ u64 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALID_HWID }; 




void __init setup_arch(char **cmdline_p)

void __init setup_arch(char **cmdline_p)

{

{

	setup_processor();

	pr_info("Boot CPU: AArch64 Processor [%08x]\n", read_cpuid_id());





	sprintf(init_utsname()->machine, ELF_PLATFORM);

	init_mm.start_code = (unsigned long) _text;

	init_mm.start_code = (unsigned long) _text;

	init_mm.end_code   = (unsigned long) _etext;

	init_mm.end_code   = (unsigned long) _etext;

	init_mm.end_data   = (unsigned long) _edata;

	init_mm.end_data   = (unsigned long) _edata;

arch/arm64/kernel/smp.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -327,6 +327,7 @@ void __init smp_cpus_done(unsigned int max_cpus) 




void __init smp_prepare_boot_cpu(void)

void __init smp_prepare_boot_cpu(void)

{

{

	cpuinfo_store_boot_cpu();

	set_my_cpu_offset(per_cpu_offset(smp_processor_id()));

	set_my_cpu_offset(per_cpu_offset(smp_processor_id()));

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE