Skip to content

Commit 3e8626b

Browse files
committed
Merge branch 'for-next/sysregs' into for-next/core
* for-next/sysregs: arm64/sysreg: Add missing system instruction definitions for FGT arm64/sysreg: Add missing system register definitions for FGT arm64/sysreg: Add missing ExtTrcBuff field definition to ID_AA64DFR0_EL1 arm64/sysreg: Add missing Pauth_LR field definitions to ID_AA64ISAR1_EL1 arm64/sysreg: Add new system registers for GCS arm64/sysreg: Add definition for FPMR arm64/sysreg: Update HCRX_EL2 definition for DDI0601 2023-09 arm64/sysreg: Update SCTLR_EL1 for DDI0601 2023-09 arm64/sysreg: Update ID_AA64SMFR0_EL1 definition for DDI0601 2023-09 arm64/sysreg: Add definition for ID_AA64FPFR0_EL1 arm64/sysreg: Add definition for ID_AA64ISAR3_EL1 arm64/sysreg: Update ID_AA64ISAR2_EL1 defintion for DDI0601 2023-09 arm64/sysreg: Add definition for ID_AA64PFR2_EL1 arm64/sysreg: update CPACR_EL1 register arm64/sysreg: add system register POR_EL{0,1} arm64/sysreg: Add definition for HAFGRTR_EL2 arm64/sysreg: Update HFGITR_EL2 definiton to DDI0601 2023-09
2 parents 41cff14 + 4ebee8c commit 3e8626b

File tree

2 files changed

+329
-11
lines changed

2 files changed

+329
-11
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,7 @@
645645
#define OP_AT_S1E0W sys_insn(AT_Op0, 0, AT_CRn, 8, 3)
646646
#define OP_AT_S1E1RP sys_insn(AT_Op0, 0, AT_CRn, 9, 0)
647647
#define OP_AT_S1E1WP sys_insn(AT_Op0, 0, AT_CRn, 9, 1)
648+
#define OP_AT_S1E1A sys_insn(AT_Op0, 0, AT_CRn, 9, 2)
648649
#define OP_AT_S1E2R sys_insn(AT_Op0, 4, AT_CRn, 8, 0)
649650
#define OP_AT_S1E2W sys_insn(AT_Op0, 4, AT_CRn, 8, 1)
650651
#define OP_AT_S12E1R sys_insn(AT_Op0, 4, AT_CRn, 8, 4)
@@ -781,10 +782,16 @@
781782
#define OP_TLBI_VMALLS12E1NXS sys_insn(1, 4, 9, 7, 6)
782783

783784
/* Misc instructions */
785+
#define OP_GCSPUSHX sys_insn(1, 0, 7, 7, 4)
786+
#define OP_GCSPOPCX sys_insn(1, 0, 7, 7, 5)
787+
#define OP_GCSPOPX sys_insn(1, 0, 7, 7, 6)
788+
#define OP_GCSPUSHM sys_insn(1, 3, 7, 7, 0)
789+
784790
#define OP_BRB_IALL sys_insn(1, 1, 7, 2, 4)
785791
#define OP_BRB_INJ sys_insn(1, 1, 7, 2, 5)
786792
#define OP_CFP_RCTX sys_insn(1, 3, 7, 3, 4)
787793
#define OP_DVP_RCTX sys_insn(1, 3, 7, 3, 5)
794+
#define OP_COSP_RCTX sys_insn(1, 3, 7, 3, 6)
788795
#define OP_CPP_RCTX sys_insn(1, 3, 7, 3, 7)
789796

790797
/* Common SCTLR_ELx flags. */
@@ -1044,6 +1051,19 @@
10441051

10451052
#define PIRx_ELx_PERM(idx, perm) ((perm) << ((idx) * 4))
10461053

1054+
/*
1055+
* Permission Overlay Extension (POE) permission encodings.
1056+
*/
1057+
#define POE_NONE UL(0x0)
1058+
#define POE_R UL(0x1)
1059+
#define POE_X UL(0x2)
1060+
#define POE_RX UL(0x3)
1061+
#define POE_W UL(0x4)
1062+
#define POE_RW UL(0x5)
1063+
#define POE_XW UL(0x6)
1064+
#define POE_RXW UL(0x7)
1065+
#define POE_MASK UL(0xf)
1066+
10471067
#define ARM64_FEATURE_FIELD_BITS 4
10481068

10491069
/* Defined for compatibility only, do not add new users. */

0 commit comments

Comments
 (0)