From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Russell King <linux@armlinux.org.uk>
Cc: Nathan Chancellor <nathan@kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] Revert "arm: mm: qsd8x50: Fix incorrect permission faults"
Date: Wed, 2 Jun 2021 23:14:51 +0800 [thread overview]
Message-ID: <248320ed-494b-937d-734c-c97e0c32038a@huawei.com> (raw)
In-Reply-To: <20210528074444.17291-1-wangkefeng.wang@huawei.com>
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
next prev parent reply other threads:[~2021-06-02 15:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-28 7:44 [PATCH] Revert "arm: mm: qsd8x50: Fix incorrect permission faults" Kefeng Wang
2021-06-02 15:14 ` Kefeng Wang [this message]
2021-06-02 16:38 ` Russell King (Oracle)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=248320ed-494b-937d-734c-c97e0c32038a@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=nathan@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).