[SRU][focal:linux-gcp][PATCH 13/17] x86/cpu: Add Sapphire Rapids CPU model number

[Marcelo Henrique Cerri]

From: Tony Luck <tony.luck at intel.com>

BugLink: https://bugs.launchpad.net/bugs/2080324

Latest edition (039) of "Intel Architecture Instruction Set Extensions
and Future Features Programming Reference" includes three new CPU model
numbers. Linux already has the two Ice Lake server ones. Add the new
model number for Sapphire Rapids.

Signed-off-by: Tony Luck <tony.luck at intel.com>
Signed-off-by: Borislav Petkov <bp at suse.de>
Link: https://lkml.kernel.org/r/20200603173352.15506-1-tony.luck@intel.com
(back ported from commit be25d1b5ea6a3a3ecbb5474e2ae8e32d2ba055ea)
[marcelo.cerri: adjusted context. intel-family.h had several
 refactors. Sapphire rapids was still add as INTEL_FAM6_, so this
 adjustment is just a matter of ordering the defines.]
Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
---
 arch/x86/include/asm/intel-family.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
index 6fdd863198ec..28a74f22e49a 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -102,6 +102,8 @@
 #define INTEL_FAM6_RAPTORLAKE_P		0xBA
 #define INTEL_FAM6_RAPTORLAKE_S		0xBF
 
+#define INTEL_FAM6_SAPPHIRERAPIDS_X	0x8F
+
 /* "Small Core" Processors (Atom) */
 
 #define INTEL_FAM6_ATOM_BONNELL		0x1C /* Diamondville, Pineview */
-- 
2.34.1