2022-10-21 22:59:11

by Evgenii Stepanov

Subject: [PATCH] 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.

Cc: Catalin Marinas <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: [email protected]
Cc: [email protected]
Acked-by: Catalin Marinas <[email protected]>
Signed-off-by: Anshuman Khandual <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Will Deacon <[email protected]>
---
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(-)

diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
index 40085e53f573..66671ff05183 100644
--- a/arch/arm64/include/asm/pgtable-hwdef.h
+++ b/arch/arm64/include/asm/pgtable-hwdef.h
@@ -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.
diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index 394fc5998a4b..f79f3720e4cb 100644
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -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
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index d35c90d2e47a..50bbed947bec 100644
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -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
--
2.38.0.135.g90850a2211-goog

2022-10-22 09:27:27

by Greg Kroah-Hartman

Subject: Re: [PATCH] arm64/mm: Consolidate TCR_EL1 fields

On Fri, Oct 21, 2022 at 03:28:11PM -0700, Evgenii Stepanov wrote:
> 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.
>
> Cc: Catalin Marinas <[email protected]>
> Cc: Will Deacon <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Acked-by: Catalin Marinas <[email protected]>
> Signed-off-by: Anshuman Khandual <[email protected]>
> Link: https://lore.kernel.org/r/[email protected]
> Signed-off-by: Will Deacon <[email protected]>
> ---
> 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

2022-10-24 21:11:54

by Evgenii Stepanov

Subject: Re: [PATCH] arm64/mm: Consolidate TCR_EL1 fields

On Sat, Oct 22, 2022 at 1:15 AM Greg Kroah-Hartman
<[email protected]> wrote:
> What stable kernel branch(es) do you want this applied to?

5.15, sorry I forgot to mention that. Thank you!

2022-10-26 11:04:24

by Greg Kroah-Hartman

Subject: Re: [PATCH] arm64/mm: Consolidate TCR_EL1 fields

On Mon, Oct 24, 2022 at 10:56:57AM -0700, Evgenii Stepanov wrote:
> On Sat, Oct 22, 2022 at 1:15 AM Greg Kroah-Hartman
> <[email protected]> wrote:
> > 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