From: Joey Gouly <joey.gouly@arm.com>
To: Mark Brown <broonie@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <nd@arm.com>
Subject: Re: [PATCH 2/2] arm64/esr: Add decode of ISS2 to data abort reporting
Date: Tue, 9 May 2023 15:18:50 +0100 [thread overview]
Message-ID: <20230509141850.GA2894321@e124191.cambridge.arm.com> (raw)
In-Reply-To: <20230417-arm64-iss2-dabt-decode-v1-2-2138b5668777@kernel.org>
Hi Mark,
On Tue, Apr 18, 2023 at 02:57:32PM +0100, Mark Brown wrote:
> The architecture has added more information about faults to ISS2 within
> ESR. Add decode of this to our data abort fault decode to aid diagnostics.
> Features that are not currently enabled are included here for completeness.
>
> Since the architecture specifies the values of bits within ISS2 in terms
> of ISS2 rather than in terms of the register as a whole we do so for our
> definitions as well, this makes it easier to review bitfield definitions.
>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
> arch/arm64/include/asm/esr.h | 17 +++++++++++++++++
> arch/arm64/mm/fault.c | 14 ++++++++++++--
> 2 files changed, 29 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h
> index 0bd879007168..17bc6536ffea 100644
> --- a/arch/arm64/include/asm/esr.h
> +++ b/arch/arm64/include/asm/esr.h
> @@ -77,6 +77,9 @@
> #define ESR_ELx_IL (UL(1) << ESR_ELx_IL_SHIFT)
> #define ESR_ELx_ISS_MASK (GENMASK(24, 0))
> #define ESR_ELx_ISS(esr) ((esr) & ESR_ELx_ISS_MASK)
> +#define ESR_ELx_ISS2_SHIFT (32)
> +#define ESR_ELx_ISS2_MASK (GENMASK_ULL(55, 32))
> +#define ESR_ELx_ISS2(esr) ((esr) & ESR_ELx_ISS_MASK)
Typo here, should be ESR_ELx_ISS2_MASK.
>
> /* ISS field definitions shared by different classes */
> #define ESR_ELx_WNR_SHIFT (6)
> @@ -140,6 +143,20 @@
> #define ESR_ELx_CM_SHIFT (8)
> #define ESR_ELx_CM (UL(1) << ESR_ELx_CM_SHIFT)
>
> +/* ISS2 field definitions for Data Aborts */
> +#define ESR_ELx_TnD_SHIFT (10)
> +#define ESR_ELx_TnD (UL(1) << ESR_ELx_TnD_SHIFT)
> +#define ESR_ELx_TagAccess_SHIFT (9)
> +#define ESR_ELx_TagAccess (UL(1) << ESR_ELx_TagAccess_SHIFT)
> +#define ESR_ELx_GCS_SHIFT (8)
> +#define ESR_ELx_GCS (UL(1) << ESR_ELx_GCS_SHIFT)
> +#define ESR_ELx_Overlay_SHIFT (6)
> +#define ESR_ELx_Overlay (UL(1) << ESR_ELx_Overlay_SHIFT)
> +#define ESR_ELx_DirtyBit_SHIFT (5)
> +#define ESR_ELx_DirtyBit (UL(1) << ESR_ELx_DirtyBit_SHIFT)
> +#define ESR_ELx_Xs_SHIFT (0)
> +#define ESR_ELx_Xs_MASK (GENMASK_ULL(4, 0))
> +
> /* ISS field definitions for exceptions taken in to Hyp */
> #define ESR_ELx_CV (UL(1) << 24)
> #define ESR_ELx_COND_SHIFT (20)
> diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
> index f4cb0f85ccf4..2e76dc613c86 100644
> --- a/arch/arm64/mm/fault.c
> +++ b/arch/arm64/mm/fault.c
> @@ -66,6 +66,8 @@ static inline const struct fault_info *esr_to_debug_fault_info(unsigned long esr
>
> static void data_abort_decode(unsigned long esr)
> {
> + u64 iss2 = ESR_ELx_ISS2(esr);
> +
> pr_alert("Data abort info:\n");
>
> if (esr & ESR_ELx_ISV) {
> @@ -81,9 +83,17 @@ static void data_abort_decode(unsigned long esr)
> pr_alert(" ISV = 0, ISS = 0x%08lx\n", esr & ESR_ELx_ISS_MASK);
> }
>
> - pr_alert(" CM = %lu, WnR = %lu\n",
> + pr_alert(" CM = %lu, WnR = %lu, TnD = %llu, TagAccess = %lld\n",
> (esr & ESR_ELx_CM) >> ESR_ELx_CM_SHIFT,
> - (esr & ESR_ELx_WNR) >> ESR_ELx_WNR_SHIFT);
> + (esr & ESR_ELx_WNR) >> ESR_ELx_WNR_SHIFT,
> + (iss2 & ESR_ELx_TnD) >> ESR_ELx_TnD_SHIFT,
> + (iss2 & ESR_ELx_TagAccess) >> ESR_ELx_TagAccess_SHIFT);
> +
> + pr_alert(" GCS = %lld, Overlay = %llu, DirtyBit = %llu, Xs = %llu\n",
> + (iss2 & ESR_ELx_GCS) >> ESR_ELx_GCS_SHIFT,
> + (iss2 & ESR_ELx_Overlay) >> ESR_ELx_Overlay_SHIFT,
> + (iss2 & ESR_ELx_DirtyBit) >> ESR_ELx_DirtyBit_SHIFT,
> + (iss2 & ESR_ELx_Xs_MASK) >> ESR_ELx_Xs_SHIFT);
> }
>
> static void mem_abort_decode(unsigned long esr)
Thanks,
Joey
prev parent reply other threads:[~2023-05-09 14:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-18 13:57 [PATCH 0/2] arm64: Add decode of ISS2 to data abort reports Mark Brown
2023-04-18 13:57 ` [PATCH 1/2] arm64/esr: Use GENMASK() for the ISS mask Mark Brown
2023-04-18 13:57 ` [PATCH 2/2] arm64/esr: Add decode of ISS2 to data abort reporting Mark Brown
2023-05-09 14:18 ` Joey Gouly [this message]
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=20230509141850.GA2894321@e124191.cambridge.arm.com \
--to=joey.gouly@arm.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nd@arm.com \
--cc=will@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
all inboxes | Powered by JetHome®