2023-07-11 09:34:30

by Anshuman Khandual

Subject: [PATCH] arm64/mm: Directly use ID_AA64MMFR2_EL1_VARange_MASK

Tools generated register fields have in place mask macros which can be used
directly instead of shifting the older right end sided masks.

Cc: Catalin Marinas <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Anshuman Khandual <[email protected]>
---
This applies on v6.5-rc1

arch/arm64/kernel/head.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index 757a0de07f91..7b236994f0e1 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -113,7 +113,7 @@ SYM_CODE_START(primary_entry)
*/
#if VA_BITS > 48
mrs_s x0, SYS_ID_AA64MMFR2_EL1
- tst x0, #0xf << ID_AA64MMFR2_EL1_VARange_SHIFT
+ tst x0, ID_AA64MMFR2_EL1_VARange_MASK
mov x0, #VA_BITS
mov x25, #VA_BITS_MIN
csel x25, x25, x0, eq
@@ -756,7 +756,7 @@ SYM_FUNC_START(__cpu_secondary_check52bitva)
b.ne 2f

mrs_s x0, SYS_ID_AA64MMFR2_EL1
- and x0, x0, #(0xf << ID_AA64MMFR2_EL1_VARange_SHIFT)
+ and x0, x0, ID_AA64MMFR2_EL1_VARange_MASK
cbnz x0, 2f

update_early_cpu_boot_status \
--
2.30.2

2023-07-27 12:26:30

by Will Deacon

Subject: Re: [PATCH] arm64/mm: Directly use ID_AA64MMFR2_EL1_VARange_MASK

On Tue, 11 Jul 2023 14:50:55 +0530, Anshuman Khandual wrote:
> Tools generated register fields have in place mask macros which can be used
> directly instead of shifting the older right end sided masks.
>
>

Applied to arm64 (for-next/mm), thanks!

[1/1] arm64/mm: Directly use ID_AA64MMFR2_EL1_VARange_MASK
https://git.kernel.org/arm64/c/62ce7af97ba5

Cheers,
--
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev