x86/cpu/vfm: Add/initialize x86_vfm field to struct cpuinfo_x86

[ Upstream commit a9d0adce69075192961f3be466c4810a21b7bc9e ]

Refactor struct cpuinfo_x86 so that the vendor, family, and model
fields are overlaid in a union with a 32-bit field that combines
all three (together with a one byte reserved field in the upper
byte).

This will make it easy, cheap, and reliable to check all three
values at once.

See

  https://lore.kernel.org/r/Zgr6kT8oULbnmEXx@agluck-desk3

for why the ordering is (low-to-high bits):

  (vendor, family, model)

  [ bp: Move comments over the line, add the backstory about the
    particular order of the fields. ]

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240416211941.9369-2-tony.luck@intel.com
Stable-dep-of: c9a4b55431e5 ("x86/cpu: Add Lunar Lake to list of CPUs with a broken MONITOR implementation")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 6e775303d687dd7b6c34c246838567b0dace6f62..428348e7f06c3ade22f4feb9eb6a9bee54bb4810 100644 (file)
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -81,9 +81,23 @@ extern u16 __read_mostly tlb_lld_1g[NR_INFO];
  */
 
 struct cpuinfo_x86 {
-       __u8                    x86;            /* CPU family */
-       __u8                    x86_vendor;     /* CPU vendor */
-       __u8                    x86_model;
+       union {
+               /*
+                * The particular ordering (low-to-high) of (vendor,
+                * family, model) is done in case range of models, like
+                * it is usually done on AMD, need to be compared.
+                */
+               struct {
+                       __u8    x86_model;
+                       /* CPU family */
+                       __u8    x86;
+                       /* CPU vendor */
+                       __u8    x86_vendor;
+                       __u8    x86_reserved;
+               };
+               /* combined vendor, family, model */
+               __u32           x86_vfm;
+       };
        __u8                    x86_stepping;
 #ifdef CONFIG_X86_64
        /* Number of 4K pages in DTLB/ITLB combined(in pages): */