arm64/mm: Consolidate TCR_EL1 fields
Subsystems (2)
PATCH 1/1 arm64/mm: Consolidate TCR_EL1 fields
From: Anshuman Khandual <[email protected]>
commit e921da6bc7cac5f0e8458fe5df18ae08eb538f54 upstream.
This renames and moves SYS_TCR_EL1_TCMA1 and SYS_TCR_EL1_TCMA0 definitions into pgtable-hwdef.h thus consolidating all TCR fields in a single header. This does not cause any functional change.
--- arch/arm64/include/asm/pgtable-hwdef.h | 2 ++ arch/arm64/include/asm/sysreg.h | 4 ---- arch/arm64/mm/proc.S | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-)
arch/arm64/include/asm/pgtable-hwdef.h +2 -0
@@ -273,6 +273,8 @@#define TCR_NFD1 (UL(1) << 54)#define TCR_E0PD0 (UL(1) << 55)#define TCR_E0PD1 (UL(1) << 56) +#define TCR_TCMA0 (UL(1) << 57) +#define TCR_TCMA1 (UL(1) << 58)/* * TTBR.
arch/arm64/include/asm/sysreg.h +0 -4
@@ -1094,10 +1094,6 @@#define CPACR_EL1_ZEN_EL0EN (BIT(17))/* enable EL0 access, if EL1EN set */ #define CPACR_EL1_ZEN (CPACR_EL1_ZEN_EL1EN | CPACR_EL1_ZEN_EL0EN) -/* TCR EL1 Bit Definitions */ -#define SYS_TCR_EL1_TCMA1 (BIT(58)) -#define SYS_TCR_EL1_TCMA0 (BIT(57)) -/* GCR_EL1 Definitions */ #define SYS_GCR_EL1_RRND (BIT(16))#define SYS_GCR_EL1_EXCL_MASK 0xffffUL
arch/arm64/mm/proc.S +1 -1
@@ -46,7 +46,7 @@ #endif #ifdef CONFIG_KASAN_HW_TAGS -#define TCR_MTE_FLAGS SYS_TCR_EL1_TCMA1 | TCR_TBI1 | TCR_TBID1 +#define TCR_MTE_FLAGS TCR_TCMA1 | TCR_TBI1 | TCR_TBID1 #else /* * The mte_zero_clear_page_tags() implementation uses DC GZVA, which relies on
Signature · 1 line
2.38.0.135.g90850a2211-goog
Greg Kroah-Hartman
maintainerQuoted 16 lines · Evgenii Stepanov
From: Anshuman Khandual <[email protected]>
commit
e921da6bc7cac5f0e8458fe5df18ae08eb538f54upstream.This renames and moves
SYS_TCR_EL1_TCMA1andSYS_TCR_EL1_TCMA0definitions intopgtable-hwdef.hthus consolidating all TCR fields in a single header. This does not cause any functional change.Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Acked-by Catalin Marinas <[email protected]>Signed-off-by Anshuman Khandual <[email protected]>Signed-off-by Will Deacon <[email protected]>
Quoted 5 lines
--- arch/arm64/include/asm/pgtable-hwdef.h | 2 ++ arch/arm64/include/asm/sysreg.h | 4 ---- arch/arm64/mm/proc.S | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-)
What stable kernel branch(es) do you want this applied to?
thanks,
greg k-h
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 1 line · Greg Kroah-Hartman
What stable kernel branch(es) do you want this applied to?
5.15, sorry I forgot to mention that. Thank you!
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerQuoted 5 lines · Evgenii Stepanov
Quoted 1 line · Greg Kroah-Hartman
What stable kernel branch(es) do you want this applied to?
5.15, sorry I forgot to mention that. Thank you!
Now queued up.
Note, you passed on a patch yet you did not sign-off on it. Please fix that up the next time you send patches in.
thanks,
greg k-h