Messages in this thread Patch in this message | | | Date | Mon, 29 Apr 2024 09:01:54 -0000 | From | "tip-bot2 for Tony Luck" <> | Subject | [tip: x86/cpu] x86/microcode/intel: Switch to new Intel CPU model defines |
| |
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 375a756448e29e2fe8944d0a0596da9300da2c26 Gitweb: https://git.kernel.org/tip/375a756448e29e2fe8944d0a0596da9300da2c26 Author: Tony Luck <tony.luck@intel.com> AuthorDate: Wed, 24 Apr 2024 11:15:13 -07:00 Committer: Borislav Petkov (AMD) <bp@alien8.de> CommitterDate: Mon, 29 Apr 2024 10:31:26 +02:00
x86/microcode/intel: Switch to new Intel CPU model defines
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/all/20240424181513.41829-1-tony.luck%40intel.com --- arch/x86/kernel/cpu/microcode/intel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index 5f04144..815fa67 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -21,7 +21,7 @@ #include <linux/uio.h> #include <linux/mm.h> -#include <asm/intel-family.h> +#include <asm/cpu_device_id.h> #include <asm/processor.h> #include <asm/tlbflush.h> #include <asm/setup.h> @@ -577,8 +577,7 @@ static bool is_blacklisted(unsigned int cpu) * 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 && + if (c->x86_vfm == INTEL_BROADWELL_X && c->x86_stepping == 0x01 && llc_size_per_core > 2621440 && c->microcode < 0x0b000021) {
| |