arm64: cpufeature: add HWCAP for FEAT_AFP
commit 5c13f042e73200b50573ace63e1a6b94e2917616 upstream. Add a new HWCAP to detect the Alternate Floating-point Behaviour feature (FEAT_AFP), introduced in Armv8.7. Also expose this to userspace in the ID_AA64MMFR1_EL1 feature register. Signed-off-by: Joey Gouly <joey.gouly@arm.com> Cc: Will Deacon <will@kernel.org> Acked-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20211210165432.8106-2-joey.gouly@arm.com Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
dbcfa98539
commit
162aa002ec
@@ -275,6 +275,15 @@ infrastructure:
|
|||||||
| SVEVer | [3-0] | y |
|
| SVEVer | [3-0] | y |
|
||||||
+------------------------------+---------+---------+
|
+------------------------------+---------+---------+
|
||||||
|
|
||||||
|
8) ID_AA64MMFR1_EL1 - Memory model feature register 1
|
||||||
|
|
||||||
|
+------------------------------+---------+---------+
|
||||||
|
| Name | bits | visible |
|
||||||
|
+------------------------------+---------+---------+
|
||||||
|
| AFP | [47-44] | y |
|
||||||
|
+------------------------------+---------+---------+
|
||||||
|
|
||||||
|
|
||||||
Appendix I: Example
|
Appendix I: Example
|
||||||
-------------------
|
-------------------
|
||||||
|
|
||||||
|
@@ -249,6 +249,10 @@ HWCAP2_ECV
|
|||||||
|
|
||||||
Functionality implied by ID_AA64MMFR0_EL1.ECV == 0b0001.
|
Functionality implied by ID_AA64MMFR0_EL1.ECV == 0b0001.
|
||||||
|
|
||||||
|
HWCAP2_AFP
|
||||||
|
|
||||||
|
Functionality implied by ID_AA64MFR1_EL1.AFP == 0b0001.
|
||||||
|
|
||||||
4. Unused AT_HWCAP bits
|
4. Unused AT_HWCAP bits
|
||||||
-----------------------
|
-----------------------
|
||||||
|
|
||||||
|
@@ -106,6 +106,7 @@
|
|||||||
#define KERNEL_HWCAP_BTI __khwcap2_feature(BTI)
|
#define KERNEL_HWCAP_BTI __khwcap2_feature(BTI)
|
||||||
#define KERNEL_HWCAP_MTE __khwcap2_feature(MTE)
|
#define KERNEL_HWCAP_MTE __khwcap2_feature(MTE)
|
||||||
#define KERNEL_HWCAP_ECV __khwcap2_feature(ECV)
|
#define KERNEL_HWCAP_ECV __khwcap2_feature(ECV)
|
||||||
|
#define KERNEL_HWCAP_AFP __khwcap2_feature(AFP)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This yields a mask that user programs can use to figure out what
|
* This yields a mask that user programs can use to figure out what
|
||||||
|
@@ -801,6 +801,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* id_aa64mmfr1 */
|
/* id_aa64mmfr1 */
|
||||||
|
#define ID_AA64MMFR1_AFP_SHIFT 44
|
||||||
#define ID_AA64MMFR1_ETS_SHIFT 36
|
#define ID_AA64MMFR1_ETS_SHIFT 36
|
||||||
#define ID_AA64MMFR1_TWED_SHIFT 32
|
#define ID_AA64MMFR1_TWED_SHIFT 32
|
||||||
#define ID_AA64MMFR1_XNX_SHIFT 28
|
#define ID_AA64MMFR1_XNX_SHIFT 28
|
||||||
|
@@ -76,5 +76,6 @@
|
|||||||
#define HWCAP2_BTI (1 << 17)
|
#define HWCAP2_BTI (1 << 17)
|
||||||
#define HWCAP2_MTE (1 << 18)
|
#define HWCAP2_MTE (1 << 18)
|
||||||
#define HWCAP2_ECV (1 << 19)
|
#define HWCAP2_ECV (1 << 19)
|
||||||
|
#define HWCAP2_AFP (1 << 20)
|
||||||
|
|
||||||
#endif /* _UAPI__ASM_HWCAP_H */
|
#endif /* _UAPI__ASM_HWCAP_H */
|
||||||
|
@@ -309,6 +309,7 @@ static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static const struct arm64_ftr_bits ftr_id_aa64mmfr1[] = {
|
static const struct arm64_ftr_bits ftr_id_aa64mmfr1[] = {
|
||||||
|
ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_AFP_SHIFT, 4, 0),
|
||||||
ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_ETS_SHIFT, 4, 0),
|
ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_ETS_SHIFT, 4, 0),
|
||||||
ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_TWED_SHIFT, 4, 0),
|
ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_TWED_SHIFT, 4, 0),
|
||||||
ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_XNX_SHIFT, 4, 0),
|
ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_XNX_SHIFT, 4, 0),
|
||||||
@@ -2262,6 +2263,7 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = {
|
|||||||
HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_MTE_SHIFT, FTR_UNSIGNED, ID_AA64PFR1_MTE, CAP_HWCAP, KERNEL_HWCAP_MTE),
|
HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_MTE_SHIFT, FTR_UNSIGNED, ID_AA64PFR1_MTE, CAP_HWCAP, KERNEL_HWCAP_MTE),
|
||||||
#endif /* CONFIG_ARM64_MTE */
|
#endif /* CONFIG_ARM64_MTE */
|
||||||
HWCAP_CAP(SYS_ID_AA64MMFR0_EL1, ID_AA64MMFR0_ECV_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_ECV),
|
HWCAP_CAP(SYS_ID_AA64MMFR0_EL1, ID_AA64MMFR0_ECV_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_ECV),
|
||||||
|
HWCAP_CAP(SYS_ID_AA64MMFR1_EL1, ID_AA64MMFR1_AFP_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_AFP),
|
||||||
{},
|
{},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -95,6 +95,7 @@ static const char *const hwcap_str[] = {
|
|||||||
[KERNEL_HWCAP_BTI] = "bti",
|
[KERNEL_HWCAP_BTI] = "bti",
|
||||||
[KERNEL_HWCAP_MTE] = "mte",
|
[KERNEL_HWCAP_MTE] = "mte",
|
||||||
[KERNEL_HWCAP_ECV] = "ecv",
|
[KERNEL_HWCAP_ECV] = "ecv",
|
||||||
|
[KERNEL_HWCAP_AFP] = "afp",
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_COMPAT
|
#ifdef CONFIG_COMPAT
|
||||||
|
Reference in New Issue
Block a user