Commit eda081d2 authored by Kristina Martsenko's avatar Kristina Martsenko Committed by Will Deacon
Browse files

arm64: cpufeature: Fix pointer auth hwcaps 



The pointer auth hwcaps are not getting reported to userspace, as they
are missing the .matches field. Add the field back.

Fixes: 876e3c8e ("arm64/cpufeature: Pull out helper for CPUID register definitions")
Signed-off-by: default avatarKristina Martsenko <kristina.martsenko@arm.com>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230428132546.2513834-1-kristina.martsenko@arm.com


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

arch/arm64/kernel/cpufeature.c

+6 −6
Original line number Diff line number Diff line
@@ -2657,26 +2657,26 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
#ifdef CONFIG_ARM64_PTR_AUTH

static const struct arm64_cpu_capabilities ptr_auth_hwcap_addr_matches[] = {

	{

		ARM64_CPUID_FIELDS(ID_AA64ISAR1_EL1, APA, PAuth)

		HWCAP_CPUID_MATCH(ID_AA64ISAR1_EL1, APA, PAuth)

	},

	{

		ARM64_CPUID_FIELDS(ID_AA64ISAR2_EL1, APA3, PAuth)

		HWCAP_CPUID_MATCH(ID_AA64ISAR2_EL1, APA3, PAuth)

	},

	{

		ARM64_CPUID_FIELDS(ID_AA64ISAR1_EL1, API, PAuth)

		HWCAP_CPUID_MATCH(ID_AA64ISAR1_EL1, API, PAuth)

	},

	{},

};



static const struct arm64_cpu_capabilities ptr_auth_hwcap_gen_matches[] = {

	{

		ARM64_CPUID_FIELDS(ID_AA64ISAR1_EL1, GPA, IMP)

		HWCAP_CPUID_MATCH(ID_AA64ISAR1_EL1, GPA, IMP)

	},

	{

		ARM64_CPUID_FIELDS(ID_AA64ISAR2_EL1, GPA3, IMP)

		HWCAP_CPUID_MATCH(ID_AA64ISAR2_EL1, GPA3, IMP)

	},

	{

		ARM64_CPUID_FIELDS(ID_AA64ISAR1_EL1, GPI, IMP)

		HWCAP_CPUID_MATCH(ID_AA64ISAR1_EL1, GPI, IMP)

	},

	{},

};