Commit 9c46fcaf authored by Russell King (Oracle)'s avatar Russell King (Oracle)
Browse files

ARM: move is_permission_fault() and is_translation_fault() to fault.h 



is_permission_fault() and is_translation_fault() are both conditional
on the FSR encodings, which are dependent on LPAE. We define the
constants in fault.h. Move these inline functions to fault.h to be
near the FSR definitions.

Reviewed-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
parent 78900204

arch/arm/mm/fault.c

+0 −26
Original line number Diff line number Diff line
@@ -115,32 +115,6 @@ static inline bool is_write_fault(unsigned int fsr) 
	return (fsr & FSR_WRITE) && !(fsr & FSR_CM);

}



static inline bool is_translation_fault(unsigned int fsr)

{

	int fs = fsr_fs(fsr);

#ifdef CONFIG_ARM_LPAE

	if ((fs & FS_MMU_NOLL_MASK) == FS_TRANS_NOLL)

		return true;

#else

	if (fs == FS_L1_TRANS || fs == FS_L2_TRANS)

		return true;

#endif

	return false;

}



static inline bool is_permission_fault(unsigned int fsr)

{

	int fs = fsr_fs(fsr);

#ifdef CONFIG_ARM_LPAE

	if ((fs & FS_MMU_NOLL_MASK) == FS_PERM_NOLL)

		return true;

#else

	if (fs == FS_L1_PERM || fs == FS_L2_PERM)

		return true;

#endif

	return false;

}



static void die_kernel_fault(const char *msg, struct mm_struct *mm,

			     unsigned long addr, unsigned int fsr,

			     struct pt_regs *regs)

arch/arm/mm/fault.h

+26 −0
Original line number Diff line number Diff line
@@ -35,6 +35,32 @@ static inline int fsr_fs(unsigned int fsr) 
}

#endif



static inline bool is_translation_fault(unsigned int fsr)

{

	int fs = fsr_fs(fsr);

#ifdef CONFIG_ARM_LPAE

	if ((fs & FS_MMU_NOLL_MASK) == FS_TRANS_NOLL)

		return true;

#else

	if (fs == FS_L1_TRANS || fs == FS_L2_TRANS)

		return true;

#endif

	return false;

}



static inline bool is_permission_fault(unsigned int fsr)

{

	int fs = fsr_fs(fsr);

#ifdef CONFIG_ARM_LPAE

	if ((fs & FS_MMU_NOLL_MASK) == FS_PERM_NOLL)

		return true;

#else

	if (fs == FS_L1_PERM || fs == FS_L2_PERM)

		return true;

#endif

	return false;

}



void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);

void early_abt_enable(void);

asmlinkage void do_DataAbort(unsigned long addr, unsigned int fsr,