Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar: "Two pending (non-PTI) x86 fixes: - an Intel-MID crash fix - and an Intel microcode loader blacklist quirk to avoid a problematic revision" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/platform/intel-mid: Revert "Make 'bt_sfi_data' const" x86/microcode/intel: Extend BDW late-loading with a revision checkhifive-unleashed-5.1
commit
c92a9a461d
|
@ -910,8 +910,17 @@ static bool is_blacklisted(unsigned int cpu)
|
||||||
{
|
{
|
||||||
struct cpuinfo_x86 *c = &cpu_data(cpu);
|
struct cpuinfo_x86 *c = &cpu_data(cpu);
|
||||||
|
|
||||||
if (c->x86 == 6 && c->x86_model == INTEL_FAM6_BROADWELL_X) {
|
/*
|
||||||
pr_err_once("late loading on model 79 is disabled.\n");
|
* Late loading on model 79 with microcode revision less than 0x0b000021
|
||||||
|
* may result in a system hang. This behavior is documented in item
|
||||||
|
* BDF90, #334165 (Intel Xeon Processor E7-8800/4800 v4 Product Family).
|
||||||
|
*/
|
||||||
|
if (c->x86 == 6 &&
|
||||||
|
c->x86_model == INTEL_FAM6_BROADWELL_X &&
|
||||||
|
c->x86_mask == 0x01 &&
|
||||||
|
c->microcode < 0x0b000021) {
|
||||||
|
pr_err_once("Erratum BDF90: late loading with revision < 0x0b000021 (0x%x) disabled.\n", c->microcode);
|
||||||
|
pr_err_once("Please consider either early loading through initrd/built-in or a potential BIOS update.\n");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ static int __init tng_bt_sfi_setup(struct bt_sfi_data *ddata)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct bt_sfi_data tng_bt_sfi_data __initdata = {
|
static struct bt_sfi_data tng_bt_sfi_data __initdata = {
|
||||||
.setup = tng_bt_sfi_setup,
|
.setup = tng_bt_sfi_setup,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue