From: "S, Shirish" <Shirish.S@amd.com>
To: --cc=Borislav Petkov <bp@alien8.de>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H . Peter Anvin" <hpa@zytor.com>,
"maintainer : X86 ARCHITECTURE" <x86@kernel.org>,
Tony Luck <tony.luck@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
"open list : X86 ARCHITECTURE" <linux-kernel@vger.kernel.org>,
"S, Shirish" <Shirish.S@amd.com>
Subject: [PATCH 3/3] x86/mce/amd: apply MC4_MISC thresholding quirk in resume path
Date: Thu, 10 Jan 2019 07:54:57 +0000 [thread overview]
Message-ID: <1547106849-3476-4-git-send-email-shirish.s@amd.com> (raw)
In-Reply-To: <1547106849-3476-1-git-send-email-shirish.s@amd.com>
There are 2 code paths leading to mce_amd_feature_init() as below.
1) S5 -> S0: (boot)
secondary_startup_64 -> start_kernel -> identify_boot_cpu ->
identify_cpu ->
mcheck_cpu_init (calls __mcheck_cpu_apply_quirks before) ->
mce_amd_feature_init
2) S3 -> S0: (resume)
syscore_resume -> mce_syscore_resume -> mce_amd_feature_init
Its clear that the quirks are not applied in S3 -> S0 path, hence apply
the same.
Signed-off-by: Shirish S <shirish.s@amd.com>
---
arch/x86/kernel/cpu/mce/amd.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c
index 89298c8..ab1b12a 100644
--- a/arch/x86/kernel/cpu/mce/amd.c
+++ b/arch/x86/kernel/cpu/mce/amd.c
@@ -552,6 +552,12 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)
unsigned int bank, block, cpu = smp_processor_id();
int offset = -1;
+ /*
+ * mcheck_cpu_init() is not called when called by mce_syscore_resume(),
+ * hence re-apply quirks, to be on safer side.
+ */
+ quirk_fam15_mc4_misc_thresholding();
+
for (bank = 0; bank < mca_cfg.banks; ++bank) {
if (mce_flags.smca)
smca_configure(bank, cpu);
--
2.7.4
prev parent reply other threads:[~2019-01-10 7:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 7:54 [PATCH 0/3] x86/mce/amd: apply missing quirks to family 15 models (v2) S, Shirish
2019-01-10 7:54 ` [PATCH 1/3] x86/mce/amd: apply MC4_MISC thresholding to all models of family 15 S, Shirish
2019-01-16 19:30 ` [tip:ras/core] x86/MCE/AMD: Turn off MC4_MISC thresholding on all family 0x15 models tip-bot for Shirish S
2019-01-10 7:54 ` [PATCH 2/3] x86/mce/amd: carve out MC4_MISC thresholding quirk S, Shirish
2019-01-10 7:54 ` S, Shirish [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=1547106849-3476-4-git-send-email-shirish.s@amd.com \
--to=shirish.s@amd.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=vishal.l.verma@intel.com \
--cc=x86@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®