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

Commit 4679971b authored by James Morse's avatar James Morse Committed by Sami Tolvanen
Browse files

UPSTREAM: arm64: cpufeature: Test 'matches' pointer to find the end of the list 



CPU feature code uses the desc field as a test to find the end of the list,
this means every entry must have a description. This generates noise for
entries in the list that aren't really features, but combinations of them.
e.g.
> CPU features: detected feature: Privileged Access Never
> CPU features: detected feature: PAN and not UAO

These combination features are needed for corner cases with alternatives,
where cpu features interact.

Change all walkers of the arm64_features[] and arm64_hwcaps[] lists to test
'matches' not 'desc', and only print 'desc' if it is non-NULL.

Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Reviewed-by : Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>

Bug: 31432001
Change-Id: I643e3922f247f13ec159b168d9276d6bd307c546
(cherry picked from commit 644c2ae198412c956700e55a2acf80b2541f6aa5)
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent 704f3627

arch/arm64/kernel/cpufeature.c

+6 −6
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ static void __init setup_cpu_hwcaps(void) 
	int i;

	const struct arm64_cpu_capabilities *hwcaps = arm64_hwcaps;



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

	for (i = 0; hwcaps[i].matches; i++)

		if (hwcaps[i].matches(&hwcaps[i]))

			cap_set_hwcap(&hwcaps[i]);

}
@@ -735,11 +735,11 @@ void update_cpu_capabilities(const struct arm64_cpu_capabilities *caps, 
{

	int i;



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

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

		if (!caps[i].matches(&caps[i]))

			continue;



		if (!cpus_have_cap(caps[i].capability))

		if (!cpus_have_cap(caps[i].capability) && caps[i].desc)

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

		cpus_set_cap(caps[i].capability);

	}
@@ -754,7 +754,7 @@ enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps) 
{

	int i;



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

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

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

			on_each_cpu(caps[i].enable, NULL, true);

}
@@ -861,7 +861,7 @@ void verify_local_cpu_capabilities(void) 
		return;



	caps = arm64_features;

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

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

		if (!cpus_have_cap(caps[i].capability) || !caps[i].sys_reg)

			continue;

		/*
@@ -874,7 +874,7 @@ void verify_local_cpu_capabilities(void) 
			caps[i].enable(NULL);

	}



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

	for (i = 0, caps = arm64_hwcaps; caps[i].matches; i++) {

		if (!cpus_have_hwcap(&caps[i]))

			continue;

		if (!feature_matches(__raw_read_system_reg(caps[i].sys_reg), &caps[i]))