From d87c96fad7a3d2be9cda6cacc08ee759f37fd3b6 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 16 Jan 2023 16:47:46 +0000 Subject: [PATCH] ANDROID: arm64: Fix up CTR_EL0 L1Ip handling. A partial backport of sysreg naming changes broke extraction of the L1Ip field from CTR_EL0. Revert the CTR_L1IP() macro to an earlier, correct form. Signed-off-by: Keir Fraser Bug: 233588291 Fixes: f660cd96148d ("BACKPORT: arm64/sysreg: Standardise naming for CTR_EL0 fields") Change-Id: I8d46ad5e266c5792239066b16fbc78762706c023 --- arch/arm64/include/asm/cache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h index 9330f002c74a..933facc11ee6 100644 --- a/arch/arm64/include/asm/cache.h +++ b/arch/arm64/include/asm/cache.h @@ -38,7 +38,7 @@ #include #include -#define CTR_L1IP(ctr) SYS_FIELD_GET(CTR_EL0, L1Ip, ctr) +#define CTR_L1IP(ctr) (((ctr) >> CTR_EL0_L1Ip_SHIFT) & CTR_EL0_L1Ip_MASK) #define ICACHEF_ALIASING 0 #define ICACHEF_VPIPT 1