Make early loading message to match late loading messages. Print
both old and new revisions.
This is helpful to know what the BIOS loaded revision is before an early
update.
microcode: early update: 0x2b000041 -> 0x2b000070 date = 2000-01-01
Store the early BIOS revision and change the print format to match late
loading message from microcode/core.c
Signed-off-by: Ashok Raj <[email protected]>
---
arch/x86/kernel/cpu/microcode/intel.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
index 0a4f511e39ea..3dbcf457f45d 100644
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -309,10 +309,10 @@ static bool load_builtin_intel_microcode(struct cpio_data *cp)
* Print ucode update info.
*/
static void
-print_ucode_info(unsigned int new_rev, unsigned int date)
+print_ucode_info(int old_rev, int new_rev, unsigned int date)
{
- pr_info_once("microcode updated early to revision 0x%x, date = %04x-%02x-%02x\n",
- new_rev,
+ pr_info_once("early update: 0x%x -> 0x%x, date = %04x-%02x-%02x\n",
+ old_rev, new_rev,
date & 0xffff,
date >> 24,
(date >> 16) & 0xff);
@@ -322,6 +322,7 @@ print_ucode_info(unsigned int new_rev, unsigned int date)
static int delay_ucode_info;
static int current_mc_date;
+static int early_old_rev;
/*
* Print early updated ucode info after printk works. This is delayed info dump.
@@ -332,7 +333,7 @@ void show_ucode_info_early(void)
if (delay_ucode_info) {
intel_cpu_collect_info(&uci);
- print_ucode_info(uci.cpu_sig.rev. current_mc_date);
+ print_ucode_info(early_old_rev, uci.cpu_sig.rev, current_mc_date);
delay_ucode_info = 0;
}
}
@@ -341,30 +342,33 @@ void show_ucode_info_early(void)
* At this point, we can not call printk() yet. Delay printing microcode info in
* show_ucode_info_early() until printk() works.
*/
-static void print_ucode(int new_rev, int date)
+static void print_ucode(int old_rev, int new_rev, int date)
{
struct microcode_intel *mc;
int *delay_ucode_info_p;
int *current_mc_date_p;
+ int *early_old_rev_p;
delay_ucode_info_p = (int *)__pa_nodebug(&delay_ucode_info);
current_mc_date_p = (int *)__pa_nodebug(¤t_mc_date);
+ early_old_rev_p = (int *)__pa_nodebug(&early_old_rev);
*delay_ucode_info_p = 1;
*current_mc_date_p = date;
+ *early_old_rev_p = old_rev;
}
#else
-static inline void print_ucode(int new_rev, int date)
+static inline void print_ucode(int old_rev, int new_rev, int date)
{
- print_ucode_info(new_rev, date);
+ print_ucode_info(old_rev, new_rev, date);
}
#endif
static int apply_microcode_early(struct ucode_cpu_info *uci, bool early)
{
struct microcode_intel *mc;
- u32 rev;
+ u32 rev, old_rev;
mc = uci->mc;
if (!mc)
@@ -390,6 +394,7 @@ static int apply_microcode_early(struct ucode_cpu_info *uci, bool early)
/* write microcode via MSR 0x79 */
native_wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)mc->bits);
+ old_rev = rev;
rev = intel_get_microcode_revision();
if (rev != mc->hdr.rev)
return -1;
@@ -397,9 +402,9 @@ static int apply_microcode_early(struct ucode_cpu_info *uci, bool early)
uci->cpu_sig.rev = rev;
if (early)
- print_ucode(uci->cpu_sig.rev, mc->hdr.date);
+ print_ucode(old_rev, uci->cpu_sig.rev, mc->hdr.date);
else
- print_ucode_info(uci->cpu_sig.rev, mc->hdr.date);
+ print_ucode_info(old_rev, uci->cpu_sig.rev, mc->hdr.date);
return 0;
}
--
2.34.1
On Tue, Nov 29 2022 at 13:08, Ashok Raj wrote:
> Make early loading message to match late loading messages. Print
> both old and new revisions.
>
> This is helpful to know what the BIOS loaded revision is before an early
> update.
>
> microcode: early update: 0x2b000041 -> 0x2b000070 date = 2000-01-01
>
> Store the early BIOS revision and change the print format to match
> late loading message from microcode/core.c
Cache the early BIOS revision before the microcode update and change
print_ucode_info() so it prints both the old and the new revision in the
same format as $function().
> */
> static void
> -print_ucode_info(unsigned int new_rev, unsigned int date)
> +print_ucode_info(int old_rev, int new_rev, unsigned int date)
Oh. Forgot to mention that before. Can you please get rid of this
pointless line break after 'static void' ?
> {
> - pr_info_once("microcode updated early to revision 0x%x, date = %04x-%02x-%02x\n",
> - new_rev,
> + pr_info_once("early update: 0x%x -> 0x%x, date = %04x-%02x-%02x\n",
> + old_rev, new_rev,
> date & 0xffff,
> date >> 24,
> (date >> 16) & 0xff);
And while at it also consolidate these arguments into a single or at max.
two lines?
Should happen in the first patch which touches this function.
Other than that, the code is fine.
Thanks,
tglx