Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89ba2645 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Will Deacon
Browse files

arm64: Use consistent naming for errata handling 



This is a cosmetic change to rename the functions dealing with
the errata work arounds to be more consistent with their naming.

1) check_local_cpu_errata() => update_cpu_errata_workarounds()
check_local_cpu_errata() actually updates the system's errata work
arounds. So rename it to reflect the same.

2) verify_local_cpu_errata() => verify_local_cpu_errata_workarounds()
Use errata_workarounds instead of _errata.

Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent ee7bc638

arch/arm64/include/asm/cpufeature.h

+2 −2
Original line number Diff line number Diff line
@@ -202,10 +202,10 @@ void __init setup_cpu_features(void); 
void update_cpu_capabilities(const struct arm64_cpu_capabilities *caps,

			    const char *info);

void enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps);

void check_local_cpu_errata(void);

void update_cpu_errata_workarounds(void);

void __init enable_errata_workarounds(void);



void verify_local_cpu_errata(void);

void verify_local_cpu_errata_workarounds(void);

void verify_local_cpu_capabilities(void);



u64 read_system_reg(u32 id);

arch/arm64/kernel/cpu_errata.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { 
 * and the related information is freed soon after. If the new CPU requires

 * an errata not detected at boot, fail this CPU.

 */

void verify_local_cpu_errata(void)

void verify_local_cpu_errata_workarounds(void)

{

	const struct arm64_cpu_capabilities *caps = arm64_errata;
@@ -131,7 +131,7 @@ void verify_local_cpu_errata(void) 
		}

}



void check_local_cpu_errata(void)

void update_cpu_errata_workarounds(void)

{

	update_cpu_capabilities(arm64_errata, "enabling workaround for");

}

arch/arm64/kernel/cpufeature.c

+1 −1
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ void verify_local_cpu_capabilities(void) 
	if (!sys_caps_initialised)

		return;



	verify_local_cpu_errata();

	verify_local_cpu_errata_workarounds();

	verify_local_cpu_features(arm64_features);

	verify_local_elf_hwcaps(arm64_elf_hwcaps);

	if (system_supports_32bit_el0())

arch/arm64/kernel/cpuinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info) 


	cpuinfo_detect_icache_policy(info);



	check_local_cpu_errata();

	update_cpu_errata_workarounds();

}



void cpuinfo_store_cpu(void)