Commit 13dc4d83 authored by Will Deacon's avatar Will Deacon
Browse files

arm64: cpufeature: Remove redundant call to id_aa64pfr0_32bit_el0() 



There's no need to call id_aa64pfr0_32bit_el0() twice because the
sanitised value of ID_AA64PFR0_EL1 has already been updated for the CPU
being onlined.

Remove the redundant function call.

Tested-by: default avatarSai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20200421142922.18950-5-will@kernel.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 540f76d1

arch/arm64/kernel/cpufeature.c

+1 −3
Original line number Diff line number Diff line
@@ -792,9 +792,7 @@ void update_cpu_features(int cpu, 
	 * If we have AArch32, we care about 32-bit features for compat.

	 * If the system doesn't support AArch32, don't update them.

	 */

	if (id_aa64pfr0_32bit_el0(read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1)) &&

		id_aa64pfr0_32bit_el0(info->reg_id_aa64pfr0)) {



	if (id_aa64pfr0_32bit_el0(read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1))) {

		taint |= check_update_ftr_reg(SYS_ID_DFR0_EL1, cpu,

					info->reg_id_dfr0, boot->reg_id_dfr0);

		taint |= check_update_ftr_reg(SYS_ID_ISAR0_EL1, cpu,

CRA Git | Maintained and supported by SUSTech CRA and CCSE