From 2d1150f390b340a638c58d82c7a391bb993f4e07 Mon Sep 17 00:00:00 2001 From: Yang Yingliang Date: Thu, 31 Oct 2019 14:57:06 +0800 Subject: [PATCH] arm64: sysreg: fix incorrect definition of SYS_PAR_EL1_F mainline inclusion from mainline-5.4-rc4 commit 29a0f5ad87e6 category: bugfix bugzilla: 24021 CVE: NA ------------------------------------------------- The 'F' field of the PAR_EL1 register lives in bit 0, not bit 1. Fix the broken definition in 'sysreg.h'. Fixes: e8620cff9994 ("arm64: sysreg: Add some field definitions for PAR_EL1") Reviewed-by: Mark Rutland Signed-off-by: Yang Yingliang Signed-off-by: Will Deacon Reviewed-by: Hanjun Guo Signed-off-by: Yang Yingliang --- arch/arm64/include/asm/sysreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index a6e2a3b986d0..db16c4844de6 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -192,7 +192,7 @@ #define SYS_FAR_EL1 sys_reg(3, 0, 6, 0, 0) #define SYS_PAR_EL1 sys_reg(3, 0, 7, 4, 0) -#define SYS_PAR_EL1_F BIT(1) +#define SYS_PAR_EL1_F BIT(0) #define SYS_PAR_EL1_FST GENMASK(6, 1) /*** Statistical Profiling Extension ***/ -- GitLab