arm64: Add HWCAP for self-synchronising virtual counter
Since userspace can make use of the CNTVSS_EL0 instruction, expose it via a HWCAP. Suggested-by: Will Deacon <will@kernel.org> Acked-by: Will Deacon <will@kernel.org> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20211017124225.3018098-18-maz@kernel.org Signed-off-by: Will Deacon <will@kernel.org> Signed-off-by: hongrongxuan <hongrongxuan@huawei.com> Conflicts: Documentation/arm64/cpu-feature-registers.rst arch/arm64/include/asm/hwcap.h arch/arm64/include/uapi/asm/hwcap.h arch/arm64/kernel/cpufeature.c arch/arm64/kernel/cpuinfo.c
This commit is contained in:
parent
c604df9a30
commit
9170a1344b
|
@ -210,7 +210,15 @@ infrastructure:
|
||||||
| DPB | [3-0] | y |
|
| DPB | [3-0] | y |
|
||||||
+------------------------------+---------+---------+
|
+------------------------------+---------+---------+
|
||||||
|
|
||||||
5) ID_AA64MMFR2_EL1 - Memory model feature register 2
|
5) ID_AA64MMFR0_EL1 - Memory model feature register 0
|
||||||
|
|
||||||
|
+------------------------------+---------+---------+
|
||||||
|
| Name | bits | visible |
|
||||||
|
+------------------------------+---------+---------+
|
||||||
|
| ECV | [63-60] | y |
|
||||||
|
+------------------------------+---------+---------+
|
||||||
|
|
||||||
|
6) ID_AA64MMFR2_EL1 - Memory model feature register 2
|
||||||
|
|
||||||
+------------------------------+---------+---------+
|
+------------------------------+---------+---------+
|
||||||
| Name | bits | visible |
|
| Name | bits | visible |
|
||||||
|
@ -218,7 +226,7 @@ infrastructure:
|
||||||
| AT | [35-32] | y |
|
| AT | [35-32] | y |
|
||||||
+------------------------------+---------+---------+
|
+------------------------------+---------+---------+
|
||||||
|
|
||||||
6) ID_AA64ZFR0_EL1 - SVE feature ID register 0
|
7) ID_AA64ZFR0_EL1 - SVE feature ID register 0
|
||||||
|
|
||||||
+------------------------------+---------+---------+
|
+------------------------------+---------+---------+
|
||||||
| Name | bits | visible |
|
| Name | bits | visible |
|
||||||
|
|
|
@ -202,6 +202,10 @@ HWCAP2_FRINT
|
||||||
Functionality implied by ID_AA64ISAR1_EL1.FRINTTS == 0b0001.
|
Functionality implied by ID_AA64ISAR1_EL1.FRINTTS == 0b0001.
|
||||||
|
|
||||||
|
|
||||||
|
HWCAP2_ECV
|
||||||
|
|
||||||
|
Functionality implied by ID_AA64MMFR0_EL1.ECV == 0b0001.
|
||||||
|
|
||||||
4. Unused AT_HWCAP bits
|
4. Unused AT_HWCAP bits
|
||||||
-----------------------
|
-----------------------
|
||||||
|
|
||||||
|
|
|
@ -86,6 +86,7 @@
|
||||||
#define KERNEL_HWCAP_SVESM4 __khwcap2_feature(SVESM4)
|
#define KERNEL_HWCAP_SVESM4 __khwcap2_feature(SVESM4)
|
||||||
#define KERNEL_HWCAP_FLAGM2 __khwcap2_feature(FLAGM2)
|
#define KERNEL_HWCAP_FLAGM2 __khwcap2_feature(FLAGM2)
|
||||||
#define KERNEL_HWCAP_FRINT __khwcap2_feature(FRINT)
|
#define KERNEL_HWCAP_FRINT __khwcap2_feature(FRINT)
|
||||||
|
#define KERNEL_HWCAP_ECV __khwcap2_feature(ECV)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 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
|
||||||
|
|
|
@ -65,5 +65,6 @@
|
||||||
#define HWCAP2_SVESM4 (1 << 6)
|
#define HWCAP2_SVESM4 (1 << 6)
|
||||||
#define HWCAP2_FLAGM2 (1 << 7)
|
#define HWCAP2_FLAGM2 (1 << 7)
|
||||||
#define HWCAP2_FRINT (1 << 8)
|
#define HWCAP2_FRINT (1 << 8)
|
||||||
|
#define HWCAP2_ECV (1 << 9)
|
||||||
|
|
||||||
#endif /* _UAPI__ASM_HWCAP_H */
|
#endif /* _UAPI__ASM_HWCAP_H */
|
||||||
|
|
|
@ -199,7 +199,7 @@ static const struct arm64_ftr_bits ftr_id_aa64zfr0[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = {
|
static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = {
|
||||||
ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_ECV_SHIFT, 4, 0),
|
ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_ECV_SHIFT, 4, 0),
|
||||||
ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_FGT_SHIFT, 4, 0),
|
ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_FGT_SHIFT, 4, 0),
|
||||||
ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_EXS_SHIFT, 4, 0),
|
ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_EXS_SHIFT, 4, 0),
|
||||||
/*
|
/*
|
||||||
|
@ -1729,6 +1729,7 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = {
|
||||||
HWCAP_MULTI_CAP(ptr_auth_hwcap_addr_matches, CAP_HWCAP, KERNEL_HWCAP_PACA),
|
HWCAP_MULTI_CAP(ptr_auth_hwcap_addr_matches, CAP_HWCAP, KERNEL_HWCAP_PACA),
|
||||||
HWCAP_MULTI_CAP(ptr_auth_hwcap_gen_matches, CAP_HWCAP, KERNEL_HWCAP_PACG),
|
HWCAP_MULTI_CAP(ptr_auth_hwcap_gen_matches, CAP_HWCAP, KERNEL_HWCAP_PACG),
|
||||||
#endif
|
#endif
|
||||||
|
HWCAP_CAP(SYS_ID_AA64MMFR0_EL1, ID_AA64MMFR0_ECV_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_ECV),
|
||||||
{},
|
{},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -86,6 +86,7 @@ static const char *const hwcap_str[] = {
|
||||||
"svesm4",
|
"svesm4",
|
||||||
"flagm2",
|
"flagm2",
|
||||||
"frint",
|
"frint",
|
||||||
|
"ecv",
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue