From: Borislav Petkov <bp@alien8.de>
To: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: linux-kernel@vger.kernel.org, H Peter Anvin <hpa@zytor.com>
Subject: Re: [PATCH 4/8] x86, microcode, intel: add error logging to early update driver
Date: Mon, 20 Oct 2014 17:08:01 +0200 [thread overview]
Message-ID: <20141020150801.GE3524@pd.tnic> (raw)
In-Reply-To: <1410197875-19252-5-git-send-email-hmh@hmh.eng.br>
On Mon, Sep 08, 2014 at 02:37:50PM -0300, Henrique de Moraes Holschuh wrote:
> Enhance the logging in the Intel early microcode update driver to
> be able to report errors.
>
> Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
> ---
> arch/x86/kernel/cpu/microcode/intel_early.c | 94 +++++++++++++++------------
> 1 file changed, 54 insertions(+), 40 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/microcode/intel_early.c b/arch/x86/kernel/cpu/microcode/intel_early.c
> index f73fc0a..8ad50d6 100644
> --- a/arch/x86/kernel/cpu/microcode/intel_early.c
> +++ b/arch/x86/kernel/cpu/microcode/intel_early.c
> @@ -31,6 +31,12 @@
> #include <asm/tlbflush.h>
> #include <asm/setup.h>
>
> +enum {
> + INTEL_EARLYMCU_NONE = 0, /* did nothing */
> + INTEL_EARLYMCU_UPDATEOK, /* microcode updated */
> + INTEL_EARLYMCU_REJECTED, /* cpu rejected it */
> +};
> +
> static unsigned long mc_saved_in_initrd[MAX_UCODE_COUNT];
> static struct mc_saved_data {
> unsigned int mc_saved_count;
> @@ -576,37 +582,50 @@ scan_microcode(unsigned long start, unsigned long end,
>
> /*
> * Print ucode update info.
> + * for status == INTEL_EARLYMCU_UPDATEOK, data should be the mcu date
> + * for status == INTEL_EARLYMCU_REJECTED, data should be mcu revision
> */
> -static void
> -print_ucode_info(struct ucode_cpu_info *uci, unsigned int date)
> +static void print_ucode_info(const unsigned int status,
> + const struct ucode_cpu_info *uci,
> + const unsigned int data)
> {
> int cpu = smp_processor_id();
> -
> - pr_info("CPU%d: entire core updated early to revision 0x%x, date %04x-%02x-%02x\n",
> - cpu,
> - uci->cpu_sig.rev,
> - date & 0xffff,
> - date >> 24,
> - (date >> 16) & 0xff);
> + struct ucode_cpu_info ucil;
> +
> + switch (status) {
> + case INTEL_EARLYMCU_NONE:
> + break;
> + case INTEL_EARLYMCU_UPDATEOK:
> + if (!uci) {
> + collect_cpu_info_early(&ucil);
> + uci = &ucil;
> + }
> + pr_info("CPU%d: entire core updated early to revision 0x%x, date %04x-%02x-%02x\n",
> + cpu,
> + uci->cpu_sig.rev,
> + data & 0xffff,
> + data >> 24,
> + (data >> 16) & 0xff);
> + break;
> + case INTEL_EARLYMCU_REJECTED:
> + pr_err("CPU%d: update to revision 0x%x rejected by the processor\n", cpu, data);
> + break;
> + }
> }
>
> #ifdef CONFIG_X86_32
>
> -static int delay_ucode_info;
> -static int current_mc_date;
> +static unsigned int delay_ucode_info;
> +static unsigned int delay_ucode_info_data;
First of all, this really is date and not data and prefixing it with
"delay" really doesn't make it cleaner.
Then, this whole scheme can be simplified a bit by dropping
delay_ucode_info and using current_mc_date to test whether to print the
message or not. After printing, you set it back to 0.
And then you can drop the _REJECTED case as it is not needed.
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
next prev parent reply other threads:[~2014-10-20 15:08 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-08 17:37 [PATCH 0/8] x86, microcode, intel: fixes and enhancements Henrique de Moraes Holschuh
2014-09-08 17:37 ` [PATCH 1/8] x86, microcode, intel: forbid some incorrect metadata Henrique de Moraes Holschuh
2014-10-05 17:34 ` Borislav Petkov
2014-10-05 19:37 ` Henrique de Moraes Holschuh
2014-10-05 21:13 ` Borislav Petkov
2014-10-05 21:49 ` Henrique de Moraes Holschuh
2014-10-06 5:15 ` Borislav Petkov
2014-09-08 17:37 ` [PATCH 2/8] x86, microcode, intel: don't update each HT core twice Henrique de Moraes Holschuh
2014-10-20 13:32 ` Borislav Petkov
2014-10-20 18:24 ` Henrique de Moraes Holschuh
2014-10-28 17:31 ` Borislav Petkov
2014-10-31 18:43 ` Henrique de Moraes Holschuh
2014-11-01 11:06 ` Borislav Petkov
2014-11-01 19:20 ` Henrique de Moraes Holschuh
2014-11-04 15:53 ` Borislav Petkov
2014-09-08 17:37 ` [PATCH 3/8] x86, microcode, intel: clarify log messages Henrique de Moraes Holschuh
2014-10-20 13:52 ` Borislav Petkov
2014-10-21 14:13 ` Henrique de Moraes Holschuh
2014-10-29 9:54 ` Borislav Petkov
2014-10-31 20:08 ` Henrique de Moraes Holschuh
2014-11-07 17:37 ` Borislav Petkov
2014-09-08 17:37 ` [PATCH 4/8] x86, microcode, intel: add error logging to early update driver Henrique de Moraes Holschuh
2014-10-20 15:08 ` Borislav Petkov [this message]
2014-10-21 14:10 ` Henrique de Moraes Holschuh
2014-10-30 17:41 ` Borislav Petkov
2014-10-30 18:15 ` Joe Perches
2014-10-31 20:10 ` Henrique de Moraes Holschuh
2014-09-08 17:37 ` [PATCH 5/8] x86, microcode, intel: don't check extsig entry checksum Henrique de Moraes Holschuh
2014-10-30 20:25 ` Borislav Petkov
2014-10-31 17:14 ` Henrique de Moraes Holschuh
2014-11-07 17:49 ` Borislav Petkov
2014-09-08 17:37 ` [PATCH 6/8] x86, microcode, intel: use cpuid explicitly instead of sync_core Henrique de Moraes Holschuh
2014-11-07 17:56 ` Borislav Petkov
2014-11-07 18:40 ` Henrique de Moraes Holschuh
2014-11-07 19:48 ` Borislav Petkov
2014-09-08 17:37 ` [PATCH 7/8] x86, microcode, intel: guard against misaligned microcode data Henrique de Moraes Holschuh
2014-09-18 0:48 ` Henrique de Moraes Holschuh
2014-11-07 19:59 ` Borislav Petkov
2014-11-07 22:54 ` Henrique de Moraes Holschuh
2014-11-07 23:48 ` Borislav Petkov
2014-11-08 21:57 ` Henrique de Moraes Holschuh
2014-11-11 10:47 ` Borislav Petkov
2014-11-11 16:57 ` Henrique de Moraes Holschuh
2014-11-11 17:13 ` Borislav Petkov
2014-11-11 19:54 ` Henrique de Moraes Holschuh
2014-11-12 12:31 ` Borislav Petkov
2014-11-13 0:18 ` Henrique de Moraes Holschuh
2014-11-13 11:53 ` Borislav Petkov
2014-11-15 23:10 ` Henrique de Moraes Holschuh
2014-11-24 17:35 ` Borislav Petkov
2014-11-25 13:29 ` Henrique de Moraes Holschuh
2014-09-08 17:37 ` [PATCH 8/8] x86, microcode, intel: defend apply_microcode_intel with BUG_ON Henrique de Moraes Holschuh
2014-11-07 20:05 ` Borislav Petkov
2014-11-07 22:56 ` Henrique de Moraes Holschuh
2014-11-07 23:48 ` Borislav Petkov
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=20141020150801.GE3524@pd.tnic \
--to=bp@alien8.de \
--cc=hmh@hmh.eng.br \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.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).