* [PATCH] Revert "arm: mm: qsd8x50: Fix incorrect permission faults"
@ 2021-05-28 7:44 Kefeng Wang
2021-06-02 15:14 ` Kefeng Wang
0 siblings, 1 reply; 3+ messages in thread
From: Kefeng Wang @ 2021-05-28 7:44 UTC (permalink / raw)
To: Russell King
Cc: Nathan Chancellor, linux-arm-kernel, linux-kernel, Kefeng Wang
This reverts commit e220ba60223a9d63e70217e5b112160df8c21cea.
The VERIFY_PERMISSION_FAULT is introduced since 2009 but no
one use it, just revert it and clean unused comment.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
arch/arm/mm/Kconfig | 2 --
arch/arm/mm/abort-ev7.S | 26 --------------------------
2 files changed, 28 deletions(-)
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 35f43d0aa056..8355c3895894 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -601,8 +601,6 @@ config CPU_TLB_V6
config CPU_TLB_V7
bool
-config VERIFY_PERMISSION_FAULT
- bool
endif
config CPU_HAS_ASID
diff --git a/arch/arm/mm/abort-ev7.S b/arch/arm/mm/abort-ev7.S
index f7cc5d68444b..f81bceacc660 100644
--- a/arch/arm/mm/abort-ev7.S
+++ b/arch/arm/mm/abort-ev7.S
@@ -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)
--
2.26.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Revert "arm: mm: qsd8x50: Fix incorrect permission faults"
2021-05-28 7:44 [PATCH] Revert "arm: mm: qsd8x50: Fix incorrect permission faults" Kefeng Wang
@ 2021-06-02 15:14 ` Kefeng Wang
2021-06-02 16:38 ` Russell King (Oracle)
0 siblings, 1 reply; 3+ messages in thread
From: Kefeng Wang @ 2021-06-02 15:14 UTC (permalink / raw)
To: Russell King; +Cc: Nathan Chancellor, linux-arm-kernel, linux-kernel
Hi Russell, any comment about this patch, thanks.
On 2021/5/28 15:44, Kefeng Wang wrote:
> This reverts commit e220ba60223a9d63e70217e5b112160df8c21cea.
>
> The VERIFY_PERMISSION_FAULT is introduced since 2009 but no
> one use it, just revert it and clean unused comment.
>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
> arch/arm/mm/Kconfig | 2 --
> arch/arm/mm/abort-ev7.S | 26 --------------------------
> 2 files changed, 28 deletions(-)
>
> diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
> index 35f43d0aa056..8355c3895894 100644
> --- a/arch/arm/mm/Kconfig
> +++ b/arch/arm/mm/Kconfig
> @@ -601,8 +601,6 @@ config CPU_TLB_V6
> config CPU_TLB_V7
> bool
>
> -config VERIFY_PERMISSION_FAULT
> - bool
> endif
>
> config CPU_HAS_ASID
> diff --git a/arch/arm/mm/abort-ev7.S b/arch/arm/mm/abort-ev7.S
> index f7cc5d68444b..f81bceacc660 100644
> --- a/arch/arm/mm/abort-ev7.S
> +++ b/arch/arm/mm/abort-ev7.S
> @@ -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)
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Revert "arm: mm: qsd8x50: Fix incorrect permission faults"
2021-06-02 15:14 ` Kefeng Wang
@ 2021-06-02 16:38 ` Russell King (Oracle)
0 siblings, 0 replies; 3+ messages in thread
From: Russell King (Oracle) @ 2021-06-02 16:38 UTC (permalink / raw)
To: Kefeng Wang; +Cc: Nathan Chancellor, linux-arm-kernel, linux-kernel
Hi Kefang,
On Wed, Jun 02, 2021 at 11:14:51PM +0800, Kefeng Wang wrote:
> Hi Russell, any comment about this patch, thanks.
I think it's fine - looking at the history, this was a change submitted
in 2009 for the MSM platform that has been dropped from the kernel. It
seems the option was never enabled, even when support for this platform
was present in the kernel.
So please send to the patch system and I'll merge it in due course.
Thanks.
>
> On 2021/5/28 15:44, Kefeng Wang wrote:
> > This reverts commit e220ba60223a9d63e70217e5b112160df8c21cea.
> >
> > The VERIFY_PERMISSION_FAULT is introduced since 2009 but no
> > one use it, just revert it and clean unused comment.
> >
> > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> > ---
> > arch/arm/mm/Kconfig | 2 --
> > arch/arm/mm/abort-ev7.S | 26 --------------------------
> > 2 files changed, 28 deletions(-)
> >
> > diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
> > index 35f43d0aa056..8355c3895894 100644
> > --- a/arch/arm/mm/Kconfig
> > +++ b/arch/arm/mm/Kconfig
> > @@ -601,8 +601,6 @@ config CPU_TLB_V6
> > config CPU_TLB_V7
> > bool
> > -config VERIFY_PERMISSION_FAULT
> > - bool
> > endif
> > config CPU_HAS_ASID
> > diff --git a/arch/arm/mm/abort-ev7.S b/arch/arm/mm/abort-ev7.S
> > index f7cc5d68444b..f81bceacc660 100644
> > --- a/arch/arm/mm/abort-ev7.S
> > +++ b/arch/arm/mm/abort-ev7.S
> > @@ -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)
>
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-02 16:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-28 7:44 [PATCH] Revert "arm: mm: qsd8x50: Fix incorrect permission faults" Kefeng Wang
2021-06-02 15:14 ` Kefeng Wang
2021-06-02 16:38 ` Russell King (Oracle)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).