arm64: capabilities: Move errata work around check on boot CPU (5e91107b) · Commits · 戴 / test

We trigger CPU errata work around check on the boot CPU from smp_prepare_boot_cpu() to make sure that we run the checks only after the CPU feature infrastructure is initialised. While this is correct, we can also do this from init_cpu_features() which initilises the infrastructure, and is called only on the Boot CPU. This helps to consolidate the CPU capability handling to cpufeature.c. No functional changes. Cc: Will Deacon <will.deacon@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Reviewed-by:

Dave Martin <dave.martin@arm.com> Signed-off-by:

Suzuki K Poulose <suzuki.poulose@arm.com> Signed-off-by:

Will Deacon <will.deacon@arm.com>

arch/arm64/kernel/cpufeature.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -551,6 +551,12 @@ void __init init_cpu_features(struct cpuinfo_arm64 *info)
		init_cpu_ftr_reg(SYS_ZCR_EL1, info->reg_zcr);
		sve_init_vq_map();
		}

		/*
		* Run the errata work around checks on the boot CPU, once we have
		* initialised the cpu feature infrastructure.
		*/
		update_cpu_errata_workarounds();
		}

		static void update_cpu_ftr_reg(struct arm64_ftr_reg *reg, u64 new)

arch/arm64/kernel/smp.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -448,12 +448,6 @@ void __init smp_prepare_boot_cpu(void)
		jump_label_init();
		cpuinfo_store_boot_cpu();
		save_boot_cpu_run_el();
		/*
		* Run the errata work around checks on the boot CPU, once we have
		* initialised the cpu feature infrastructure from
		* cpuinfo_store_boot_cpu() above.
		*/
		update_cpu_errata_workarounds();
		}

		static u64 __init of_get_cpu_mpidr(struct device_node *dn)

Admin message