[PATCH V2 0/2] arm64/mm: Drop TTBR_CNP_BIT and TTBR_ASID_MASK

From: Anshuman Khandual

Date: Mon Mar 02 2026 - 01:45:08 EST


Directly use existing tools sysreg format field macros TTBRx_EL1_CNP_BIT/
TTBRx_EL1_ASID_MASK, while also dropping off now redundant custom macros
TTBR_CNP_BIT and TTBR_ASID_MASK. With this change in place, there are no
more TTBR_EL1 register based custom macros left in the tree.

This was discussed and suggested earlier.

https://lore.kernel.org/linux-arm-kernel/aRb8ezhQd0c0jp9G@J2N7QTR9R3/

This series applies on v7.0-rc2.

Changes in V2:

- Used FIELD_PREP() in update_saved_ttbr0() per Marc
- Dropped KVM TTBR_ASID_MASK changes as they are already merged upstream
via commit 54e367cb94d6 ("KVM: arm64: Deduplicate ASID retrieval code")

Changes in V1:

https://lore.kernel.org/all/20260225035157.1159962-1-anshuman.khandual@xxxxxxx/

Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
Cc: Will Deacon <will@xxxxxxxxxx>
Cc: Ryan Roberts <ryan.roberts@xxxxxxx>
Cc: Mark Rutland <mark.rutland@xxxxxxx>
Cc: Marc Zyngier <maz@xxxxxxxxxx>
Cc: Oliver Upton <oupton@xxxxxxxxxx>
Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
Cc: kvmarm@xxxxxxxxxxxxxxx

Anshuman Khandual (2):
arm64/mm: Directly use TTBRx_EL1_ASID_MASK
arm64/mm: Directly use TTBRx_EL1_CnP

arch/arm64/include/asm/asm-uaccess.h | 2 +-
arch/arm64/include/asm/mmu.h | 1 -
arch/arm64/include/asm/mmu_context.h | 3 ++-
arch/arm64/include/asm/pgtable-hwdef.h | 2 --
arch/arm64/include/asm/uaccess.h | 6 +++---
arch/arm64/kernel/entry.S | 2 +-
arch/arm64/kernel/mte.c | 4 ++--
arch/arm64/kvm/hyp/nvhe/hyp-init.S | 4 ++--
arch/arm64/mm/context.c | 8 ++++----
arch/arm64/mm/mmu.c | 2 +-
10 files changed, 16 insertions(+), 18 deletions(-)

--
2.30.2