Skip to content

Commit b7a252e

Browse files
Marc Zyngieroupton
authored andcommitted
arm64: sysreg: Add layout for ICH_MISR_EL2
The ICH_MISR_EL2-related macros are missing a number of status bits that we are about to handle. Take this opportunity to fully describe the layout of that register as part of the automatic generation infrastructure. Reviewed-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20250225172930.1850838-4-maz@kernel.org Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
1 parent 5815fb8 commit b7a252e

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,6 @@
562562

563563
#define SYS_ICH_VSEIR_EL2 sys_reg(3, 4, 12, 9, 4)
564564
#define SYS_ICC_SRE_EL2 sys_reg(3, 4, 12, 9, 5)
565-
#define SYS_ICH_MISR_EL2 sys_reg(3, 4, 12, 11, 2)
566565
#define SYS_ICH_EISR_EL2 sys_reg(3, 4, 12, 11, 3)
567566
#define SYS_ICH_ELRSR_EL2 sys_reg(3, 4, 12, 11, 5)
568567
#define SYS_ICH_VMCR_EL2 sys_reg(3, 4, 12, 11, 7)
@@ -983,10 +982,6 @@
983982
#define SYS_MPIDR_SAFE_VAL (BIT(31))
984983

985984
/* GIC Hypervisor interface registers */
986-
/* ICH_MISR_EL2 bit definitions */
987-
#define ICH_MISR_EOI (1 << 0)
988-
#define ICH_MISR_U (1 << 1)
989-
990985
/* ICH_LR*_EL2 bit definitions */
991986
#define ICH_LR_VIRTUAL_ID_MASK ((1ULL << 32) - 1)
992987

arch/arm64/tools/sysreg

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3071,6 +3071,18 @@ Res0 17:5
30713071
Field 4:0 ListRegs
30723072
EndSysreg
30733073

3074+
Sysreg ICH_MISR_EL2 3 4 12 11 2
3075+
Res0 63:8
3076+
Field 7 VGrp1D
3077+
Field 6 VGrp1E
3078+
Field 5 VGrp0D
3079+
Field 4 VGrp0E
3080+
Field 3 NP
3081+
Field 2 LRENP
3082+
Field 1 U
3083+
Field 0 EOI
3084+
EndSysreg
3085+
30743086
Sysreg CONTEXTIDR_EL2 3 4 13 0 1
30753087
Fields CONTEXTIDR_ELx
30763088
EndSysreg

tools/arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,6 @@
558558

559559
#define SYS_ICH_VSEIR_EL2 sys_reg(3, 4, 12, 9, 4)
560560
#define SYS_ICC_SRE_EL2 sys_reg(3, 4, 12, 9, 5)
561-
#define SYS_ICH_MISR_EL2 sys_reg(3, 4, 12, 11, 2)
562561
#define SYS_ICH_EISR_EL2 sys_reg(3, 4, 12, 11, 3)
563562
#define SYS_ICH_ELRSR_EL2 sys_reg(3, 4, 12, 11, 5)
564563
#define SYS_ICH_VMCR_EL2 sys_reg(3, 4, 12, 11, 7)
@@ -979,10 +978,6 @@
979978
#define SYS_MPIDR_SAFE_VAL (BIT(31))
980979

981980
/* GIC Hypervisor interface registers */
982-
/* ICH_MISR_EL2 bit definitions */
983-
#define ICH_MISR_EOI (1 << 0)
984-
#define ICH_MISR_U (1 << 1)
985-
986981
/* ICH_LR*_EL2 bit definitions */
987982
#define ICH_LR_VIRTUAL_ID_MASK ((1ULL << 32) - 1)
988983

0 commit comments

Comments
 (0)