Commit 89a0b011 authored by Wang Kefeng's avatar Wang Kefeng Committed by Russell King (Oracle)
Browse files

ARM: 9091/1: Revert "mm: qsd8x50: Fix incorrect permission faults" 



This reverts commit e220ba60.

The VERIFY_PERMISSION_FAULT is introduced since 2009 but no
one use it, just revert it and clean unused comment.

Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent 6e121df1

arch/arm/mm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -601,8 +601,6 @@ config CPU_TLB_V6 
config CPU_TLB_V7

	bool



config VERIFY_PERMISSION_FAULT

	bool

endif



config CPU_HAS_ASID

arch/arm/mm/abort-ev7.S

+0 −26
Original line number Diff line number Diff line
@@ -17,31 +17,5 @@ ENTRY(v7_early_abort) 
	mrc	p15, 0, r1, c5, c0, 0		@ get FSR

	mrc	p15, 0, r0, c6, c0, 0		@ get FAR

	uaccess_disable ip			@ disable userspace access



	/*

	 * V6 code adjusts the returned DFSR.

	 * New designs should not need to patch up faults.

	 */



#if defined(CONFIG_VERIFY_PERMISSION_FAULT)

	/*

	 * Detect erroneous permission failures and fix

	 */

	ldr	r3, =0x40d			@ On permission fault

	and	r3, r1, r3

	cmp	r3, #0x0d

	bne	do_DataAbort



	mcr	p15, 0, r0, c7, c8, 0   	@ Retranslate FAR

	isb

	mrc	p15, 0, ip, c7, c4, 0   	@ Read the PAR

	and	r3, ip, #0x7b   		@ On translation fault

	cmp	r3, #0x0b

	bne	do_DataAbort

	bic	r1, r1, #0xf			@ Fix up FSR FS[5:0]

	and	ip, ip, #0x7e

	orr	r1, r1, ip, LSR #1

#endif



	b	do_DataAbort

ENDPROC(v7_early_abort)