From: Liguang Zhang <zhangliguang@linux.alibaba.com>
To: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH] arm64: traps: clean up arm64_ras_serror_get_severity()
Date: Wed, 12 Aug 2020 19:09:18 +0800 [thread overview]
Message-ID: <20200812110918.18575-1-zhangliguang@linux.alibaba.com> (raw)
Function arm64_is_fatal_ras_serror() is always called after
arm64_is_ras_serror(), so we should remove some needless
arm64_is_ras_serror() call in function arm64_ras_serror_get_severity().
Signed-off-by: Liguang Zhang <zhangliguang@linux.alibaba.com>
---
arch/arm64/include/asm/traps.h | 9 +--------
arch/arm64/kernel/traps.c | 2 +-
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/include/asm/traps.h b/arch/arm64/include/asm/traps.h
index cee5928e1b7d..287b4d64dc67 100644
--- a/arch/arm64/include/asm/traps.h
+++ b/arch/arm64/include/asm/traps.h
@@ -79,13 +79,6 @@ static inline bool arm64_is_ras_serror(u32 esr)
*/
static inline u32 arm64_ras_serror_get_severity(u32 esr)
{
- u32 aet = esr & ESR_ELx_AET;
-
- if (!arm64_is_ras_serror(esr)) {
- /* Not a RAS error, we can't interpret the ESR. */
- return ESR_ELx_AET_UC;
- }
-
/*
* AET is RES0 if 'the value returned in the DFSC field is not
* [ESR_ELx_FSC_SERROR]'
@@ -95,7 +88,7 @@ static inline u32 arm64_ras_serror_get_severity(u32 esr)
return ESR_ELx_AET_UC;
}
- return aet;
+ return esr & ESR_ELx_AET;
}
bool arm64_is_fatal_ras_serror(struct pt_regs *regs, unsigned int esr);
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index 13ebd5ca2070..635d4cca0a4b 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -913,7 +913,7 @@ bool arm64_is_fatal_ras_serror(struct pt_regs *regs, unsigned int esr)
case ESR_ELx_AET_UC: /* Uncontainable or Uncategorized error */
default:
/* Error has been silently propagated */
- arm64_serror_panic(regs, esr);
+ return true;
}
}
--
2.19.1.6.gb485710b
next reply other threads:[~2020-08-12 11:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-12 11:09 Liguang Zhang [this message]
2020-08-25 14:51 ` [PATCH] arm64: traps: clean up arm64_ras_serror_get_severity() James Morse
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=20200812110918.18575-1-zhangliguang@linux.alibaba.com \
--to=zhangliguang@linux.alibaba.com \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).