ARM: move FSR fault status definitions before fsr_fs()

The FSR's fault status bits depend on whether LPAE is enabled. Rather
than always exposing both LPAE and non-LPAE to all code, move them
inside the ifdef blocks dependent on LPAE to restrict their visibility.
No code other than fsr_fs() makes use of these.

Reviewed-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
This commit is contained in:
Russell King (Oracle) 2025-12-05 15:36:09 +00:00
parent 5548e8a466
commit a542de4451

View File

@ -8,9 +8,6 @@
#define FSR_LNX_PF BIT(31)
#define FSR_CM BIT(13)
#define FSR_WRITE BIT(11)
#define FSR_FS4 BIT(10)
#define FSR_FS3_0 GENMASK(3, 0)
#define FSR_FS5_0 GENMASK(5, 0)
#ifdef CONFIG_ARM_LPAE
#define FSR_FS_AEA 17
@ -18,6 +15,8 @@
#define FS_PERM_NOLL 0xC
#define FS_MMU_NOLL_MASK 0x3C
#define FSR_FS5_0 GENMASK(5, 0)
static inline int fsr_fs(unsigned int fsr)
{
return fsr & FSR_FS5_0;
@ -29,6 +28,9 @@ static inline int fsr_fs(unsigned int fsr)
#define FS_L1_PERM 0xD
#define FS_L2_PERM 0xF
#define FSR_FS4 BIT(10)
#define FSR_FS3_0 GENMASK(3, 0)
static inline int fsr_fs(unsigned int fsr)
{
return (fsr & FSR_FS3_0) | (fsr & FSR_FS4) >> 6;