arm64/sysreg: Convert aarch32 id regs
v2 cover arm64/sysreg: Convert aarch32 id regs
Hello!
Changes since the v1
* Duplicate definition muck up in patch 29 fixed.
* Rebased onto arm64/for-next/sysregs, which is just rc4.
---
To cleanup an erratum affecting aarch32, I wanted a mask for an id register. This would have been quick to add, but the right thing to do is to convert that register to automatic generation. If I was going that far, I may as well do the lot...
Thanks to Mark Brown for reviewing all this - it was mind numbing to write, I'm sure its even worse to review!
This will conflict with Amit's series that adds new HWCAPs for 32bit. Let me know what I should rebase this onto.
The patch that changes the size of the fields in the middle of the series is the most interesting thing. I also discovered that the tools accept '0b002' as a value, and it doesn't mind duplicate entries.
This series is based on v6.1-rc4, and can be retrieved from:
https://git.kernel.org/pub/scm/linux/kernel/git/morse/linux.git arm64/generated_sysreg/a32/v2
James Morse (38):
arm64/sysreg: Standardise naming for ID_MMFR0_EL1 arm64/sysreg: Standardise naming for ID_MMFR4_EL1 arm64/sysreg: Standardise naming for ID_MMFR5_EL1 arm64/sysreg: Standardise naming for ID_ISAR0_EL1 arm64/sysreg: Standardise naming for ID_ISAR4_EL1 arm64/sysreg: Standardise naming for ID_ISAR5_EL1 arm64/sysreg: Standardise naming for ID_ISAR6_EL1 arm64/sysreg: Standardise naming for ID_PFR0_EL1 arm64/sysreg: Standardise naming for ID_PFR1_EL1 arm64/sysreg: Standardise naming for ID_PFR2_EL1 arm64/sysreg: Standardise naming for ID_DFR0_EL1 arm64/sysreg: Standardise naming for ID_DFR1_EL1 arm64/sysreg: Standardise naming for MVFR0_EL1 arm64/sysreg: Standardise naming for MVFR1_EL1 arm64/sysreg: Standardise naming for MVFR2_EL1 arm64/sysreg: Extend the maximum width of a register and symbol name arm64/sysreg: Convert ID_MMFR0_EL1 to automatic generation arm64/sysreg: Convert ID_MMFR1_EL1 to automatic generation arm64/sysreg: Convert ID_MMFR2_EL1 to automatic generation arm64/sysreg: Convert ID_MMFR3_EL1 to automatic generation arm64/sysreg: Convert ID_MMFR4_EL1 to automatic generation arm64/sysreg: Convert ID_ISAR0_EL1 to automatic generation arm64/sysreg: Convert ID_ISAR1_EL1 to automatic generation arm64/sysreg: Convert ID_ISAR2_EL1 to automatic generation arm64/sysreg: Convert ID_ISAR3_EL1 to automatic generation arm64/sysreg: Convert ID_ISAR4_EL1 to automatic generation arm64/sysreg: Convert ID_ISAR5_EL1 to automatic generation arm64/sysreg: Convert ID_ISAR6_EL1 to automatic generation arm64/sysreg: Convert ID_PFR0_EL1 to automatic generation arm64/sysreg: Convert ID_PFR1_EL1 to automatic generation arm64/sysreg: Convert ID_PFR2_EL1 to automatic generation arm64/sysreg: Convert MVFR0_EL1 to automatic generation arm64/sysreg: Convert MVFR1_EL1 to automatic generation arm64/sysreg: Convert MVFR2_EL1 to automatic generation arm64/sysreg: Convert ID_MMFR5_EL1 to automatic generation arm64/sysreg: Convert ID_AFR0_EL1 to automatic generation arm64/sysreg: Convert ID_DFR0_EL1 to automatic generation arm64/sysreg: Convert ID_DFR1_EL1 to automatic generation
arch/arm64/include/asm/sysreg.h | 134 +----- arch/arm64/kernel/cpufeature.c | 208 ++++----- arch/arm64/kvm/sys_regs.c | 4 +- arch/arm64/tools/gen-sysreg.awk | 2 +- arch/arm64/tools/sysreg | 754 ++++++++++++++++++++++++++++++++ 5 files changed, 862 insertions(+), 240 deletions(-)
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 1/38 arm64/sysreg: Standardise naming for ID_MMFR0_EL1
To convert the 32bit id registers to use the sysreg generation, they must first have a regular pattern, to match the symbols the script generates. The scripts would like to follow exactly what is in the arm-arm, which uses lower case for some of these feature names.
Ensure symbols for the ID_MMFR0_EL1 register have an _EL1 suffix, and use lower case in feature names where the arm-arm does the same.
No functional change.
--- arch/arm64/include/asm/sysreg.h | 16 ++++++++-------- arch/arm64/kernel/cpufeature.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-)
arch/arm64/include/asm/sysreg.h +8 -8
@@ -733,14 +733,14 @@#define ID_ISAR6_DP_SHIFT 4#define ID_ISAR6_JSCVT_SHIFT 0 -#define ID_MMFR0_INNERSHR_SHIFT 28 -#define ID_MMFR0_FCSE_SHIFT 24 -#define ID_MMFR0_AUXREG_SHIFT 20 -#define ID_MMFR0_TCM_SHIFT 16 -#define ID_MMFR0_SHARELVL_SHIFT 12 -#define ID_MMFR0_OUTERSHR_SHIFT 8 -#define ID_MMFR0_PMSA_SHIFT 4 -#define ID_MMFR0_VMSA_SHIFT 0 +#define ID_MMFR0_EL1_InnerShr_SHIFT 28 +#define ID_MMFR0_EL1_FCSE_SHIFT 24 +#define ID_MMFR0_EL1_AuxReg_SHIFT 20 +#define ID_MMFR0_EL1_TCM_SHIFT 16 +#define ID_MMFR0_EL1_ShareLvl_SHIFT 12 +#define ID_MMFR0_EL1_OuterShr_SHIFT 8 +#define ID_MMFR0_EL1_PMSA_SHIFT 4 +#define ID_MMFR0_EL1_VMSA_SHIFT 0#define ID_MMFR4_EVT_SHIFT 28#define ID_MMFR4_CCIDX_SHIFT 24
arch/arm64/kernel/cpufeature.c +8 -8
@@ -402,14 +402,14 @@ struct arm64_ftr_reg arm64_ftr_reg_ctrel0 = { };static const struct arm64_ftr_bits ftr_id_mmfr0[] = { -S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR0_INNERSHR_SHIFT ,4 ,0xf ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR0_FCSE_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE ,ID_MMFR0_AUXREG_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR0_TCM_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR0_SHARELVL_SHIFT ,4 ,0 ), -S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR0_OUTERSHR_SHIFT ,4 ,0xf ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR0_PMSA_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR0_VMSA_SHIFT ,4 ,0 ), +S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_MMFR0_EL1_InnerShr_SHIFT,4 ,0xf ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR0_EL1_FCSE_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE , ID_MMFR0_EL1_AuxReg_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR0_EL1_TCM_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_MMFR0_EL1_ShareLvl_SHIFT,4 ,0 ), +S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_MMFR0_EL1_OuterShr_SHIFT,4 ,0xf ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR0_EL1_PMSA_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR0_EL1_VMSA_SHIFT ,4 ,0 ),ARM64_FTR_END , };
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 2/38 arm64/sysreg: Standardise naming for ID_MMFR4_EL1
In reply to James MorseTo convert the 32bit id registers to use the sysreg generation, they must first have a regular pattern, to match the symbols the script generates.
Ensure symbols for the ID_MMFR4_EL1 register have an _EL1 suffix, and use lower case in feature names where the arm-arm does the same.
No functional change.
--- arch/arm64/include/asm/sysreg.h | 16 ++++++++-------- arch/arm64/kernel/cpufeature.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-)
arch/arm64/include/asm/sysreg.h +8 -8
@@ -742,14 +742,14 @@#define ID_MMFR0_EL1_PMSA_SHIFT 4#define ID_MMFR0_EL1_VMSA_SHIFT 0 -#define ID_MMFR4_EVT_SHIFT 28 -#define ID_MMFR4_CCIDX_SHIFT 24 -#define ID_MMFR4_LSM_SHIFT 20 -#define ID_MMFR4_HPDS_SHIFT 16 -#define ID_MMFR4_CNP_SHIFT 12 -#define ID_MMFR4_XNX_SHIFT 8 -#define ID_MMFR4_AC2_SHIFT 4 -#define ID_MMFR4_SPECSEI_SHIFT 0 +#define ID_MMFR4_EL1_EVT_SHIFT 28 +#define ID_MMFR4_EL1_CCIDX_SHIFT 24 +#define ID_MMFR4_EL1_LSM_SHIFT 20 +#define ID_MMFR4_EL1_HPDS_SHIFT 16 +#define ID_MMFR4_EL1_CnP_SHIFT 12 +#define ID_MMFR4_EL1_XNX_SHIFT 8 +#define ID_MMFR4_EL1_AC2_SHIFT 4 +#define ID_MMFR4_EL1_SpecSEI_SHIFT 0#define ID_MMFR5_ETS_SHIFT 0
arch/arm64/kernel/cpufeature.c +8 -8
@@ -491,13 +491,13 @@ static const struct arm64_ftr_bits ftr_id_isar5[] = { };static const struct arm64_ftr_bits ftr_id_mmfr4[] = { -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR4_EVT_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR4_CCIDX_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR4_LSM_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR4_HPDS_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR4_CNP_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR4_XNX_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR4_AC2_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR4_EL1_EVT_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR4_EL1_CCIDX_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR4_EL1_LSM_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR4_EL1_HPDS_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_MMFR4_EL1_CnP_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR4_EL1_XNX_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR4_EL1_AC2_SHIFT ,4 ,0 ),/* * SpecSEI = 1 indicates that the PE might generate an SError on an
@@ -505,7 +505,7 @@ static const struct arm64_ftr_bits ftr_id_mmfr4[] = {* SError might be generated than it will not be. Hence it has been * classified as FTR_HIGHER_SAFE. */ -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_HIGHER_SAFE ,ID_MMFR4_SPECSEI_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_HIGHER_SAFE , ID_MMFR4_EL1_SpecSEI_SHIFT,4 ,0 ), ARM64_FTR_END, };
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 3/38 arm64/sysreg: Standardise naming for ID_MMFR5_EL1
In reply to James MorseTo convert the 32bit id registers to use the sysreg generation, they must first have a regular pattern, to match the symbols the script generates.
Ensure symbols for the ID_MMFR5_EL1 register have an _EL1 suffix.
No functional change.
--- arch/arm64/include/asm/sysreg.h | 2 +- arch/arm64/kernel/cpufeature.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/include/asm/sysreg.h +1 -1
@@ -751,7 +751,7 @@#define ID_MMFR4_EL1_AC2_SHIFT 4#define ID_MMFR4_EL1_SpecSEI_SHIFT 0 -#define ID_MMFR5_ETS_SHIFT 0 +#define ID_MMFR5_EL1_ETS_SHIFT 0#define ID_PFR0_DIT_SHIFT 24#define ID_PFR0_CSV2_SHIFT 16
arch/arm64/kernel/cpufeature.c +1 -1
@@ -522,7 +522,7 @@ static const struct arm64_ftr_bits ftr_id_isar4[] = { };static const struct arm64_ftr_bits ftr_id_mmfr5[] = { -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR5_ETS_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_MMFR5_EL1_ETS_SHIFT ,4 ,0 ),ARM64_FTR_END , };
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 4/38 arm64/sysreg: Standardise naming for ID_ISAR0_EL1
In reply to James MorseTo convert the 32bit id registers to use the sysreg generation, they must first have a regular pattern, to match the symbols the script generates.
Ensure symbols for the ID_ISAR0_EL1 register have an _EL1 suffix, and use lower-case for feature names where the arm-arm does the same.
To functional change.
--- arch/arm64/include/asm/sysreg.h | 14 +++++++------- arch/arm64/kernel/cpufeature.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-)
arch/arm64/include/asm/sysreg.h +7 -7
@@ -710,13 +710,13 @@#define ID_DFR1_MTPMU_SHIFT 0 -#define ID_ISAR0_DIVIDE_SHIFT 24 -#define ID_ISAR0_DEBUG_SHIFT 20 -#define ID_ISAR0_COPROC_SHIFT 16 -#define ID_ISAR0_CMPBRANCH_SHIFT 12 -#define ID_ISAR0_BITFIELD_SHIFT 8 -#define ID_ISAR0_BITCOUNT_SHIFT 4 -#define ID_ISAR0_SWAP_SHIFT 0 +#define ID_ISAR0_EL1_Divide_SHIFT 24 +#define ID_ISAR0_EL1_Debug_SHIFT 20 +#define ID_ISAR0_EL1_Coproc_SHIFT 16 +#define ID_ISAR0_EL1_CmpBranch_SHIFT 12 +#define ID_ISAR0_EL1_BitField_SHIFT 8 +#define ID_ISAR0_EL1_BitCount_SHIFT 4 +#define ID_ISAR0_EL1_Swap_SHIFT 0#define ID_ISAR5_RDM_SHIFT 24#define ID_ISAR5_CRC32_SHIFT 16
arch/arm64/kernel/cpufeature.c +7 -7
@@ -470,13 +470,13 @@ static const struct arm64_ftr_bits ftr_gmid[] = { };static const struct arm64_ftr_bits ftr_id_isar0[] = { -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR0_DIVIDE_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR0_DEBUG_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR0_COPROC_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR0_CMPBRANCH_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR0_BITFIELD_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR0_BITCOUNT_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR0_SWAP_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_ISAR0_EL1_Divide_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_ISAR0_EL1_Debug_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_ISAR0_EL1_Coproc_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_ISAR0_EL1_CmpBranch_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_ISAR0_EL1_BitField_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_ISAR0_EL1_BitCount_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_ISAR0_EL1_Swap_SHIFT,4 ,0 ),ARM64_FTR_END , };
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 5/38 arm64/sysreg: Standardise naming for ID_ISAR4_EL1
In reply to James MorseTo convert the 32bit id registers to use the sysreg generation, they must first have a regular pattern, to match the symbols the script generates.
Ensure symbols for the ID_ISAR4_EL1 register have an _EL1 suffix, and use lower-case for feature names where the arm-arm does the same.
No functional change.
--- arch/arm64/include/asm/sysreg.h | 16 ++++++++-------- arch/arm64/kernel/cpufeature.c | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-)
arch/arm64/include/asm/sysreg.h +8 -8
@@ -699,14 +699,14 @@#define ID_DFR0_PERFMON_8_4 0x5#define ID_DFR0_PERFMON_8_5 0x6 -#define ID_ISAR4_SWP_FRAC_SHIFT 28 -#define ID_ISAR4_PSR_M_SHIFT 24 -#define ID_ISAR4_SYNCH_PRIM_FRAC_SHIFT 20 -#define ID_ISAR4_BARRIER_SHIFT 16 -#define ID_ISAR4_SMC_SHIFT 12 -#define ID_ISAR4_WRITEBACK_SHIFT 8 -#define ID_ISAR4_WITHSHIFTS_SHIFT 4 -#define ID_ISAR4_UNPRIV_SHIFT 0 +#define ID_ISAR4_EL1_SWP_frac_SHIFT 28 +#define ID_ISAR4_EL1_PSR_M_SHIFT 24 +#define ID_ISAR4_EL1_SynchPrim_frac_SHIFT 20 +#define ID_ISAR4_EL1_Barrier_SHIFT 16 +#define ID_ISAR4_EL1_SMC_SHIFT 12 +#define ID_ISAR4_EL1_Writeback_SHIFT 8 +#define ID_ISAR4_EL1_WithShifts_SHIFT 4 +#define ID_ISAR4_EL1_Unpriv_SHIFT 0#define ID_DFR1_MTPMU_SHIFT 0
arch/arm64/kernel/cpufeature.c +9 -9
@@ -510,14 +510,14 @@ static const struct arm64_ftr_bits ftr_id_mmfr4[] = { };static const struct arm64_ftr_bits ftr_id_isar4[] = { -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR4_SWP_FRAC_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR4_PSR_M_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR4_SYNCH_PRIM_FRAC_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR4_BARRIER_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR4_SMC_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR4_WRITEBACK_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR4_WITHSHIFTS_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR4_UNPRIV_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_ISAR4_EL1_SWP_frac_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR4_EL1_PSR_M_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_ISAR4_EL1_SynchPrim_frac_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_ISAR4_EL1_Barrier_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR4_EL1_SMC_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_ISAR4_EL1_Writeback_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_ISAR4_EL1_WithShifts_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_ISAR4_EL1_Unpriv_SHIFT,4 ,0 ),ARM64_FTR_END , };
@@ -1119,7 +1119,7 @@ static int update_32bit_cpu_features(int cpu, struct cpuinfo_32bit *info,* EL1-dependent register fields to avoid spurious sanity check fails. */ if (!id_aa64pfr0_32bit_el1 (pfr0)) { -relax_cpu_ftr_reg (SYS_ID_ISAR4_EL1 ,ID_ISAR4_SMC_SHIFT ); +relax_cpu_ftr_reg (SYS_ID_ISAR4_EL1 ,ID_ISAR4_EL1_SMC_SHIFT );relax_cpu_ftr_reg (SYS_ID_PFR1_EL1 ,ID_PFR1_VIRT_FRAC_SHIFT );relax_cpu_ftr_reg (SYS_ID_PFR1_EL1 ,ID_PFR1_SEC_FRAC_SHIFT );relax_cpu_ftr_reg (SYS_ID_PFR1_EL1 ,ID_PFR1_VIRTUALIZATION_SHIFT );
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 6/38 arm64/sysreg: Standardise naming for ID_ISAR5_EL1
In reply to James MorseTo convert the 32bit id registers to use the sysreg generation, they must first have a regular pattern, to match the symbols the script generates.
Ensure symbols for the ID_ISAR5_EL1 register have an _EL1 suffix.
No functional change.
--- arch/arm64/include/asm/sysreg.h | 12 ++++++------ arch/arm64/kernel/cpufeature.c | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 17 deletions(-)
arch/arm64/include/asm/sysreg.h +6 -6
@@ -718,12 +718,12 @@#define ID_ISAR0_EL1_BitCount_SHIFT 4#define ID_ISAR0_EL1_Swap_SHIFT 0 -#define ID_ISAR5_RDM_SHIFT 24 -#define ID_ISAR5_CRC32_SHIFT 16 -#define ID_ISAR5_SHA2_SHIFT 12 -#define ID_ISAR5_SHA1_SHIFT 8 -#define ID_ISAR5_AES_SHIFT 4 -#define ID_ISAR5_SEVL_SHIFT 0 +#define ID_ISAR5_EL1_RDM_SHIFT 24 +#define ID_ISAR5_EL1_CRC32_SHIFT 16 +#define ID_ISAR5_EL1_SHA2_SHIFT 12 +#define ID_ISAR5_EL1_SHA1_SHIFT 8 +#define ID_ISAR5_EL1_AES_SHIFT 4 +#define ID_ISAR5_EL1_SEVL_SHIFT 0#define ID_ISAR6_I8MM_SHIFT 24#define ID_ISAR6_BF16_SHIFT 20
arch/arm64/kernel/cpufeature.c +11 -11
@@ -481,12 +481,12 @@ static const struct arm64_ftr_bits ftr_id_isar0[] = { };static const struct arm64_ftr_bits ftr_id_isar5[] = { -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR5_RDM_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR5_CRC32_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR5_SHA2_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR5_SHA1_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR5_AES_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR5_SEVL_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR5_EL1_RDM_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR5_EL1_CRC32_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR5_EL1_SHA2_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR5_EL1_SHA1_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR5_EL1_AES_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR5_EL1_SEVL_SHIFT ,4 ,0 ),ARM64_FTR_END , };
@@ -2842,11 +2842,11 @@ static const struct arm64_cpu_capabilities compat_elf_hwcaps[] = {/* Arm v8 mandates MVFR0.FPDP == {0, 2}. So, piggy back on this for the presence of VFP support */ HWCAP_CAP (SYS_MVFR0_EL1 ,MVFR0_FPDP_SHIFT ,4 ,FTR_UNSIGNED ,2 ,CAP_COMPAT_HWCAP ,COMPAT_HWCAP_VFP ),HWCAP_CAP (SYS_MVFR0_EL1 ,MVFR0_FPDP_SHIFT ,4 ,FTR_UNSIGNED ,2 ,CAP_COMPAT_HWCAP , COMPAT_HWCAP_VFPv3), -HWCAP_CAP (SYS_ID_ISAR5_EL1 ,ID_ISAR5_AES_SHIFT ,4 ,FTR_UNSIGNED ,2 ,CAP_COMPAT_HWCAP2 ,COMPAT_HWCAP2_PMULL ), -HWCAP_CAP (SYS_ID_ISAR5_EL1 ,ID_ISAR5_AES_SHIFT ,4 ,FTR_UNSIGNED ,1 ,CAP_COMPAT_HWCAP2 ,COMPAT_HWCAP2_AES ), -HWCAP_CAP (SYS_ID_ISAR5_EL1 ,ID_ISAR5_SHA1_SHIFT ,4 ,FTR_UNSIGNED ,1 ,CAP_COMPAT_HWCAP2 ,COMPAT_HWCAP2_SHA1 ), -HWCAP_CAP (SYS_ID_ISAR5_EL1 ,ID_ISAR5_SHA2_SHIFT ,4 ,FTR_UNSIGNED ,1 ,CAP_COMPAT_HWCAP2 ,COMPAT_HWCAP2_SHA2 ), - HWCAP_CAP(SYS_ID_ISAR5_EL1, ID_ISAR5_CRC32_SHIFT, 4, FTR_UNSIGNED, 1, CAP_COMPAT_HWCAP2, COMPAT_HWCAP2_CRC32), +HWCAP_CAP (SYS_ID_ISAR5_EL1 ,ID_ISAR5_EL1_AES_SHIFT ,4 ,FTR_UNSIGNED ,2 ,CAP_COMPAT_HWCAP2 ,COMPAT_HWCAP2_PMULL ), +HWCAP_CAP (SYS_ID_ISAR5_EL1 ,ID_ISAR5_EL1_AES_SHIFT ,4 ,FTR_UNSIGNED ,1 ,CAP_COMPAT_HWCAP2 ,COMPAT_HWCAP2_AES ), +HWCAP_CAP (SYS_ID_ISAR5_EL1 ,ID_ISAR5_EL1_SHA1_SHIFT ,4 ,FTR_UNSIGNED ,1 ,CAP_COMPAT_HWCAP2 ,COMPAT_HWCAP2_SHA1 ), +HWCAP_CAP (SYS_ID_ISAR5_EL1 ,ID_ISAR5_EL1_SHA2_SHIFT ,4 ,FTR_UNSIGNED ,1 ,CAP_COMPAT_HWCAP2 ,COMPAT_HWCAP2_SHA2 ), + HWCAP_CAP(SYS_ID_ISAR5_EL1, ID_ISAR5_EL1_CRC32_SHIFT, 4, FTR_UNSIGNED, 1, CAP_COMPAT_HWCAP2, COMPAT_HWCAP2_CRC32), #endif {}, };
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 7/38 arm64/sysreg: Standardise naming for ID_ISAR6_EL1
In reply to James MorseTo convert the 32bit id registers to use the sysreg generation, they must first have a regular pattern, to match the symbols the script generates.
Ensure symbols for the ID_ISAR6_EL1 register have an _EL1 suffix.
No functional change.
--- arch/arm64/include/asm/sysreg.h | 14 +++++++------- arch/arm64/kernel/cpufeature.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-)
arch/arm64/include/asm/sysreg.h +7 -7
@@ -725,13 +725,13 @@#define ID_ISAR5_EL1_AES_SHIFT 4#define ID_ISAR5_EL1_SEVL_SHIFT 0 -#define ID_ISAR6_I8MM_SHIFT 24 -#define ID_ISAR6_BF16_SHIFT 20 -#define ID_ISAR6_SPECRES_SHIFT 16 -#define ID_ISAR6_SB_SHIFT 12 -#define ID_ISAR6_FHM_SHIFT 8 -#define ID_ISAR6_DP_SHIFT 4 -#define ID_ISAR6_JSCVT_SHIFT 0 +#define ID_ISAR6_EL1_I8MM_SHIFT 24 +#define ID_ISAR6_EL1_BF16_SHIFT 20 +#define ID_ISAR6_EL1_SPECRES_SHIFT 16 +#define ID_ISAR6_EL1_SB_SHIFT 12 +#define ID_ISAR6_EL1_FHM_SHIFT 8 +#define ID_ISAR6_EL1_DP_SHIFT 4 +#define ID_ISAR6_EL1_JSCVT_SHIFT 0#define ID_MMFR0_EL1_InnerShr_SHIFT 28#define ID_MMFR0_EL1_FCSE_SHIFT 24
arch/arm64/kernel/cpufeature.c +7 -7
@@ -527,13 +527,13 @@ static const struct arm64_ftr_bits ftr_id_mmfr5[] = { };static const struct arm64_ftr_bits ftr_id_isar6[] = { -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR6_I8MM_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR6_BF16_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR6_SPECRES_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR6_SB_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR6_FHM_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR6_DP_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR6_JSCVT_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR6_EL1_I8MM_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR6_EL1_BF16_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR6_EL1_SPECRES_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR6_EL1_SB_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR6_EL1_FHM_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR6_EL1_DP_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_ISAR6_EL1_JSCVT_SHIFT ,4 ,0 ),ARM64_FTR_END , };
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 8/38 arm64/sysreg: Standardise naming for ID_PFR0_EL1
In reply to James MorseTo convert the 32bit id registers to use the sysreg generation, they must first have a regular pattern, to match the symbols the script generates.
Ensure symbols for the ID_PFR0_EL1 register have an _EL1 suffix, and use lower case in feature names where the arm-arm does the same.
No functional change.
--- arch/arm64/include/asm/sysreg.h | 12 ++++++------ arch/arm64/kernel/cpufeature.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-)
arch/arm64/include/asm/sysreg.h +6 -6
@@ -753,12 +753,12 @@#define ID_MMFR5_EL1_ETS_SHIFT 0 -#define ID_PFR0_DIT_SHIFT 24 -#define ID_PFR0_CSV2_SHIFT 16 -#define ID_PFR0_STATE3_SHIFT 12 -#define ID_PFR0_STATE2_SHIFT 8 -#define ID_PFR0_STATE1_SHIFT 4 -#define ID_PFR0_STATE0_SHIFT 0 +#define ID_PFR0_EL1_DIT_SHIFT 24 +#define ID_PFR0_EL1_CSV2_SHIFT 16 +#define ID_PFR0_EL1_State3_SHIFT 12 +#define ID_PFR0_EL1_State2_SHIFT 8 +#define ID_PFR0_EL1_State1_SHIFT 4 +#define ID_PFR0_EL1_State0_SHIFT 0#define ID_DFR0_PERFMON_SHIFT 24#define ID_DFR0_MPROFDBG_SHIFT 20
arch/arm64/kernel/cpufeature.c +6 -6
@@ -538,12 +538,12 @@ static const struct arm64_ftr_bits ftr_id_isar6[] = { };static const struct arm64_ftr_bits ftr_id_pfr0[] = { -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_PFR0_DIT_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE ,ID_PFR0_CSV2_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_PFR0_STATE3_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_PFR0_STATE2_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_PFR0_STATE1_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_PFR0_STATE0_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_PFR0_EL1_DIT_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE ,ID_PFR0_EL1_CSV2_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_PFR0_EL1_State3_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_PFR0_EL1_State2_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_PFR0_EL1_State1_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_PFR0_EL1_State0_SHIFT,4 ,0 ),ARM64_FTR_END , };
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 9/38 arm64/sysreg: Standardise naming for ID_PFR1_EL1
In reply to James MorseTo convert the 32bit id registers to use the sysreg generation, they must first have a regular pattern, to match the symbols the script generates.
Ensure symbols for the ID_PFR1_EL1 register have an _EL1 suffix, and use lower case in feature names where the arm-arm does the same.
No functional change.
--- arch/arm64/include/asm/sysreg.h | 16 ++++++++-------- arch/arm64/kernel/cpufeature.c | 26 +++++++++++++------------- 2 files changed, 21 insertions(+), 21 deletions(-)
arch/arm64/include/asm/sysreg.h +8 -8
@@ -789,14 +789,14 @@#define MVFR1_FPDNAN_SHIFT 4#define MVFR1_FPFTZ_SHIFT 0 -#define ID_PFR1_GIC_SHIFT 28 -#define ID_PFR1_VIRT_FRAC_SHIFT 24 -#define ID_PFR1_SEC_FRAC_SHIFT 20 -#define ID_PFR1_GENTIMER_SHIFT 16 -#define ID_PFR1_VIRTUALIZATION_SHIFT 12 -#define ID_PFR1_MPROGMOD_SHIFT 8 -#define ID_PFR1_SECURITY_SHIFT 4 -#define ID_PFR1_PROGMOD_SHIFT 0 +#define ID_PFR1_EL1_GIC_SHIFT 28 +#define ID_PFR1_EL1_Virt_frac_SHIFT 24 +#define ID_PFR1_EL1_Sec_frac_SHIFT 20 +#define ID_PFR1_EL1_GenTimer_SHIFT 16 +#define ID_PFR1_EL1_Virtualization_SHIFT 12 +#define ID_PFR1_EL1_MProgMod_SHIFT 8 +#define ID_PFR1_EL1_Security_SHIFT 4 +#define ID_PFR1_EL1_ProgMod_SHIFT 0#if defined(CONFIG_ARM64_4K_PAGES )#define ID_AA64MMFR0_EL1_TGRAN_SHIFT ID_AA64MMFR0_EL1_TGRAN4_SHIFT
arch/arm64/kernel/cpufeature.c +13 -13
@@ -548,14 +548,14 @@ static const struct arm64_ftr_bits ftr_id_pfr0[] = { };static const struct arm64_ftr_bits ftr_id_pfr1[] = { -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_PFR1_GIC_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_PFR1_VIRT_FRAC_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_PFR1_SEC_FRAC_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_PFR1_GENTIMER_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_PFR1_VIRTUALIZATION_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_PFR1_MPROGMOD_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_PFR1_SECURITY_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_PFR1_PROGMOD_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_PFR1_EL1_GIC_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_PFR1_EL1_Virt_frac_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_PFR1_EL1_Sec_frac_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_PFR1_EL1_GenTimer_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_PFR1_EL1_Virtualization_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_PFR1_EL1_MProgMod_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_PFR1_EL1_Security_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_PFR1_EL1_ProgMod_SHIFT,4 ,0 ),ARM64_FTR_END , };
@@ -1120,11 +1120,11 @@ static int update_32bit_cpu_features(int cpu, struct cpuinfo_32bit *info,*/ if (!id_aa64pfr0_32bit_el1 (pfr0)) {relax_cpu_ftr_reg (SYS_ID_ISAR4_EL1 ,ID_ISAR4_EL1_SMC_SHIFT ); -relax_cpu_ftr_reg (SYS_ID_PFR1_EL1 ,ID_PFR1_VIRT_FRAC_SHIFT ); -relax_cpu_ftr_reg (SYS_ID_PFR1_EL1 ,ID_PFR1_SEC_FRAC_SHIFT ); -relax_cpu_ftr_reg (SYS_ID_PFR1_EL1 ,ID_PFR1_VIRTUALIZATION_SHIFT ); -relax_cpu_ftr_reg (SYS_ID_PFR1_EL1 ,ID_PFR1_SECURITY_SHIFT ); -relax_cpu_ftr_reg (SYS_ID_PFR1_EL1 ,ID_PFR1_PROGMOD_SHIFT ); +relax_cpu_ftr_reg (SYS_ID_PFR1_EL1 , ID_PFR1_EL1_Virt_frac_SHIFT); +relax_cpu_ftr_reg (SYS_ID_PFR1_EL1 , ID_PFR1_EL1_Sec_frac_SHIFT); +relax_cpu_ftr_reg (SYS_ID_PFR1_EL1 , ID_PFR1_EL1_Virtualization_SHIFT); +relax_cpu_ftr_reg (SYS_ID_PFR1_EL1 , ID_PFR1_EL1_Security_SHIFT); +relax_cpu_ftr_reg (SYS_ID_PFR1_EL1 , ID_PFR1_EL1_ProgMod_SHIFT); } taint |= check_update_ftr_reg(SYS_ID_DFR0_EL1, cpu,
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 10/38 arm64/sysreg: Standardise naming for ID_PFR2_EL1
In reply to James MorseTo convert the 32bit id registers to use the sysreg generation, they must first have a regular pattern, to match the symbols the script generates.
Ensure symbols for the ID_PFR2_EL1 register have an _EL1 suffix.
No functional change.
--- arch/arm64/include/asm/sysreg.h | 4 ++-- arch/arm64/kernel/cpufeature.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/include/asm/sysreg.h +2 -2
@@ -768,8 +768,8 @@#define ID_DFR0_COPSDBG_SHIFT 4#define ID_DFR0_COPDBG_SHIFT 0 -#define ID_PFR2_SSBS_SHIFT 4 -#define ID_PFR2_CSV3_SHIFT 0 +#define ID_PFR2_EL1_SSBS_SHIFT 4 +#define ID_PFR2_EL1_CSV3_SHIFT 0#define MVFR0_FPROUND_SHIFT 28#define MVFR0_FPSHVEC_SHIFT 24
arch/arm64/kernel/cpufeature.c +2 -2
@@ -560,8 +560,8 @@ static const struct arm64_ftr_bits ftr_id_pfr1[] = { };static const struct arm64_ftr_bits ftr_id_pfr2[] = { -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE ,ID_PFR2_SSBS_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE ,ID_PFR2_CSV3_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE ,ID_PFR2_EL1_SSBS_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE ,ID_PFR2_EL1_CSV3_SHIFT ,4 ,0 ),ARM64_FTR_END , };
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 11/38 arm64/sysreg: Standardise naming for ID_DFR0_EL1
In reply to James MorseTo convert the 32bit id registers to use the sysreg generation, they must first have a regular pattern, to match the symbols the script generates.
Ensure symbols for the ID_DFR0_EL1 register have an _EL1 suffix, and use lower-case for feature names where the arm-arm does the same.
The arm-arm has feature names for some of the ID_DFR0_EL1.PerMon encodings. Use these feature names in preference to the '8_4' indication of the architecture version they were introduced in.
No functional change.
--- arch/arm64/include/asm/sysreg.h | 24 +++++++++++------------- arch/arm64/kernel/cpufeature.c | 14 +++++++------- arch/arm64/kvm/sys_regs.c | 4 ++-- 3 files changed, 20 insertions(+), 22 deletions(-)
arch/arm64/include/asm/sysreg.h +11 -13
@@ -692,12 +692,10 @@#define ID_AA64MMFR0_EL1_PARANGE_MAX ID_AA64MMFR0_EL1_PARANGE_48#endif -#define ID_DFR0_PERFMON_SHIFT 24 - -#define ID_DFR0_PERFMON_8_0 0x3 -#define ID_DFR0_PERFMON_8_1 0x4 -#define ID_DFR0_PERFMON_8_4 0x5 -#define ID_DFR0_PERFMON_8_5 0x6 +#define ID_DFR0_EL1_PerfMon_PMUv3 0x3 +#define ID_DFR0_EL1_PerfMon_PMUv3p1 0x4 +#define ID_DFR0_EL1_PerfMon_PMUv3p4 0x5 +#define ID_DFR0_EL1_PerfMon_PMUv3p5 0x6#define ID_ISAR4_EL1_SWP_frac_SHIFT 28#define ID_ISAR4_EL1_PSR_M_SHIFT 24
@@ -760,13 +758,13 @@#define ID_PFR0_EL1_State1_SHIFT 4#define ID_PFR0_EL1_State0_SHIFT 0 -#define ID_DFR0_PERFMON_SHIFT 24 -#define ID_DFR0_MPROFDBG_SHIFT 20 -#define ID_DFR0_MMAPTRC_SHIFT 16 -#define ID_DFR0_COPTRC_SHIFT 12 -#define ID_DFR0_MMAPDBG_SHIFT 8 -#define ID_DFR0_COPSDBG_SHIFT 4 -#define ID_DFR0_COPDBG_SHIFT 0 +#define ID_DFR0_EL1_PerfMon_SHIFT 24 +#define ID_DFR0_EL1_MProfDbg_SHIFT 20 +#define ID_DFR0_EL1_MMapTrc_SHIFT 16 +#define ID_DFR0_EL1_CopTrc_SHIFT 12 +#define ID_DFR0_EL1_MMapDbg_SHIFT 8 +#define ID_DFR0_EL1_CopSDbg_SHIFT 4 +#define ID_DFR0_EL1_CopDbg_SHIFT 0#define ID_PFR2_EL1_SSBS_SHIFT 4#define ID_PFR2_EL1_CSV3_SHIFT 0
arch/arm64/kernel/cpufeature.c +7 -7
@@ -567,13 +567,13 @@ static const struct arm64_ftr_bits ftr_id_pfr2[] = {static const struct arm64_ftr_bits ftr_id_dfr0[] = {/* [31:28] TraceFilt */ -S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_EXACT ,ID_DFR0_PERFMON_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_DFR0_MPROFDBG_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_DFR0_MMAPTRC_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_DFR0_COPTRC_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_DFR0_MMAPDBG_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_DFR0_COPSDBG_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_DFR0_COPDBG_SHIFT ,4 ,0 ), +S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_EXACT , ID_DFR0_EL1_PerfMon_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_DFR0_EL1_MProfDbg_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_DFR0_EL1_MMapTrc_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_DFR0_EL1_CopTrc_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_DFR0_EL1_MMapDbg_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_DFR0_EL1_CopSDbg_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , ID_DFR0_EL1_CopDbg_SHIFT,4 ,0 ),ARM64_FTR_END , };
arch/arm64/kvm/sys_regs.c +2 -2
@@ -1121,8 +1121,8 @@ static u64 read_id_reg(const struct kvm_vcpu *vcpu, struct sys_reg_desc const *rcase SYS_ID_DFR0_EL1 :/* Limit guests to PMUv3 for ARMv8.4 */ val =cpuid_feature_cap_perfmon_field (val, -ID_DFR0_PERFMON_SHIFT , -kvm_vcpu_has_pmu (vcpu) ?ID_DFR0_PERFMON_8_4 :0 ); + ID_DFR0_EL1_PerfMon_SHIFT, +kvm_vcpu_has_pmu (vcpu) ? ID_DFR0_EL1_PerfMon_PMUv3p4 :0 );break ; }
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 12/38 arm64/sysreg: Standardise naming for ID_DFR1_EL1
In reply to James MorseTo convert the 32bit id registers to use the sysreg generation, they must first have a regular pattern, to match the symbols the script generates.
Ensure symbols for the ID_DFR1_EL1 register have an _EL1 suffix.
No functional change.
--- arch/arm64/include/asm/sysreg.h | 2 +- arch/arm64/kernel/cpufeature.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/include/asm/sysreg.h +1 -1
@@ -706,7 +706,7 @@#define ID_ISAR4_EL1_WithShifts_SHIFT 4#define ID_ISAR4_EL1_Unpriv_SHIFT 0 -#define ID_DFR1_MTPMU_SHIFT 0 +#define ID_DFR1_EL1_MTPMU_SHIFT 0#define ID_ISAR0_EL1_Divide_SHIFT 24#define ID_ISAR0_EL1_Debug_SHIFT 20
arch/arm64/kernel/cpufeature.c +1 -1
@@ -578,7 +578,7 @@ static const struct arm64_ftr_bits ftr_id_dfr0[] = { };static const struct arm64_ftr_bits ftr_id_dfr1[] = { -S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_DFR1_MTPMU_SHIFT ,4 ,0 ), +S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_DFR1_EL1_MTPMU_SHIFT ,4 ,0 ),ARM64_FTR_END , };
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 13/38 arm64/sysreg: Standardise naming for MVFR0_EL1
In reply to James MorseTo convert the 32bit id registers to use the sysreg generation, they must first have a regular pattern, to match the symbols the script generates.
Ensure symbols for the MVFR0_EL1 register use lower-case for feature names where the arm-arm does the same.
No functional change.
--- arch/arm64/include/asm/sysreg.h | 16 ++++++++-------- arch/arm64/kernel/cpufeature.c | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-)
arch/arm64/include/asm/sysreg.h +8 -8
@@ -769,14 +769,14 @@#define ID_PFR2_EL1_SSBS_SHIFT 4#define ID_PFR2_EL1_CSV3_SHIFT 0 -#define MVFR0_FPROUND_SHIFT 28 -#define MVFR0_FPSHVEC_SHIFT 24 -#define MVFR0_FPSQRT_SHIFT 20 -#define MVFR0_FPDIVIDE_SHIFT 16 -#define MVFR0_FPTRAP_SHIFT 12 -#define MVFR0_FPDP_SHIFT 8 -#define MVFR0_FPSP_SHIFT 4 -#define MVFR0_SIMD_SHIFT 0 +#define MVFR0_EL1_FPRound_SHIFT 28 +#define MVFR0_EL1_FPShVec_SHIFT 24 +#define MVFR0_EL1_FPSqrt_SHIFT 20 +#define MVFR0_EL1_FPDivide_SHIFT 16 +#define MVFR0_EL1_FPTrap_SHIFT 12 +#define MVFR0_EL1_FPDP_SHIFT 8 +#define MVFR0_EL1_FPSP_SHIFT 4 +#define MVFR0_EL1_SIMDReg_SHIFT 0#define MVFR1_SIMDFMAC_SHIFT 28#define MVFR1_FPHP_SHIFT 24
arch/arm64/kernel/cpufeature.c +10 -10
@@ -429,14 +429,14 @@ static const struct arm64_ftr_bits ftr_id_aa64dfr0[] = { };static const struct arm64_ftr_bits ftr_mvfr0[] = { -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR0_FPROUND_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR0_FPSHVEC_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR0_FPSQRT_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR0_FPDIVIDE_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR0_FPTRAP_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR0_FPDP_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR0_FPSP_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR0_SIMD_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , MVFR0_EL1_FPRound_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , MVFR0_EL1_FPShVec_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , MVFR0_EL1_FPSqrt_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , MVFR0_EL1_FPDivide_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , MVFR0_EL1_FPTrap_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR0_EL1_FPDP_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR0_EL1_FPSP_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , MVFR0_EL1_SIMDReg_SHIFT,4 ,0 ),ARM64_FTR_END , };
@@ -2840,8 +2840,8 @@ static const struct arm64_cpu_capabilities compat_elf_hwcaps[] = {HWCAP_CAP_MATCH (compat_has_neon,CAP_COMPAT_HWCAP ,COMPAT_HWCAP_NEON ),HWCAP_CAP (SYS_MVFR1_EL1 ,MVFR1_SIMDFMAC_SHIFT ,4 ,FTR_UNSIGNED ,1 ,CAP_COMPAT_HWCAP , COMPAT_HWCAP_VFPv4),/* Arm v8 mandates MVFR0.FPDP == {0, 2}. So, piggy back on this for the presence of VFP support */ -HWCAP_CAP (SYS_MVFR0_EL1 ,MVFR0_FPDP_SHIFT ,4 ,FTR_UNSIGNED ,2 ,CAP_COMPAT_HWCAP ,COMPAT_HWCAP_VFP ), -HWCAP_CAP (SYS_MVFR0_EL1 ,MVFR0_FPDP_SHIFT ,4 ,FTR_UNSIGNED ,2 ,CAP_COMPAT_HWCAP , COMPAT_HWCAP_VFPv3), +HWCAP_CAP (SYS_MVFR0_EL1 ,MVFR0_EL1_FPDP_SHIFT ,4 ,FTR_UNSIGNED ,2 ,CAP_COMPAT_HWCAP ,COMPAT_HWCAP_VFP ), +HWCAP_CAP (SYS_MVFR0_EL1 ,MVFR0_EL1_FPDP_SHIFT ,4 ,FTR_UNSIGNED ,2 ,CAP_COMPAT_HWCAP , COMPAT_HWCAP_VFPv3),HWCAP_CAP (SYS_ID_ISAR5_EL1 ,ID_ISAR5_EL1_AES_SHIFT ,4 ,FTR_UNSIGNED ,2 ,CAP_COMPAT_HWCAP2 ,COMPAT_HWCAP2_PMULL ),HWCAP_CAP (SYS_ID_ISAR5_EL1 ,ID_ISAR5_EL1_AES_SHIFT ,4 ,FTR_UNSIGNED ,1 ,CAP_COMPAT_HWCAP2 ,COMPAT_HWCAP2_AES ), HWCAP_CAP(SYS_ID_ISAR5_EL1, ID_ISAR5_EL1_SHA1_SHIFT, 4, FTR_UNSIGNED, 1, CAP_COMPAT_HWCAP2, COMPAT_HWCAP2_SHA1),
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 14/38 arm64/sysreg: Standardise naming for MVFR1_EL1
In reply to James MorseTo convert the 32bit id registers to use the sysreg generation, they must first have a regular pattern, to match the symbols the script generates.
Ensure symbols for the MVFR1_EL1 register use lower-case for feature names where the arm-arm does the same.
No functional change.
--- arch/arm64/include/asm/sysreg.h | 16 ++++++++-------- arch/arm64/kernel/cpufeature.c | 24 ++++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-)
arch/arm64/include/asm/sysreg.h +8 -8
@@ -778,14 +778,14 @@#define MVFR0_EL1_FPSP_SHIFT 4#define MVFR0_EL1_SIMDReg_SHIFT 0 -#define MVFR1_SIMDFMAC_SHIFT 28 -#define MVFR1_FPHP_SHIFT 24 -#define MVFR1_SIMDHP_SHIFT 20 -#define MVFR1_SIMDSP_SHIFT 16 -#define MVFR1_SIMDINT_SHIFT 12 -#define MVFR1_SIMDLS_SHIFT 8 -#define MVFR1_FPDNAN_SHIFT 4 -#define MVFR1_FPFTZ_SHIFT 0 +#define MVFR1_EL1_SIMDFMAC_SHIFT 28 +#define MVFR1_EL1_FPHP_SHIFT 24 +#define MVFR1_EL1_SIMDHP_SHIFT 20 +#define MVFR1_EL1_SIMDSP_SHIFT 16 +#define MVFR1_EL1_SIMDInt_SHIFT 12 +#define MVFR1_EL1_SIMDLS_SHIFT 8 +#define MVFR1_EL1_FPDNaN_SHIFT 4 +#define MVFR1_EL1_FPFtZ_SHIFT 0#define ID_PFR1_EL1_GIC_SHIFT 28#define ID_PFR1_EL1_Virt_frac_SHIFT 24
arch/arm64/kernel/cpufeature.c +12 -12
@@ -441,14 +441,14 @@ static const struct arm64_ftr_bits ftr_mvfr0[] = { };static const struct arm64_ftr_bits ftr_mvfr1[] = { -ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR1_SIMDFMAC_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR1_FPHP_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR1_SIMDHP_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR1_SIMDSP_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR1_SIMDINT_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR1_SIMDLS_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR1_FPDNAN_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR1_FPFTZ_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR1_EL1_SIMDFMAC_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR1_EL1_FPHP_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR1_EL1_SIMDHP_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR1_EL1_SIMDSP_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE , MVFR1_EL1_SIMDInt_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR1_EL1_SIMDLS_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , MVFR1_EL1_FPDNaN_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , MVFR1_EL1_FPFtZ_SHIFT,4 ,0 ),ARM64_FTR_END , };
@@ -2829,16 +2829,16 @@ static bool compat_has_neon(const struct arm64_cpu_capabilities *cap, int scope) else mvfr1 =read_sysreg_s (SYS_MVFR1_EL1 ); -return cpuid_feature_extract_unsigned_field (mvfr1,MVFR1_SIMDSP_SHIFT ) && -cpuid_feature_extract_unsigned_field (mvfr1,MVFR1_SIMDINT_SHIFT ) && -cpuid_feature_extract_unsigned_field (mvfr1,MVFR1_SIMDLS_SHIFT ); +return cpuid_feature_extract_unsigned_field (mvfr1,MVFR1_EL1_SIMDSP_SHIFT ) && +cpuid_feature_extract_unsigned_field (mvfr1, MVFR1_EL1_SIMDInt_SHIFT) && +cpuid_feature_extract_unsigned_field (mvfr1,MVFR1_EL1_SIMDLS_SHIFT ); }#endif static const struct arm64_cpu_capabilities compat_elf_hwcaps[] = { #ifdef CONFIG_COMPATHWCAP_CAP_MATCH (compat_has_neon,CAP_COMPAT_HWCAP ,COMPAT_HWCAP_NEON ), -HWCAP_CAP (SYS_MVFR1_EL1 ,MVFR1_SIMDFMAC_SHIFT ,4 ,FTR_UNSIGNED ,1 ,CAP_COMPAT_HWCAP , COMPAT_HWCAP_VFPv4), +HWCAP_CAP (SYS_MVFR1_EL1 ,MVFR1_EL1_SIMDFMAC_SHIFT ,4 ,FTR_UNSIGNED ,1 ,CAP_COMPAT_HWCAP , COMPAT_HWCAP_VFPv4),/* Arm v8 mandates MVFR0.FPDP == {0, 2}. So, piggy back on this for the presence of VFP support */ HWCAP_CAP (SYS_MVFR0_EL1 ,MVFR0_EL1_FPDP_SHIFT ,4 ,FTR_UNSIGNED ,2 ,CAP_COMPAT_HWCAP ,COMPAT_HWCAP_VFP ), HWCAP_CAP(SYS_MVFR0_EL1, MVFR0_EL1_FPDP_SHIFT, 4, FTR_UNSIGNED, 2, CAP_COMPAT_HWCAP, COMPAT_HWCAP_VFPv3),
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 15/38 arm64/sysreg: Standardise naming for MVFR2_EL1
In reply to James MorseTo convert the 32bit id registers to use the sysreg generation, they must first have a regular pattern, to match the symbols the script generates.
Ensure symbols for the MVFR2_EL1 register use lower-case for feature names where the arm-arm does the same.
No functional change.
--- arch/arm64/include/asm/sysreg.h | 4 ++-- arch/arm64/kernel/cpufeature.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/include/asm/sysreg.h +2 -2
@@ -813,8 +813,8 @@#define ID_AA64MMFR0_EL1_TGRAN_2_SHIFT ID_AA64MMFR0_EL1_TGRAN64_2_SHIFT#endif -#define MVFR2_FPMISC_SHIFT 4 -#define MVFR2_SIMDMISC_SHIFT 0 +#define MVFR2_EL1_FPMisc_SHIFT 4 +#define MVFR2_EL1_SIMDMisc_SHIFT 0#define CPACR_EL1_FPEN_EL1EN (BIT(20))/* enable EL1 access */ #define CPACR_EL1_FPEN_EL0EN (BIT(21))/* enable EL0 access, if EL1EN set */
arch/arm64/kernel/cpufeature.c +2 -2
@@ -453,8 +453,8 @@ static const struct arm64_ftr_bits ftr_mvfr1[] = { };static const struct arm64_ftr_bits ftr_mvfr2[] = { -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR2_FPMISC_SHIFT ,4 ,0 ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,MVFR2_SIMDMISC_SHIFT ,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , MVFR2_EL1_FPMisc_SHIFT,4 ,0 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE , MVFR2_EL1_SIMDMisc_SHIFT,4 ,0 ),ARM64_FTR_END , };
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 16/38 arm64/sysreg: Extend the maximum width of a register and symbol name
In reply to James Morse32bit has multiple values for its id registers, as extra properties were added to the CPUs. Some of these end up having long names, which exceed the fixed 48 character column that the sysreg awk script generates.
For example, the ID_MMFR1_EL1.L1Hvd field has an encoding whose natural name would be 'invalidate Iside only'. Using this causes compile errors as the script generates the following:
#define ID_MMFR1_EL1_L1Hvd_INVALIDATE_ISIDE_ONLYUL(0b0001)
Add a few extra characters.
--- arch/arm64/tools/gen-sysreg.awk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/tools/gen-sysreg.awk +1 -1
@@ -33,7 +33,7 @@ function expect_fields(nf) { # Print a CPP macro definition, padded with spaces so that the macro bodies # line up in a column function define(name, val) { - printf "%-48s%s\n", "#define " name, val + printf "%-56s%s\n", "#define " name, val } # Print standard BITMASK/SHIFT/WIDTH CPP definitions for a field
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 17/38 arm64/sysreg: Convert ID_MMFR0_EL1 to automatic generation
In reply to James MorseConvert ID_MMFR0_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 10 ------- arch/arm64/tools/sysreg | 47 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 10 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -10
@@ -171,7 +171,6 @@#define SYS_ID_DFR0_EL1 sys_reg(3, 0, 0, 1, 2)#define SYS_ID_DFR1_EL1 sys_reg(3, 0, 0, 3, 5)#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3) -#define SYS_ID_MMFR0_EL1 sys_reg(3, 0, 0, 1, 4)#define SYS_ID_MMFR1_EL1 sys_reg(3, 0, 0, 1, 5)#define SYS_ID_MMFR2_EL1 sys_reg(3, 0, 0, 1, 6)#define SYS_ID_MMFR3_EL1 sys_reg(3, 0, 0, 1, 7)
@@ -731,15 +730,6 @@#define ID_ISAR6_EL1_DP_SHIFT 4#define ID_ISAR6_EL1_JSCVT_SHIFT 0 -#define ID_MMFR0_EL1_InnerShr_SHIFT 28 -#define ID_MMFR0_EL1_FCSE_SHIFT 24 -#define ID_MMFR0_EL1_AuxReg_SHIFT 20 -#define ID_MMFR0_EL1_TCM_SHIFT 16 -#define ID_MMFR0_EL1_ShareLvl_SHIFT 12 -#define ID_MMFR0_EL1_OuterShr_SHIFT 8 -#define ID_MMFR0_EL1_PMSA_SHIFT 4 -#define ID_MMFR0_EL1_VMSA_SHIFT 0 -#define ID_MMFR4_EL1_EVT_SHIFT 28#define ID_MMFR4_EL1_CCIDX_SHIFT 24#define ID_MMFR4_EL1_LSM_SHIFT 20
arch/arm64/tools/sysreg +47 -0
53 lines not on this page · raw message
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 18/38 arm64/sysreg: Convert ID_MMFR1_EL1 to automatic generation
In reply to James MorseConvert ID_MMFR1_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 49 +++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-)
arch/arm64/include/asm/sysreg.h +0 -1
@@ -171,7 +171,6 @@#define SYS_ID_DFR0_EL1 sys_reg(3, 0, 0, 1, 2)#define SYS_ID_DFR1_EL1 sys_reg(3, 0, 0, 3, 5)#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3) -#define SYS_ID_MMFR1_EL1 sys_reg(3, 0, 0, 1, 5)#define SYS_ID_MMFR2_EL1 sys_reg(3, 0, 0, 1, 6)#define SYS_ID_MMFR3_EL1 sys_reg(3, 0, 0, 1, 7)#define SYS_ID_MMFR4_EL1 sys_reg(3, 0, 0, 2, 6)
arch/arm64/tools/sysreg +49 -0
55 lines not on this page · raw message
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 19/38 arm64/sysreg: Convert ID_MMFR2_EL1 to automatic generation
In reply to James MorseConvert ID_MMFR2_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 41 +++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-)
arch/arm64/include/asm/sysreg.h +0 -1
@@ -171,7 +171,6 @@#define SYS_ID_DFR0_EL1 sys_reg(3, 0, 0, 1, 2)#define SYS_ID_DFR1_EL1 sys_reg(3, 0, 0, 3, 5)#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3) -#define SYS_ID_MMFR2_EL1 sys_reg(3, 0, 0, 1, 6)#define SYS_ID_MMFR3_EL1 sys_reg(3, 0, 0, 1, 7)#define SYS_ID_MMFR4_EL1 sys_reg(3, 0, 0, 2, 6)#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6)
arch/arm64/tools/sysreg +41 -0
47 lines not on this page · raw message
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 20/38 arm64/sysreg: Convert ID_MMFR3_EL1 to automatic generation
In reply to James MorseConvert ID_MMFR3_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 40 +++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-)
arch/arm64/include/asm/sysreg.h +0 -1
@@ -171,7 +171,6 @@#define SYS_ID_DFR0_EL1 sys_reg(3, 0, 0, 1, 2)#define SYS_ID_DFR1_EL1 sys_reg(3, 0, 0, 3, 5)#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3) -#define SYS_ID_MMFR3_EL1 sys_reg(3, 0, 0, 1, 7)#define SYS_ID_MMFR4_EL1 sys_reg(3, 0, 0, 2, 6)#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6)
arch/arm64/tools/sysreg +40 -0
@@ -183,6 +183,46 @@ Enum 3:0 L1HvdFG EndEnum EndSysreg +Sysreg ID_MMFR3_EL1 3 0 0 1 7 +Res0 63:32 +Enum 31:28 Supersec + 0b0000 IMP + 0b1111 NI +EndEnum +Enum 27:24 CMemSz + 0b0000 4GB + 0b0001 64GB + 0b0010 1TB +EndEnum +Enum 23:20 CohWalk + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 19:16 PAN + 0b0000 NI + 0b0001 PAN + 0b0010 PAN2 +EndEnum +Enum 15:12 MaintBcst + 0b0000 NI + 0b0001 NO_TLB + 0b0010 ALL +EndEnum +Enum 11:8 BPMaint + 0b0000 NI + 0b0001 ALL + 0b0010 BY_VA +EndEnum +Enum 7:4 CMaintSW + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 3:0 CMaintVA + 0b0000 NI + 0b0001 IMP +EndEnum +EndSysreg + Sysreg ID_AA64PFR0_EL1 3 0 0 4 0 Enum 63:60 CSV3 0b0000 NI
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 21/38 arm64/sysreg: Convert ID_MMFR4_EL1 to automatic generation
In reply to James MorseConvert ID_MMFR4_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 10 --------- arch/arm64/tools/sysreg | 38 +++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 10 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -10
@@ -171,7 +171,6 @@#define SYS_ID_DFR0_EL1 sys_reg(3, 0, 0, 1, 2)#define SYS_ID_DFR1_EL1 sys_reg(3, 0, 0, 3, 5)#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3) -#define SYS_ID_MMFR4_EL1 sys_reg(3, 0, 0, 2, 6)#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6)#define SYS_ID_ISAR0_EL1 sys_reg(3, 0, 0, 2, 0)
@@ -727,15 +726,6 @@#define ID_ISAR6_EL1_DP_SHIFT 4#define ID_ISAR6_EL1_JSCVT_SHIFT 0 -#define ID_MMFR4_EL1_EVT_SHIFT 28 -#define ID_MMFR4_EL1_CCIDX_SHIFT 24 -#define ID_MMFR4_EL1_LSM_SHIFT 20 -#define ID_MMFR4_EL1_HPDS_SHIFT 16 -#define ID_MMFR4_EL1_CnP_SHIFT 12 -#define ID_MMFR4_EL1_XNX_SHIFT 8 -#define ID_MMFR4_EL1_AC2_SHIFT 4 -#define ID_MMFR4_EL1_SpecSEI_SHIFT 0 -#define ID_MMFR5_EL1_ETS_SHIFT 0#define ID_PFR0_EL1_DIT_SHIFT 24
arch/arm64/tools/sysreg +38 -0
@@ -223,6 +223,44 @@ Enum 3:0 CMaintVA EndEnum EndSysreg +Sysreg ID_MMFR4_EL1 3 0 0 2 6 +Res0 63:32 +Enum 31:28 EVT + 0b0000 NI + 0b0001 NO_TLBIS + 0b0010 TLBIS +EndEnum +Enum 27:24 CCIDX + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 23:20 LSM + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 19:16 HPDS + 0b0000 NI + 0b0001 AA32HPD + 0b0010 HPDS2 +EndEnum +Enum 15:12 CnP + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 11:8 XNX + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 7:4 AC2 + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 3:0 SpecSEI + 0b0000 NI + 0b0001 IMP +EndEnum +EndSysreg + Sysreg ID_AA64PFR0_EL1 3 0 0 4 0 Enum 63:60 CSV3 0b0000 NI
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 22/38 arm64/sysreg: Convert ID_ISAR0_EL1 to automatic generation
In reply to James MorseConvert ID_ISAR0_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 9 --------- arch/arm64/tools/sysreg | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 9 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -9
@@ -173,7 +173,6 @@#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6) -#define SYS_ID_ISAR0_EL1 sys_reg(3, 0, 0, 2, 0)#define SYS_ID_ISAR1_EL1 sys_reg(3, 0, 0, 2, 1)#define SYS_ID_ISAR2_EL1 sys_reg(3, 0, 0, 2, 2)#define SYS_ID_ISAR3_EL1 sys_reg(3, 0, 0, 2, 3)
@@ -703,14 +702,6 @@#define ID_DFR1_EL1_MTPMU_SHIFT 0 -#define ID_ISAR0_EL1_Divide_SHIFT 24 -#define ID_ISAR0_EL1_Debug_SHIFT 20 -#define ID_ISAR0_EL1_Coproc_SHIFT 16 -#define ID_ISAR0_EL1_CmpBranch_SHIFT 12 -#define ID_ISAR0_EL1_BitField_SHIFT 8 -#define ID_ISAR0_EL1_BitCount_SHIFT 4 -#define ID_ISAR0_EL1_Swap_SHIFT 0 -#define ID_ISAR5_EL1_RDM_SHIFT 24#define ID_ISAR5_EL1_CRC32_SHIFT 16#define ID_ISAR5_EL1_SHA2_SHIFT 12
arch/arm64/tools/sysreg +36 -0
@@ -223,6 +223,42 @@ Enum 3:0 CMaintVA EndEnum EndSysreg +Sysreg ID_ISAR0_EL1 3 0 0 2 0 +Res0 63:28 +Enum 27:24 Divide + 0b0000 NI + 0b0001 xDIV_T32 + 0b0010 xDIV_A32 +EndEnum +Enum 23:20 Debug + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 19:16 Coproc + 0b0000 NI + 0b0001 MRC + 0b0010 MRC2 + 0b0011 MRRC + 0b0100 MRRC2 +EndEnum +Enum 15:12 CmpBranch + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 11:8 BitField + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 7:4 BitCount + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 3:0 Swap + 0b0000 NI + 0b0001 IMP +EndEnum +EndSysreg + Sysreg ID_MMFR4_EL1 3 0 0 2 6 Res0 63:32 Enum 31:28 EVT
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 23/38 arm64/sysreg: Convert ID_ISAR1_EL1 to automatic generation
In reply to James MorseConvert ID_ISAR1_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-)
arch/arm64/include/asm/sysreg.h +0 -1
@@ -173,7 +173,6 @@#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6) -#define SYS_ID_ISAR1_EL1 sys_reg(3, 0, 0, 2, 1)#define SYS_ID_ISAR2_EL1 sys_reg(3, 0, 0, 2, 2)#define SYS_ID_ISAR3_EL1 sys_reg(3, 0, 0, 2, 3)#define SYS_ID_ISAR4_EL1 sys_reg(3, 0, 0, 2, 4)
arch/arm64/tools/sysreg +39 -0
@@ -259,6 +259,45 @@ Enum 3:0 Swap EndEnum EndSysreg +Sysreg ID_ISAR1_EL1 3 0 0 2 1 +Res0 63:32 +Enum 31:28 Jazelle + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 27:24 Interwork + 0b0000 NI + 0b0001 BX + 0b0010 BLX + 0b0011 A32_BX +EndEnum +Enum 23:20 Immediate + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 19:16 IfThen + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 15:12 Extend + 0b0000 NI + 0b0001 SXTB + 0b0010 SXTB16 +EndEnum +Enum 11:8 Except_AR + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 7:4 Except + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 3:0 Endian + 0b0000 NI + 0b0001 IMP +EndEnum +EndSysreg + Sysreg ID_MMFR4_EL1 3 0 0 2 6 Res0 63:32 Enum 31:28 EVT
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 24/38 arm64/sysreg: Convert ID_ISAR2_EL1 to automatic generation
In reply to James MorseConvert ID_ISAR2_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 46 +++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-)
arch/arm64/include/asm/sysreg.h +0 -1
@@ -173,7 +173,6 @@#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6) -#define SYS_ID_ISAR2_EL1 sys_reg(3, 0, 0, 2, 2)#define SYS_ID_ISAR3_EL1 sys_reg(3, 0, 0, 2, 3)#define SYS_ID_ISAR4_EL1 sys_reg(3, 0, 0, 2, 4)#define SYS_ID_ISAR5_EL1 sys_reg(3, 0, 0, 2, 5)
arch/arm64/tools/sysreg +46 -0
52 lines not on this page · raw message
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 25/38 arm64/sysreg: Convert ID_ISAR3_EL1 to automatic generation
In reply to James MorseConvert ID_ISAR3_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 38 +++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-)
arch/arm64/include/asm/sysreg.h +0 -1
@@ -173,7 +173,6 @@#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6) -#define SYS_ID_ISAR3_EL1 sys_reg(3, 0, 0, 2, 3)#define SYS_ID_ISAR4_EL1 sys_reg(3, 0, 0, 2, 4)#define SYS_ID_ISAR5_EL1 sys_reg(3, 0, 0, 2, 5)#define SYS_ID_ISAR6_EL1 sys_reg(3, 0, 0, 2, 7)
arch/arm64/tools/sysreg +38 -0
@@ -344,6 +344,44 @@ Enum 3:0 LoadStore EndEnum EndSysreg +Sysreg ID_ISAR3_EL1 3 0 0 2 3 +Res0 63:32 +Enum 31:28 T32EE + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 27:24 TrueNOP + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 23:20 T32Copy + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 19:16 TabBranch + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 15:12 SynchPrim + 0b0000 NI + 0b0001 EXCLUSIVE + 0b0010 DOUBLE +EndEnum +Enum 11:8 SVC + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 7:4 SIMD + 0b0000 NI + 0b0001 SSAT + 0b0011 PKHBT +EndEnum +Enum 3:0 Saturate + 0b0000 NI + 0b0001 IMP +EndEnum +EndSysreg + Sysreg ID_MMFR4_EL1 3 0 0 2 6 Res0 63:32 Enum 31:28 EVT
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 26/38 arm64/sysreg: Convert ID_ISAR4_EL1 to automatic generation
In reply to James MorseConvert ID_ISAR4_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 10 --------- arch/arm64/tools/sysreg | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 10 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -10
@@ -173,7 +173,6 @@#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6) -#define SYS_ID_ISAR4_EL1 sys_reg(3, 0, 0, 2, 4)#define SYS_ID_ISAR5_EL1 sys_reg(3, 0, 0, 2, 5)#define SYS_ID_ISAR6_EL1 sys_reg(3, 0, 0, 2, 7)
@@ -688,15 +687,6 @@#define ID_DFR0_EL1_PerfMon_PMUv3p4 0x5#define ID_DFR0_EL1_PerfMon_PMUv3p5 0x6 -#define ID_ISAR4_EL1_SWP_frac_SHIFT 28 -#define ID_ISAR4_EL1_PSR_M_SHIFT 24 -#define ID_ISAR4_EL1_SynchPrim_frac_SHIFT 20 -#define ID_ISAR4_EL1_Barrier_SHIFT 16 -#define ID_ISAR4_EL1_SMC_SHIFT 12 -#define ID_ISAR4_EL1_Writeback_SHIFT 8 -#define ID_ISAR4_EL1_WithShifts_SHIFT 4 -#define ID_ISAR4_EL1_Unpriv_SHIFT 0 -#define ID_DFR1_EL1_MTPMU_SHIFT 0#define ID_ISAR5_EL1_RDM_SHIFT 24
arch/arm64/tools/sysreg +39 -0
@@ -382,6 +382,45 @@ Enum 3:0 Saturate EndEnum EndSysreg +Sysreg ID_ISAR4_EL1 3 0 0 2 4 +Res0 63:32 +Enum 31:28 SWP_frac + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 27:24 PSR_M + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 23:20 SynchPrim_frac + 0b0000 NI + 0b0011 IMP +EndEnum +Enum 19:16 Barrier + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 15:12 SMC + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 11:8 Writeback + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 7:4 WithShifts + 0b0000 NI + 0b0001 LSL3 + 0b0011 LS + 0b0100 REG +EndEnum +Enum 3:0 Unpriv + 0b0000 NI + 0b0001 REG_BYTE + 0b0010 SIGNED_HALFWORD +EndEnum +EndSysreg + Sysreg ID_MMFR4_EL1 3 0 0 2 6 Res0 63:32 Enum 31:28 EVT
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 27/38 arm64/sysreg: Convert ID_ISAR5_EL1 to automatic generation
In reply to James MorseConvert ID_ISAR5_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 8 -------- arch/arm64/tools/sysreg | 34 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 8 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -8
@@ -173,7 +173,6 @@#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6) -#define SYS_ID_ISAR5_EL1 sys_reg(3, 0, 0, 2, 5)#define SYS_ID_ISAR6_EL1 sys_reg(3, 0, 0, 2, 7)#define SYS_MVFR0_EL1 sys_reg(3, 0, 0, 3, 0)
@@ -689,13 +688,6 @@#define ID_DFR1_EL1_MTPMU_SHIFT 0 -#define ID_ISAR5_EL1_RDM_SHIFT 24 -#define ID_ISAR5_EL1_CRC32_SHIFT 16 -#define ID_ISAR5_EL1_SHA2_SHIFT 12 -#define ID_ISAR5_EL1_SHA1_SHIFT 8 -#define ID_ISAR5_EL1_AES_SHIFT 4 -#define ID_ISAR5_EL1_SEVL_SHIFT 0 -#define ID_ISAR6_EL1_I8MM_SHIFT 24#define ID_ISAR6_EL1_BF16_SHIFT 20#define ID_ISAR6_EL1_SPECRES_SHIFT 16
arch/arm64/tools/sysreg +34 -0
@@ -421,6 +421,40 @@ Enum 3:0 Unpriv EndEnum EndSysreg +Sysreg ID_ISAR5_EL1 3 0 0 2 5 +Res0 63:32 +Enum 31:28 VCMA + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 27:24 RDM + 0b0000 NI + 0b0001 IMP +EndEnum +Res0 23:20 +Enum 19:16 CRC32 + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 15:12 SHA2 + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 11:8 SHA1 + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 7:4 AES + 0b0000 NI + 0b0001 IMP + 0b0010 VMULL +EndEnum +Enum 3:0 SEVL + 0b0000 NI + 0b0001 IMP +EndEnum +EndSysreg + Sysreg ID_MMFR4_EL1 3 0 0 2 6 Res0 63:32 Enum 31:28 EVT
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 28/38 arm64/sysreg: Convert ID_ISAR6_EL1 to automatic generation
In reply to James MorseConvert ID_ISAR6_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 10 ---------- arch/arm64/tools/sysreg | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 10 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -10
@@ -173,8 +173,6 @@#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6) -#define SYS_ID_ISAR6_EL1 sys_reg(3, 0, 0, 2, 7) -#define SYS_MVFR0_EL1 sys_reg(3, 0, 0, 3, 0)#define SYS_MVFR1_EL1 sys_reg(3, 0, 0, 3, 1)#define SYS_MVFR2_EL1 sys_reg(3, 0, 0, 3, 2)
@@ -688,14 +686,6 @@#define ID_DFR1_EL1_MTPMU_SHIFT 0 -#define ID_ISAR6_EL1_I8MM_SHIFT 24 -#define ID_ISAR6_EL1_BF16_SHIFT 20 -#define ID_ISAR6_EL1_SPECRES_SHIFT 16 -#define ID_ISAR6_EL1_SB_SHIFT 12 -#define ID_ISAR6_EL1_FHM_SHIFT 8 -#define ID_ISAR6_EL1_DP_SHIFT 4 -#define ID_ISAR6_EL1_JSCVT_SHIFT 0 -#define ID_MMFR5_EL1_ETS_SHIFT 0#define ID_PFR0_EL1_DIT_SHIFT 24
arch/arm64/tools/sysreg +32 -0
@@ -455,6 +455,38 @@ Enum 3:0 SEVL EndEnum EndSysreg +Sysreg ID_ISAR6_EL1 3 0 0 2 7 +Res0 63:28 +Enum 27:24 I8MM + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 23:20 BF16 + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 19:16 SPECRES + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 15:12 SB + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 11:8 FHM + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 7:4 DP + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 3:0 JSCVT + 0b0000 NI + 0b0001 IMP +EndEnum +EndSysreg + Sysreg ID_MMFR4_EL1 3 0 0 2 6 Res0 63:32 Enum 31:28 EVT
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 29/38 arm64/sysreg: Convert ID_PFR0_EL1 to automatic generation
In reply to James MorseConvert ID_PFR0_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 8 ------- arch/arm64/tools/sysreg | 41 +++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 8 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -8
@@ -165,7 +165,6 @@#define SYS_MPIDR_EL1 sys_reg(3, 0, 0, 0, 5)#define SYS_REVIDR_EL1 sys_reg(3, 0, 0, 0, 6) -#define SYS_ID_PFR0_EL1 sys_reg(3, 0, 0, 1, 0)#define SYS_ID_PFR1_EL1 sys_reg(3, 0, 0, 1, 1)#define SYS_ID_PFR2_EL1 sys_reg(3, 0, 0, 3, 4)#define SYS_ID_DFR0_EL1 sys_reg(3, 0, 0, 1, 2)
@@ -688,13 +687,6 @@#define ID_MMFR5_EL1_ETS_SHIFT 0 -#define ID_PFR0_EL1_DIT_SHIFT 24 -#define ID_PFR0_EL1_CSV2_SHIFT 16 -#define ID_PFR0_EL1_State3_SHIFT 12 -#define ID_PFR0_EL1_State2_SHIFT 8 -#define ID_PFR0_EL1_State1_SHIFT 4 -#define ID_PFR0_EL1_State0_SHIFT 0 -#define ID_DFR0_EL1_PerfMon_SHIFT 24#define ID_DFR0_EL1_MProfDbg_SHIFT 20#define ID_DFR0_EL1_MMapTrc_SHIFT 16
arch/arm64/tools/sysreg +41 -0
47 lines not on this page · raw message
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 29/38] arm64/sysreg: Convert ID_PFR0_EL1 to automatic generation
Quoted 2 lines · James Morse
Convert
ID_PFR0_EL1to be automatically generated as per DDI0487I.a, no functional changes.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 30/38 arm64/sysreg: Convert ID_PFR1_EL1 to automatic generation
In reply to James MorseConvert ID_PFR1_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 10 --------- arch/arm64/tools/sysreg | 40 +++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 10 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -10
@@ -165,7 +165,6 @@#define SYS_MPIDR_EL1 sys_reg(3, 0, 0, 0, 5)#define SYS_REVIDR_EL1 sys_reg(3, 0, 0, 0, 6) -#define SYS_ID_PFR1_EL1 sys_reg(3, 0, 0, 1, 1)#define SYS_ID_PFR2_EL1 sys_reg(3, 0, 0, 3, 4)#define SYS_ID_DFR0_EL1 sys_reg(3, 0, 0, 1, 2)#define SYS_ID_DFR1_EL1 sys_reg(3, 0, 0, 3, 5)
@@ -716,15 +715,6 @@#define MVFR1_EL1_FPDNaN_SHIFT 4#define MVFR1_EL1_FPFtZ_SHIFT 0 -#define ID_PFR1_EL1_GIC_SHIFT 28 -#define ID_PFR1_EL1_Virt_frac_SHIFT 24 -#define ID_PFR1_EL1_Sec_frac_SHIFT 20 -#define ID_PFR1_EL1_GenTimer_SHIFT 16 -#define ID_PFR1_EL1_Virtualization_SHIFT 12 -#define ID_PFR1_EL1_MProgMod_SHIFT 8 -#define ID_PFR1_EL1_Security_SHIFT 4 -#define ID_PFR1_EL1_ProgMod_SHIFT 0 -#if defined(CONFIG_ARM64_4K_PAGES )#define ID_AA64MMFR0_EL1_TGRAN_SHIFT ID_AA64MMFR0_EL1_TGRAN4_SHIFT#define ID_AA64MMFR0_EL1_TGRAN_SUPPORTED_MIN ID_AA64MMFR0_EL1_TGRAN4_SUPPORTED_MIN
arch/arm64/tools/sysreg +40 -0
@@ -87,6 +87,46 @@ Enum 3:0 State0 EndEnum EndSysreg +Sysreg ID_PFR1_EL1 3 0 0 1 1 +Res0 63:32 +Enum 31:28 GIC + 0b0000 NI + 0b0001 GICv3 + 0b0010 GICv4p1 +EndEnum +Enum 27:24 Virt_frac + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 23:20 Sec_frac + 0b0000 NI + 0b0001 WALK_DISABLE + 0b0010 SECURE_MEMORY +EndEnum +Enum 19:16 GenTimer + 0b0000 NI + 0b0001 IMP + 0b0010 ECV +EndEnum +Enum 15:12 Virtualization + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 11:8 MProgMod + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 7:4 Security + 0b0000 NI + 0b0001 EL3 + 0b0001 NSACR_RFR +EndEnum +Enum 3:0 ProgMod + 0b0000 NI + 0b0001 IMP +EndEnum +EndSysreg + Sysreg ID_MMFR0_EL1 3 0 0 1 4 Res0 63:32 Enum 31:28 InnerShr
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 31/38 arm64/sysreg: Convert ID_PFR2_EL1 to automatic generation
In reply to James MorseConvert ID_PFR2_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 4 ---- arch/arm64/tools/sysreg | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -4
@@ -165,7 +165,6 @@#define SYS_MPIDR_EL1 sys_reg(3, 0, 0, 0, 5)#define SYS_REVIDR_EL1 sys_reg(3, 0, 0, 0, 6) -#define SYS_ID_PFR2_EL1 sys_reg(3, 0, 0, 3, 4)#define SYS_ID_DFR0_EL1 sys_reg(3, 0, 0, 1, 2)#define SYS_ID_DFR1_EL1 sys_reg(3, 0, 0, 3, 5)#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)
@@ -694,9 +693,6 @@#define ID_DFR0_EL1_CopSDbg_SHIFT 4#define ID_DFR0_EL1_CopDbg_SHIFT 0 -#define ID_PFR2_EL1_SSBS_SHIFT 4 -#define ID_PFR2_EL1_CSV3_SHIFT 0 -#define MVFR0_EL1_FPRound_SHIFT 28#define MVFR0_EL1_FPShVec_SHIFT 24#define MVFR0_EL1_FPSqrt_SHIFT 20
arch/arm64/tools/sysreg +16 -0
@@ -606,6 +606,22 @@ Enum 3:0 SpecSEI EndEnum EndSysreg +Sysreg ID_PFR2_EL1 3 0 0 3 4 +Res0 63:12 +Enum 11:8 RAS_frac + 0b0000 NI + 0b0001 RASv1p1 +EndEnum +Enum 7:4 SSBS + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 3:0 CSV3 + 0b0000 NI + 0b0001 IMP +EndEnum +EndSysreg + Sysreg ID_AA64PFR0_EL1 3 0 0 4 0 Enum 63:60 CSV3 0b0000 NI
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 32/38 arm64/sysreg: Convert MVFR0_EL1 to automatic generation
In reply to James MorseConvert MVFR0_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 10 --------- arch/arm64/tools/sysreg | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 10 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -10
@@ -170,7 +170,6 @@#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6) -#define SYS_MVFR0_EL1 sys_reg(3, 0, 0, 3, 0)#define SYS_MVFR1_EL1 sys_reg(3, 0, 0, 3, 1)#define SYS_MVFR2_EL1 sys_reg(3, 0, 0, 3, 2)
@@ -693,15 +692,6 @@#define ID_DFR0_EL1_CopSDbg_SHIFT 4#define ID_DFR0_EL1_CopDbg_SHIFT 0 -#define MVFR0_EL1_FPRound_SHIFT 28 -#define MVFR0_EL1_FPShVec_SHIFT 24 -#define MVFR0_EL1_FPSqrt_SHIFT 20 -#define MVFR0_EL1_FPDivide_SHIFT 16 -#define MVFR0_EL1_FPTrap_SHIFT 12 -#define MVFR0_EL1_FPDP_SHIFT 8 -#define MVFR0_EL1_FPSP_SHIFT 4 -#define MVFR0_EL1_SIMDReg_SHIFT 0 -#define MVFR1_EL1_SIMDFMAC_SHIFT 28#define MVFR1_EL1_FPHP_SHIFT 24#define MVFR1_EL1_SIMDHP_SHIFT 20
arch/arm64/tools/sysreg +39 -0
@@ -606,6 +606,45 @@ Enum 3:0 SpecSEI EndEnum EndSysreg +Sysreg MVFR0_EL1 3 0 0 3 0 +Res0 63:32 +Enum 31:28 FPRound + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 27:24 FPShVec + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 23:20 FPSqrt + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 19:16 FPDivide + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 15:12 FPTrap + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 11:8 FPDP + 0b0000 NI + 0b0001 VFPv2 + 0b0001 VFPv3 +EndEnum +Enum 7:4 FPSP + 0b0000 NI + 0b0001 VFPv2 + 0b0001 VFPv3 +EndEnum +Enum 3:0 SIMDReg + 0b0000 NI + 0b0001 IMP_16x64 + 0b0001 IMP_32x64 +EndEnum +EndSysreg + Sysreg ID_PFR2_EL1 3 0 0 3 4 Res0 63:12 Enum 11:8 RAS_frac
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 33/38 arm64/sysreg: Convert MVFR1_EL1 to automatic generation
In reply to James MorseConvert MVFR1_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 10 --------- arch/arm64/tools/sysreg | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 10 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -10
@@ -170,7 +170,6 @@#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6) -#define SYS_MVFR1_EL1 sys_reg(3, 0, 0, 3, 1)#define SYS_MVFR2_EL1 sys_reg(3, 0, 0, 3, 2)#define SYS_ACTLR_EL1 sys_reg(3, 0, 1, 0, 1)
@@ -692,15 +691,6 @@#define ID_DFR0_EL1_CopSDbg_SHIFT 4#define ID_DFR0_EL1_CopDbg_SHIFT 0 -#define MVFR1_EL1_SIMDFMAC_SHIFT 28 -#define MVFR1_EL1_FPHP_SHIFT 24 -#define MVFR1_EL1_SIMDHP_SHIFT 20 -#define MVFR1_EL1_SIMDSP_SHIFT 16 -#define MVFR1_EL1_SIMDInt_SHIFT 12 -#define MVFR1_EL1_SIMDLS_SHIFT 8 -#define MVFR1_EL1_FPDNaN_SHIFT 4 -#define MVFR1_EL1_FPFtZ_SHIFT 0 -#if defined(CONFIG_ARM64_4K_PAGES )#define ID_AA64MMFR0_EL1_TGRAN_SHIFT ID_AA64MMFR0_EL1_TGRAN4_SHIFT#define ID_AA64MMFR0_EL1_TGRAN_SUPPORTED_MIN ID_AA64MMFR0_EL1_TGRAN4_SUPPORTED_MIN
arch/arm64/tools/sysreg +39 -0
@@ -645,6 +645,45 @@ Enum 3:0 SIMDReg EndEnum EndSysreg +Sysreg MVFR1_EL1 3 0 0 3 1 +Res0 63:32 +Enum 31:28 SIMDFMAC + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 27:24 FPHP + 0b0000 NI + 0b0001 FPHP + 0b0010 FPHP_CONV + 0b0011 FP16 +EndEnum +Enum 23:20 SIMDHP + 0b0000 NI + 0b0001 SIMDHP + 0b0001 SIMDHP_FLOAT +EndEnum +Enum 19:16 SIMDSP + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 15:12 SIMDInt + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 11:8 SIMDLS + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 7:4 FPDNaN + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 3:0 FPFtZ + 0b0000 NI + 0b0001 IMP +EndEnum +EndSysreg + Sysreg ID_PFR2_EL1 3 0 0 3 4 Res0 63:12 Enum 11:8 RAS_frac
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 34/38 arm64/sysreg: Convert MVFR2_EL1 to automatic generation
In reply to James MorseConvert MVFR2_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 5 ----- arch/arm64/tools/sysreg | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -5
@@ -170,8 +170,6 @@#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6) -#define SYS_MVFR2_EL1 sys_reg(3, 0, 0, 3, 2) -#define SYS_ACTLR_EL1 sys_reg(3, 0, 1, 0, 1)#define SYS_RGSR_EL1 sys_reg(3, 0, 1, 0, 5)#define SYS_GCR_EL1 sys_reg(3, 0, 1, 0, 6)
@@ -708,9 +706,6 @@#define ID_AA64MMFR0_EL1_TGRAN_2_SHIFT ID_AA64MMFR0_EL1_TGRAN64_2_SHIFT#endif -#define MVFR2_EL1_FPMisc_SHIFT 4 -#define MVFR2_EL1_SIMDMisc_SHIFT 0 -#define CPACR_EL1_FPEN_EL1EN (BIT(20))/* enable EL1 access */ #define CPACR_EL1_FPEN_EL0EN (BIT(21))/* enable EL0 access, if EL1EN set */
arch/arm64/tools/sysreg +17 -0
@@ -684,6 +684,23 @@ Enum 3:0 FPFtZ EndEnum EndSysreg +Sysreg MVFR2_EL1 3 0 0 3 2 +Res0 63:8 +Enum 7:4 FPMisc + 0b0000 NI + 0b0001 FP + 0b0010 FP_DIRECTED_ROUNDING + 0b0011 FP_ROUNDING + 0b0100 FP_MAX_MIN +EndEnum +Enum 3:0 SIMDMisc + 0b0000 NI + 0b0001 SIMD_DIRECTED_ROUNDING + 0b0010 SIMD_ROUNDING + 0b0011 SIMD_MAX_MIN +EndEnum +EndSysreg + Sysreg ID_PFR2_EL1 3 0 0 3 4 Res0 63:12 Enum 11:8 RAS_frac
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 35/38 arm64/sysreg: Convert ID_MMFR5_EL1 to automatic generation
In reply to James MorseConvert ID_MMFR5_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 3 --- arch/arm64/tools/sysreg | 12 ++++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -3
@@ -168,7 +168,6 @@#define SYS_ID_DFR0_EL1 sys_reg(3, 0, 0, 1, 2)#define SYS_ID_DFR1_EL1 sys_reg(3, 0, 0, 3, 5)#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3) -#define SYS_ID_MMFR5_EL1 sys_reg(3, 0, 0, 3, 6)#define SYS_ACTLR_EL1 sys_reg(3, 0, 1, 0, 1)#define SYS_RGSR_EL1 sys_reg(3, 0, 1, 0, 5)
@@ -679,8 +678,6 @@#define ID_DFR1_EL1_MTPMU_SHIFT 0 -#define ID_MMFR5_EL1_ETS_SHIFT 0 -#define ID_DFR0_EL1_PerfMon_SHIFT 24#define ID_DFR0_EL1_MProfDbg_SHIFT 20#define ID_DFR0_EL1_MMapTrc_SHIFT 16
arch/arm64/tools/sysreg +12 -0
@@ -717,6 +717,18 @@ Enum 3:0 CSV3 EndEnum EndSysreg +Sysreg ID_MMFR5_EL1 3 0 0 3 6 +Res0 63:8 +Enum 7:4 nTLBPA + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 3:0 ETS + 0b0000 NI + 0b0001 IMP +EndEnum +EndSysreg + Sysreg ID_AA64PFR0_EL1 3 0 0 4 0 Enum 63:60 CSV3 0b0000 NI
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 36/38 arm64/sysreg: Convert ID_AFR0_EL1 to automatic generation
In reply to James MorseConvert ID_AFR0_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-)
arch/arm64/include/asm/sysreg.h +0 -1
@@ -167,7 +167,6 @@#define SYS_ID_DFR0_EL1 sys_reg(3, 0, 0, 1, 2)#define SYS_ID_DFR1_EL1 sys_reg(3, 0, 0, 3, 5) -#define SYS_ID_AFR0_EL1 sys_reg(3, 0, 0, 1, 3)#define SYS_ACTLR_EL1 sys_reg(3, 0, 1, 0, 1)#define SYS_RGSR_EL1 sys_reg(3, 0, 1, 0, 5)
arch/arm64/tools/sysreg +8 -0
@@ -127,6 +127,14 @@ Enum 3:0 ProgMod EndEnum EndSysreg +Sysreg ID_AFR0_EL1 3 0 0 1 3 +Res0 63:16 +Field 15:12 IMPDEF3 +Field 11:8 IMPDEF2 +Field 7:4 IMPDEF1 +Field 3:0 IMPDEF0 +EndSysreg + Sysreg ID_MMFR0_EL1 3 0 0 1 4 Res0 63:32 Enum 31:28 InnerShr
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 37/38 arm64/sysreg: Convert ID_DFR0_EL1 to automatic generation
In reply to James MorseConvert ID_DFR0_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 14 --------- arch/arm64/tools/sysreg | 50 +++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 14 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -14
@@ -165,7 +165,6 @@#define SYS_MPIDR_EL1 sys_reg(3, 0, 0, 0, 5)#define SYS_REVIDR_EL1 sys_reg(3, 0, 0, 0, 6) -#define SYS_ID_DFR0_EL1 sys_reg(3, 0, 0, 1, 2)#define SYS_ID_DFR1_EL1 sys_reg(3, 0, 0, 3, 5)#define SYS_ACTLR_EL1 sys_reg(3, 0, 1, 0, 1)
@@ -670,21 +669,8 @@#define ID_AA64MMFR0_EL1_PARANGE_MAX ID_AA64MMFR0_EL1_PARANGE_48#endif -#define ID_DFR0_EL1_PerfMon_PMUv3 0x3 -#define ID_DFR0_EL1_PerfMon_PMUv3p1 0x4 -#define ID_DFR0_EL1_PerfMon_PMUv3p4 0x5 -#define ID_DFR0_EL1_PerfMon_PMUv3p5 0x6 -#define ID_DFR1_EL1_MTPMU_SHIFT 0 -#define ID_DFR0_EL1_PerfMon_SHIFT 24 -#define ID_DFR0_EL1_MProfDbg_SHIFT 20 -#define ID_DFR0_EL1_MMapTrc_SHIFT 16 -#define ID_DFR0_EL1_CopTrc_SHIFT 12 -#define ID_DFR0_EL1_MMapDbg_SHIFT 8 -#define ID_DFR0_EL1_CopSDbg_SHIFT 4 -#define ID_DFR0_EL1_CopDbg_SHIFT 0 -#if defined(CONFIG_ARM64_4K_PAGES )#define ID_AA64MMFR0_EL1_TGRAN_SHIFT ID_AA64MMFR0_EL1_TGRAN4_SHIFT#define ID_AA64MMFR0_EL1_TGRAN_SUPPORTED_MIN ID_AA64MMFR0_EL1_TGRAN4_SUPPORTED_MIN
arch/arm64/tools/sysreg +50 -0
56 lines not on this page · raw message
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 37/38] arm64/sysreg: Convert ID_DFR0_EL1 to automatic generation
Quoted 2 lines · James Morse
Convert
ID_DFR0_EL1to be automatically generated as per DDI0487I.a, no functional changes.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 38/38 arm64/sysreg: Convert ID_DFR1_EL1 to automatic generation
In reply to James MorseConvert ID_DFR1_EL1 to be automatically generated as per DDI0487I.a, no functional changes.
--- arch/arm64/include/asm/sysreg.h | 2 -- arch/arm64/tools/sysreg | 13 +++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -2
@@ -165,8 +165,6 @@#define SYS_MPIDR_EL1 sys_reg(3, 0, 0, 0, 5)#define SYS_REVIDR_EL1 sys_reg(3, 0, 0, 0, 6) -#define SYS_ID_DFR1_EL1 sys_reg(3, 0, 0, 3, 5) -#define SYS_ACTLR_EL1 sys_reg(3, 0, 1, 0, 1)#define SYS_RGSR_EL1 sys_reg(3, 0, 1, 0, 5)#define SYS_GCR_EL1 sys_reg(3, 0, 1, 0, 6)
arch/arm64/tools/sysreg +13 -0
@@ -775,6 +775,19 @@ Enum 3:0 CSV3 EndEnum EndSysreg +Sysreg ID_DFR1_EL1 3 0 0 3 5 +Res0 63:8 +Enum 7:4 HPMN0 + 0b0000 NI + 0b0001 IMP +EndEnum +Enum 3:0 MTPMU + 0b0000 IMPDEF + 0b0001 IMP + 0b1111 NI +EndEnum +EndSysreg + Sysreg ID_MMFR5_EL1 3 0 0 3 6 Res0 63:8 Enum 7:4 nTLBPA
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Will Deacon
maintainerHi James,
Quoted 10 lines · James Morse
Changes since the v1
* Duplicate definition muck up in patch 29 fixed.
* Rebased onto arm64/for-next/sysregs, which is just rc4.---
To cleanup an erratum affecting aarch32, I wanted a mask for an id register. This would have been quick to add, but the right thing to do is to convert that register to automatic generation. If I was going that far, I may as well do the lot...
So with this applied, we have a couple of duplicate definitions from sysregs.h (ID_DFR1_EL1_MTPMU_SHIFT and GMID_EL1_BS_SHIFT). I think the latter was probably even there before. We also have GMID_EL1_BS_SIZE vs GMID_EL1_BS_WIDTH.
Mind if I clean that as a patch on top up as per below?
Will
--->8
arch/arm64/include/asm/sysreg.h +0 -6
@@ -667,8 +667,6 @@#define ID_AA64MMFR0_EL1_PARANGE_MAX ID_AA64MMFR0_EL1_PARANGE_48#endif -#define ID_DFR1_EL1_MTPMU_SHIFT 0 -#if defined(CONFIG_ARM64_4K_PAGES )#define ID_AA64MMFR0_EL1_TGRAN_SHIFT ID_AA64MMFR0_EL1_TGRAN4_SHIFT#define ID_AA64MMFR0_EL1_TGRAN_SUPPORTED_MIN ID_AA64MMFR0_EL1_TGRAN4_SUPPORTED_MIN
@@ -719,10 +717,6 @@#define SYS_RGSR_EL1_SEED_SHIFT 8#define SYS_RGSR_EL1_SEED_MASK 0xffffUL -/* GMID_EL1 field definitions */ -#define GMID_EL1_BS_SHIFT 0 -#define GMID_EL1_BS_SIZE 4 -/* TFSR{,E0}_EL1 bit definitions */ #define SYS_TFSR_EL1_TF0_SHIFT 0#define SYS_TFSR_EL1_TF1_SHIFT 1
arch/arm64/lib/mte.S +1 -1
@@ -18,7 +18,7 @@ */ .macro multitag_transfer_size, reg, tmp mrs_s \reg, SYS_GMID_EL1 - ubfx \reg, \reg, #GMID_EL1_BS_SHIFT, #GMID_EL1_BS_SIZE + ubfx \reg, \reg, #GMID_EL1_BS_SHIFT, #GMID_EL1_BS_WIDTH mov \tmp, #4 lsl \reg, \tmp, \reg .endm
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
[+Marc]
Quoted 4 lines · James Morse
Changes since the v1
* Duplicate definition muck up in patch 29 fixed.
* Rebased onto arm64/for-next/sysregs, which is just rc4.
Applied to arm64 (for-next/sysregs), thanks!
Note that this conflicts with Marc's PMU rework in the kvmarm tree in slightly annoying ways (things like "IMP_DEF" => "IMPDEF"). I've had a crack at resolving that at the end of this email.
[01/38] arm64/sysreg: Standardise naming for ID_MMFR0_EL1
https://git.kernel.org/arm64/c/37622bae3db3 [02/38] arm64/sysreg: Standardise naming for ID_MMFR4_EL1 https://git.kernel.org/arm64/c/5ea1534ec320 [03/38] arm64/sysreg: Standardise naming for ID_MMFR5_EL1 https://git.kernel.org/arm64/c/7b24177c631d [04/38] arm64/sysreg: Standardise naming for ID_ISAR0_EL1 https://git.kernel.org/arm64/c/52b3dc559a4c [05/38] arm64/sysreg: Standardise naming for ID_ISAR4_EL1 https://git.kernel.org/arm64/c/3f08e378f00e [06/38] arm64/sysreg: Standardise naming for ID_ISAR5_EL1 https://git.kernel.org/arm64/c/816c8638d8c6 [07/38] arm64/sysreg: Standardise naming for ID_ISAR6_EL1 https://git.kernel.org/arm64/c/eef4344f779f [08/38] arm64/sysreg: Standardise naming for ID_PFR0_EL1 https://git.kernel.org/arm64/c/e0bf98fef3fd [09/38] arm64/sysreg: Standardise naming for ID_PFR1_EL1 https://git.kernel.org/arm64/c/0a648056d68d [10/38] arm64/sysreg: Standardise naming for ID_PFR2_EL1 https://git.kernel.org/arm64/c/1ecf3dcb1363 [11/38] arm64/sysreg: Standardise naming for ID_DFR0_EL1 https://git.kernel.org/arm64/c/f4f5969e3542 [12/38] arm64/sysreg: Standardise naming for ID_DFR1_EL1 https://git.kernel.org/arm64/c/d092106d7353 [13/38] arm64/sysreg: Standardise naming for MVFR0_EL1 https://git.kernel.org/arm64/c/a3aab94801de [14/38] arm64/sysreg: Standardise naming for MVFR1_EL1 https://git.kernel.org/arm64/c/d3e1aa85b1b2 [15/38] arm64/sysreg: Standardise naming for MVFR2_EL1 https://git.kernel.org/arm64/c/c6e155e8e561 [16/38] arm64/sysreg: Extend the maximum width of a register and symbol name https://git.kernel.org/arm64/c/7587cdef5592 [17/38] arm64/sysreg: Convert ID_MMFR0_EL1 to automatic generation https://git.kernel.org/arm64/c/8893df290e36 [18/38] arm64/sysreg: Convert ID_MMFR1_EL1 to automatic generation https://git.kernel.org/arm64/c/7e2f00bea3db [19/38] arm64/sysreg: Convert ID_MMFR2_EL1 to automatic generation https://git.kernel.org/arm64/c/fbfba88b6ae1 [20/38] arm64/sysreg: Convert ID_MMFR3_EL1 to automatic generation https://git.kernel.org/arm64/c/8fe2a9c578b0 [21/38] arm64/sysreg: Convert ID_MMFR4_EL1 to automatic generation https://git.kernel.org/arm64/c/5b380ae0e2b3 [22/38] arm64/sysreg: Convert ID_ISAR0_EL1 to automatic generation https://git.kernel.org/arm64/c/258a96b25a9d [23/38] arm64/sysreg: Convert ID_ISAR1_EL1 to automatic generation https://git.kernel.org/arm64/c/892386a6a807 [24/38] arm64/sysreg: Convert ID_ISAR2_EL1 to automatic generation https://git.kernel.org/arm64/c/dfa70ae8d8c2 [25/38] arm64/sysreg: Convert ID_ISAR3_EL1 to automatic generation https://git.kernel.org/arm64/c/d07016c96530 [26/38] arm64/sysreg: Convert ID_ISAR4_EL1 to automatic generation https://git.kernel.org/arm64/c/849cc9bd9f0e [27/38] arm64/sysreg: Convert ID_ISAR5_EL1 to automatic generation https://git.kernel.org/arm64/c/f4e9ce12dd88 [28/38] arm64/sysreg: Convert ID_ISAR6_EL1 to automatic generation https://git.kernel.org/arm64/c/5ea58a1b5c7a [29/38] arm64/sysreg: Convert ID_PFR0_EL1 to automatic generation https://git.kernel.org/arm64/c/fb0b8d1a24d8 [30/38] arm64/sysreg: Convert ID_PFR1_EL1 to automatic generation https://git.kernel.org/arm64/c/1224308075f1 [31/38] arm64/sysreg: Convert ID_PFR2_EL1 to automatic generation https://git.kernel.org/arm64/c/039d372305ff [32/38] arm64/sysreg: Convert MVFR0_EL1 to automatic generation https://git.kernel.org/arm64/c/e79c94a2a487 [33/38] arm64/sysreg: Convert MVFR1_EL1 to automatic generation https://git.kernel.org/arm64/c/c9b718eda706 [34/38] arm64/sysreg: Convert MVFR2_EL1 to automatic generation https://git.kernel.org/arm64/c/f70a810e01b2 [35/38] arm64/sysreg: Convert ID_MMFR5_EL1 to automatic generation https://git.kernel.org/arm64/c/8a950efa1ff0 [36/38] arm64/sysreg: Convert ID_AFR0_EL1 to automatic generation https://git.kernel.org/arm64/c/58e010516ee6 [37/38] arm64/sysreg: Convert ID_DFR0_EL1 to automatic generation https://git.kernel.org/arm64/c/d044a9fbace7 [38/38] arm64/sysreg: Convert ID_DFR1_EL1 to automatic generation https://git.kernel.org/arm64/c/fa057722978e
Cheers,
Signature · 7 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev --->8
arch/arm64/kvm/sys_regs.c +11 -11
@@ -1071,9 +1071,9 @@ static u8 vcpu_pmuver(const struct kvm_vcpu *vcpu)static u8 perfmon_to_pmuver (u8 perfmon) {switch (perfmon) { -case ID_DFR0_PERFMON_8_0 : +case ID_DFR0_EL1_PerfMon_PMUv3:return ID_AA64DFR0_EL1_PMUVer_IMP; -case ID_DFR0_PERFMON_IMP_DEF : +case ID_DFR0_EL1_PerfMon_IMPDEF:return ID_AA64DFR0_EL1_PMUVer_IMP_DEF;default :/* Anything ARMv8.1+ and NI have the same value. For now. */
@@ -1085,9 +1085,9 @@ static u8 pmuver_to_perfmon(u8 pmuver) {switch (pmuver) {case ID_AA64DFR0_EL1_PMUVer_IMP: -return ID_DFR0_PERFMON_8_0 ; +return ID_DFR0_EL1_PerfMon_PMUv3;case ID_AA64DFR0_EL1_PMUVer_IMP_DEF: -return ID_DFR0_PERFMON_IMP_DEF ; +return ID_DFR0_EL1_PerfMon_IMPDEF;default :/* Anything ARMv8.1+ and NI have the same value. For now. */ return pmuver;
@@ -1151,8 +1151,8 @@ static u64 read_id_reg(const struct kvm_vcpu *vcpu, struct sys_reg_desc const *r val &= ~ARM64_FEATURE_MASK (ID_AA64DFR0_EL1_PMSVer);break ;case SYS_ID_DFR0_EL1 : - val &= ~ARM64_FEATURE_MASK (ID_DFR0_PERFMON ); - val |=FIELD_PREP (ARM64_FEATURE_MASK (ID_DFR0_PERFMON ), + val &= ~ARM64_FEATURE_MASK (ID_DFR0_EL1_PerfMon); + val |=FIELD_PREP (ARM64_FEATURE_MASK (ID_DFR0_EL1_PerfMon),pmuver_to_perfmon (vcpu_pmuver (vcpu)));break ; }
@@ -1307,12 +1307,12 @@ static int set_id_dfr0_el1(struct kvm_vcpu *vcpu,* AArch64 side (as everything is emulated with that), and * that this is a PMUv3. */ - perfmon =FIELD_GET (ARM64_FEATURE_MASK (ID_DFR0_PERFMON ), val); -if ((perfmon !=ID_DFR0_PERFMON_IMP_DEF && perfmon > host_perfmon) || - (perfmon !=0 && perfmon <ID_DFR0_PERFMON_8_0 )) + perfmon =FIELD_GET (ARM64_FEATURE_MASK (ID_DFR0_EL1_PerfMon), val); +if ((perfmon != ID_DFR0_EL1_PerfMon_IMPDEF && perfmon > host_perfmon) || + (perfmon !=0 && perfmon < ID_DFR0_EL1_PerfMon_PMUv3))return -EINVAL ; - valid_pmu = (perfmon !=0 && perfmon !=ID_DFR0_PERFMON_IMP_DEF ); + valid_pmu = (perfmon !=0 && perfmon != ID_DFR0_EL1_PerfMon_IMPDEF);/* Make sure view register and PMU support do match */ if (kvm_vcpu_has_pmu (vcpu) != valid_pmu)
@@ -1320,7 +1320,7 @@ static int set_id_dfr0_el1(struct kvm_vcpu *vcpu,/* We can only differ with PerfMon, and anything else is an error */ val ^=read_id_reg (vcpu, rd); - val &= ~ARM64_FEATURE_MASK (ID_DFR0_PERFMON ); + val &= ~ARM64_FEATURE_MASK (ID_DFR0_EL1_PerfMon);if (val)return -EINVAL ;
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Marc Zyngier
maintainerQuoted 9 lines · Will Deacon
[+Marc]
Quoted 4 lines · James Morse
Changes since the v1
* Duplicate definition muck up in patch 29 fixed.
* Rebased onto arm64/for-next/sysregs, which is just rc4.
Quoted 5 lines
Applied to arm64 (for-next/sysregs), thanks!
Note that this conflicts with Marc's PMU rework in the kvmarm tree in slightly annoying ways (things like "
IMP_DEF" => "IMPDEF"). I've had a crack at resolving that at the end of this email.
Thanks. I've done a merge and ended up with the same resolution, so something must be vaguely correct.
The more annoying part is that the kvmarm/next branch is based on rc3, while this drags rc4 into the mix, leading to a pretty ugly changelog.
I'll rebuild the branch next week with rc4 as the merge base, which should be less awful.
Thanks,
M.
Signature · 6 lines
Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel