aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Gouly <[email protected]>2022-07-08 15:00:56 +0100
committerWill Deacon <[email protected]>2022-07-19 19:29:04 +0100
commit19198abf3d81b66aaee453c063e66b8df9d69251 (patch)
treea2b085cf3761e44f5946fbae853e13ffdd8f53ae
parent9e26cac5f82b2cce43d98ffd8382ebd858fae7e8 (diff)
arm64/mm: use GENMASK_ULL for TTBR_BADDR_MASK_52
The comment says this should be GENMASK_ULL(47, 12), so do that! GENMASK_ULL() is available in assembly since: 95b980d62d52 ("linux/bits.h: make BIT(), GENMASK(), and friends available in assembly") Signed-off-by: Joey Gouly <[email protected]> Link: https://lore.kernel.org/all/[email protected]/ Cc: Catalin Marinas <[email protected]> Cc: Will Deacon <[email protected]> Cc: Kristina Martsenko <[email protected]> Reviewed-by: Kristina Martsenko <[email protected]> Acked-by: Catalin Marinas <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
-rw-r--r--arch/arm64/include/asm/pgtable-hwdef.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
index dd3d12bce07b..5ab8d163198f 100644
--- a/arch/arm64/include/asm/pgtable-hwdef.h
+++ b/arch/arm64/include/asm/pgtable-hwdef.h
@@ -281,10 +281,9 @@
*/
#ifdef CONFIG_ARM64_PA_BITS_52
/*
- * This should be GENMASK_ULL(47, 2).
* TTBR_ELx[1] is RES0 in this configuration.
*/
-#define TTBR_BADDR_MASK_52 (((UL(1) << 46) - 1) << 2)
+#define TTBR_BADDR_MASK_52 GENMASK_ULL(47, 2)
#endif
#ifdef CONFIG_ARM64_VA_BITS_52