mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 00:21:59 +00:00
arm64 fixes for -rc3
- Fix detection of "ClearBHB" and "Hinted Conditional Branch" features - Fix broken wildcarding for Arm PMU MAINTAINERS entry - Add missing documentation for userspace-visible ID register fields -----BEGIN PGP SIGNATURE----- iQFEBAABCgAuFiEEPxTL6PPUbjXGY88ct6xw3ITBYzQFAmUNbRAQHHdpbGxAa2Vy bmVsLm9yZwAKCRC3rHDchMFjNHGOB/9Tqq9d4PGxqSrexL71n+M6H17TNPOEGVgP VDclez3nTfCj0+XMnJmgabTADyuOjeHMCUPYR9uvlKMHvaSIaljbbbAr5QfLApXX 40a/KujV20WEaAl47dTWN5QR7d8zMpuiHzq0jDWsqvm/pNgvmSzxh3sMPKlWWBGW 4jmUqaYSwyC3HAL2ErfTckOj+gQTvYotFbJ8N0YCleTBPRQfRVMCpkzV1wCaaJ5/ wo9WFghiv1Bf6WKyX2mG246xugtLUaVQXeRDLfxyHmGdeuwcolltc2MaT7GjOLrw 273MgipmgvUMC8UNDQdh26ha4cRnNE2VIODdU0wQ99pT/pmwkcWF =aXwm -----END PGP SIGNATURE----- Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux Pull arm64 fixes from Will Deacon: "Small crop of relatively boring arm64 fixes for -rc3. That's not to say we don't have any juicy bugs, however, it's just that fixes for those are likely to come via -mm and -tip for a hugetlb and an atomics issue respectively. I get left with the documentation... - Fix detection of "ClearBHB" and "Hinted Conditional Branch" features - Fix broken wildcarding for Arm PMU MAINTAINERS entry - Add missing documentation for userspace-visible ID register fields" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: Document missing userspace visible fields in ID_AA64ISAR2_EL1 arm64/hbc: Document HWCAP2_HBC arm64/sme: Include ID_AA64PFR1_EL1.SME in cpu-feature-registers.rst arm64: cpufeature: Fix CLRBHB and BC detection MAINTAINERS: Use wildcard pattern for ARM PMU headers
This commit is contained in:
commit
36fcf38152
@ -175,6 +175,8 @@ infrastructure:
|
|||||||
+------------------------------+---------+---------+
|
+------------------------------+---------+---------+
|
||||||
| Name | bits | visible |
|
| Name | bits | visible |
|
||||||
+------------------------------+---------+---------+
|
+------------------------------+---------+---------+
|
||||||
|
| SME | [27-24] | y |
|
||||||
|
+------------------------------+---------+---------+
|
||||||
| MTE | [11-8] | y |
|
| MTE | [11-8] | y |
|
||||||
+------------------------------+---------+---------+
|
+------------------------------+---------+---------+
|
||||||
| SSBS | [7-4] | y |
|
| SSBS | [7-4] | y |
|
||||||
@ -288,8 +290,18 @@ infrastructure:
|
|||||||
+------------------------------+---------+---------+
|
+------------------------------+---------+---------+
|
||||||
| Name | bits | visible |
|
| Name | bits | visible |
|
||||||
+------------------------------+---------+---------+
|
+------------------------------+---------+---------+
|
||||||
|
| CSSC | [55-52] | y |
|
||||||
|
+------------------------------+---------+---------+
|
||||||
|
| RPRFM | [51-48] | y |
|
||||||
|
+------------------------------+---------+---------+
|
||||||
|
| BC | [23-20] | y |
|
||||||
|
+------------------------------+---------+---------+
|
||||||
| MOPS | [19-16] | y |
|
| MOPS | [19-16] | y |
|
||||||
+------------------------------+---------+---------+
|
+------------------------------+---------+---------+
|
||||||
|
| APA3 | [15-12] | y |
|
||||||
|
+------------------------------+---------+---------+
|
||||||
|
| GPA3 | [11-8] | y |
|
||||||
|
+------------------------------+---------+---------+
|
||||||
| RPRES | [7-4] | y |
|
| RPRES | [7-4] | y |
|
||||||
+------------------------------+---------+---------+
|
+------------------------------+---------+---------+
|
||||||
| WFXT | [3-0] | y |
|
| WFXT | [3-0] | y |
|
||||||
|
@ -305,6 +305,9 @@ HWCAP2_SMEF16F16
|
|||||||
HWCAP2_MOPS
|
HWCAP2_MOPS
|
||||||
Functionality implied by ID_AA64ISAR2_EL1.MOPS == 0b0001.
|
Functionality implied by ID_AA64ISAR2_EL1.MOPS == 0b0001.
|
||||||
|
|
||||||
|
HWCAP2_HBC
|
||||||
|
Functionality implied by ID_AA64ISAR2_EL1.BC == 0b0001.
|
||||||
|
|
||||||
4. Unused AT_HWCAP bits
|
4. Unused AT_HWCAP bits
|
||||||
-----------------------
|
-----------------------
|
||||||
|
|
||||||
|
@ -1662,7 +1662,7 @@ F: arch/arm*/include/asm/perf_event.h
|
|||||||
F: arch/arm*/kernel/hw_breakpoint.c
|
F: arch/arm*/kernel/hw_breakpoint.c
|
||||||
F: arch/arm*/kernel/perf_*
|
F: arch/arm*/kernel/perf_*
|
||||||
F: drivers/perf/
|
F: drivers/perf/
|
||||||
F: include/linux/perf/arm_pmu.h
|
F: include/linux/perf/arm_pmu*.h
|
||||||
|
|
||||||
ARM PORT
|
ARM PORT
|
||||||
M: Russell King <linux@armlinux.org.uk>
|
M: Russell King <linux@armlinux.org.uk>
|
||||||
|
@ -663,7 +663,7 @@ static inline bool supports_clearbhb(int scope)
|
|||||||
isar2 = read_sanitised_ftr_reg(SYS_ID_AA64ISAR2_EL1);
|
isar2 = read_sanitised_ftr_reg(SYS_ID_AA64ISAR2_EL1);
|
||||||
|
|
||||||
return cpuid_feature_extract_unsigned_field(isar2,
|
return cpuid_feature_extract_unsigned_field(isar2,
|
||||||
ID_AA64ISAR2_EL1_BC_SHIFT);
|
ID_AA64ISAR2_EL1_CLRBHB_SHIFT);
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct cpumask *system_32bit_el0_cpumask(void);
|
const struct cpumask *system_32bit_el0_cpumask(void);
|
||||||
|
@ -222,7 +222,8 @@ static const struct arm64_ftr_bits ftr_id_aa64isar1[] = {
|
|||||||
static const struct arm64_ftr_bits ftr_id_aa64isar2[] = {
|
static const struct arm64_ftr_bits ftr_id_aa64isar2[] = {
|
||||||
ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_EL1_CSSC_SHIFT, 4, 0),
|
ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_EL1_CSSC_SHIFT, 4, 0),
|
||||||
ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_EL1_RPRFM_SHIFT, 4, 0),
|
ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_EL1_RPRFM_SHIFT, 4, 0),
|
||||||
ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_HIGHER_SAFE, ID_AA64ISAR2_EL1_BC_SHIFT, 4, 0),
|
ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_EL1_CLRBHB_SHIFT, 4, 0),
|
||||||
|
ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_EL1_BC_SHIFT, 4, 0),
|
||||||
ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_EL1_MOPS_SHIFT, 4, 0),
|
ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_EL1_MOPS_SHIFT, 4, 0),
|
||||||
ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH),
|
ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH),
|
||||||
FTR_STRICT, FTR_EXACT, ID_AA64ISAR2_EL1_APA3_SHIFT, 4, 0),
|
FTR_STRICT, FTR_EXACT, ID_AA64ISAR2_EL1_APA3_SHIFT, 4, 0),
|
||||||
|
@ -1347,7 +1347,11 @@ UnsignedEnum 51:48 RPRFM
|
|||||||
0b0000 NI
|
0b0000 NI
|
||||||
0b0001 IMP
|
0b0001 IMP
|
||||||
EndEnum
|
EndEnum
|
||||||
Res0 47:28
|
Res0 47:32
|
||||||
|
UnsignedEnum 31:28 CLRBHB
|
||||||
|
0b0000 NI
|
||||||
|
0b0001 IMP
|
||||||
|
EndEnum
|
||||||
UnsignedEnum 27:24 PAC_frac
|
UnsignedEnum 27:24 PAC_frac
|
||||||
0b0000 NI
|
0b0000 NI
|
||||||
0b0001 IMP
|
0b0001 IMP
|
||||||
|
Loading…
Reference in New Issue
Block a user