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

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

arm64: Refactor check_cpu_capabilities 



check_cpu_capabilities runs through a given list of caps and
checks if the system has the cap, updates the system capability
bitmap and also runs any enable() methods associated with them.
All of this is not quite obvious from the name 'check'. This
patch splits the check_cpu_capabilities into two parts :

1) update_cpu_capabilities
 => Runs through the given list and updates the system
    wide capability map.
2) enable_cpu_capabilities
 => Runs through the given list and invokes enable() (if any)
    for the caps enabled on the system.

Cc: Andre Przywara <andre.przywara@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Suggested-by: default avatarCatalin Marinas <catalin.marinsa@arm.com>
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 c1e8656c

arch/arm64/include/asm/cpufeature.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -137,7 +137,7 @@ static inline bool id_aa64mmfr0_mixed_endian_el0(u64 mmfr0) 




void __init setup_cpu_features(void);

void __init setup_cpu_features(void);





void check_cpu_capabilities(const struct arm64_cpu_capabilities *caps,

void update_cpu_capabilities(const struct arm64_cpu_capabilities *caps,

			    const char *info);

			    const char *info);

void check_local_cpu_errata(void);

void check_local_cpu_errata(void);

void check_local_cpu_features(void);

void check_local_cpu_features(void);

arch/arm64/kernel/cpu_errata.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -88,5 +88,5 @@ const struct arm64_cpu_capabilities arm64_errata[] = { 




void check_local_cpu_errata(void)

void check_local_cpu_errata(void)

{

{

	check_cpu_capabilities(arm64_errata, "enabling workaround for");

	update_cpu_capabilities(arm64_errata, "enabling workaround for");

}
 
}

arch/arm64/kernel/cpufeature.c

+11 −3
Original line number Original line Diff line number Diff line
@@ -629,7 +629,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
	{},

	{},

};

};





void check_cpu_capabilities(const struct arm64_cpu_capabilities *caps,

void update_cpu_capabilities(const struct arm64_cpu_capabilities *caps,

			    const char *info)

			    const char *info)

{

{

	int i;

	int i;
@@ -642,8 +642,15 @@ void check_cpu_capabilities(const struct arm64_cpu_capabilities *caps, 
			pr_info("%s %s\n", info, caps[i].desc);

			pr_info("%s %s\n", info, caps[i].desc);

		cpus_set_cap(caps[i].capability);

		cpus_set_cap(caps[i].capability);

	}

	}

}



/*

 * Run through the enabled capabilities and enable() it on the CPUs

 */

void enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps)

{

	int i;





	/* second pass allows enable() to consider interacting capabilities */

	for (i = 0; caps[i].desc; i++) {

	for (i = 0; caps[i].desc; i++) {

		if (cpus_have_cap(caps[i].capability) && caps[i].enable)

		if (cpus_have_cap(caps[i].capability) && caps[i].enable)

			caps[i].enable();

			caps[i].enable();
@@ -652,7 +659,8 @@ void check_cpu_capabilities(const struct arm64_cpu_capabilities *caps, 




void check_local_cpu_features(void)

void check_local_cpu_features(void)

{

{

	check_cpu_capabilities(arm64_features, "detected feature:");

	update_cpu_capabilities(arm64_features, "detected feature:");

	enable_cpu_capabilities(arm64_features);

}

}





void __init setup_cpu_features(void)

void __init setup_cpu_features(void)