| Message ID | 20230428132546.2513834-1-kristina.martsenko@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: cpufeature: Fix pointer auth hwcaps | expand |
On Fri, Apr 28, 2023 at 02:25:46PM +0100, Kristina Martsenko wrote: > The pointer auth hwcaps are not getting reported to userspace, as they > are missing the .matches field. Add the field back. Reviewed-by: Mark Brown <broonie@kernel.org>
On Fri, Apr 28, 2023 at 02:25:46PM +0100, Kristina Martsenko wrote: > The pointer auth hwcaps are not getting reported to userspace, as they > are missing the .matches field. Add the field back. BTW I'm a bit concerned that none of the CI identified any issues with the pointer auth selftests going to skipped...
On Fri, 28 Apr 2023 14:25:46 +0100, Kristina Martsenko wrote: > The pointer auth hwcaps are not getting reported to userspace, as they > are missing the .matches field. Add the field back. > > Applied to arm64 (for-next/core), thanks! [1/1] arm64: cpufeature: Fix pointer auth hwcaps https://git.kernel.org/arm64/c/eda081d2efac Cheers,
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 1bdad599e769..d26a11f78b9f 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -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) }, {}, };
The pointer auth hwcaps are not getting reported to userspace, as they are missing the .matches field. Add the field back. Fixes: 876e3c8efe79 ("arm64/cpufeature: Pull out helper for CPUID register definitions") Signed-off-by: Kristina Martsenko <kristina.martsenko@arm.com> --- arch/arm64/kernel/cpufeature.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) base-commit: 4e8f6e44bce8da3b0e2df37b12839f4bc9c9cabe