diff options
| author | Steven Price <steven.price@arm.com> | 2026-07-03 14:48:35 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2026-07-21 15:13:10 +0000 |
| commit | b877075d0baa22c225842c2f19e3ea0a9cbcbe39 (patch) | |
| tree | 37e2ccea39e14c3ec87caebf307b1d10eec9e050 /arch | |
| parent | 23f851ac0078a908bf3422d6467ebc1db5828c46 (diff) | |
| download | linux-next-b877075d0baa22c225842c2f19e3ea0a9cbcbe39.tar.gz linux-next-b877075d0baa22c225842c2f19e3ea0a9cbcbe39.zip | |
arm64: Correct value returned by ESR_ELx_FSC_ADDRSZ_nL()
Address size fault, level -1 is encoded as 0b101001 or 0x29 according to
the Arm ARM. Correct the value to match the spec. This also matches the
offset of "level -1 address size fault" in the fault_info array in
fault.c.
Fixes: fb8a3eba9c81 ("KVM: arm64: Only read HPFAR_EL2 when value is architecturally valid")
Signed-off-by: Steven Price <steven.price@arm.com>
Reviewed-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/include/asm/esr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h index 81c17320a588..f816f5d77f1a 100644 --- a/arch/arm64/include/asm/esr.h +++ b/arch/arm64/include/asm/esr.h @@ -131,7 +131,7 @@ * Annoyingly, the negative levels for Address size faults aren't laid out * contiguously (or in the desired order) */ -#define ESR_ELx_FSC_ADDRSZ_nL(n) ((n) == -1 ? 0x25 : 0x2C) +#define ESR_ELx_FSC_ADDRSZ_nL(n) ((n) == -1 ? 0x29 : 0x2C) #define ESR_ELx_FSC_ADDRSZ_L(n) ((n) < 0 ? ESR_ELx_FSC_ADDRSZ_nL(n) : \ (ESR_ELx_FSC_ADDRSZ + (n))) |