Skip to content

Commit 14f1585

Browse files
Anshuman Khandualwilldeacon
authored andcommitted
arm64/sysreg: Update TCR_EL1 register
Update TCR_EL1 register fields as per latest ARM ARM DDI 0487 L.B and while here drop an explicit sysreg definition SYS_TCR_EL1 from sysreg.h, which is now redundant. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: Marc Zyngier <maz@kernel.org> Cc: Mark Brown <broonie@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> Signed-off-by: Will Deacon <will@kernel.org>
1 parent 382cbbe commit 14f1585

2 files changed

Lines changed: 44 additions & 10 deletions

File tree

arch/arm64/include/asm/sysreg.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,6 @@
281281
#define SYS_RGSR_EL1 sys_reg(3, 0, 1, 0, 5)
282282
#define SYS_GCR_EL1 sys_reg(3, 0, 1, 0, 6)
283283

284-
#define SYS_TCR_EL1 sys_reg(3, 0, 2, 0, 2)
285-
286284
#define SYS_APIAKEYLO_EL1 sys_reg(3, 0, 2, 1, 0)
287285
#define SYS_APIAKEYHI_EL1 sys_reg(3, 0, 2, 1, 1)
288286
#define SYS_APIBKEYLO_EL1 sys_reg(3, 0, 2, 1, 2)

arch/arm64/tools/sysreg

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4748,17 +4748,53 @@ Field 37 TBI0
47484748
Field 36 AS
47494749
Res0 35
47504750
Field 34:32 IPS
4751-
Field 31:30 TG1
4752-
Field 29:28 SH1
4753-
Field 27:26 ORGN1
4754-
Field 25:24 IRGN1
4751+
Enum 31:30 TG1
4752+
0b01 16K
4753+
0b10 4K
4754+
0b11 64K
4755+
EndEnum
4756+
Enum 29:28 SH1
4757+
0b00 NONE
4758+
0b10 OUTER
4759+
0b11 INNER
4760+
EndEnum
4761+
Enum 27:26 ORGN1
4762+
0b00 NC
4763+
0b01 WBWA
4764+
0b10 WT
4765+
0b11 WBnWA
4766+
EndEnum
4767+
Enum 25:24 IRGN1
4768+
0b00 NC
4769+
0b01 WBWA
4770+
0b10 WT
4771+
0b11 WBnWA
4772+
EndEnum
47554773
Field 23 EPD1
47564774
Field 22 A1
47574775
Field 21:16 T1SZ
4758-
Field 15:14 TG0
4759-
Field 13:12 SH0
4760-
Field 11:10 ORGN0
4761-
Field 9:8 IRGN0
4776+
Enum 15:14 TG0
4777+
0b00 4K
4778+
0b01 64K
4779+
0b10 16K
4780+
EndEnum
4781+
Enum 13:12 SH0
4782+
0b00 NONE
4783+
0b10 OUTER
4784+
0b11 INNER
4785+
EndEnum
4786+
Enum 11:10 ORGN0
4787+
0b00 NC
4788+
0b01 WBWA
4789+
0b10 WT
4790+
0b11 WBnWA
4791+
EndEnum
4792+
Enum 9:8 IRGN0
4793+
0b00 NC
4794+
0b01 WBWA
4795+
0b10 WT
4796+
0b11 WBnWA
4797+
EndEnum
47624798
Field 7 EPD0
47634799
Res0 6
47644800
Field 5:0 T0SZ

0 commit comments

Comments
 (0)