Pull x86 cpu updates from Ingo Molnar: "Misc updates: - Extend the x86 family/model macros with a steppings dimension, because x86 life isn't complex enough and Intel uses steppings to differentiate between different CPUs. :-/ - Convert the TSC deadline timer quirks to the steppings macros. - Clean up asm mnemonics. - Fix the handling of an AMD erratum, or in other words, fix a kernel erratum" * tag 'x86-cpu-2020-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/cpu: Use RDRAND and RDSEED mnemonics in archrandom.h x86/cpu: Use INVPCID mnemonic in invpcid.h x86/cpu/amd: Make erratum #1054 a legacy erratum x86/apic: Convert the TSC deadline timer matching to steppings macro x86/cpu: Add a X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS() macro x86/cpu: Add a steppings field to struct x86_cpu_id
Showing the changes to include/linux (1 of 7 files). Show all
Unified · Split
| @@ -663,6 +663,7 @@ struct x86_cpu_id { · 662 unmodified lines | |||
| 663 | __u16 vendor; | 663 | __u16 vendor; |
| 664 | __u16 family; | 664 | __u16 family; |
| 665 | __u16 model; | 665 | __u16 model; |
| 666 | __u16 steppings; | ||
| 666 | __u16 feature; /* bit index */ | 667 | __u16 feature; /* bit index */ |
| 667 | kernel_ulong_t driver_data; | 668 | kernel_ulong_t driver_data; |
| 668 | }; | 669 | }; |
| @@ -671,6 +672,7 @@ struct x86_cpu_id { · 2 unmodified lines | |||
| 671 | #define X86_VENDOR_ANY 0xffff | 672 | #define X86_VENDOR_ANY 0xffff |
| 672 | #define X86_FAMILY_ANY 0 | 673 | #define X86_FAMILY_ANY 0 |
| 673 | #define X86_MODEL_ANY 0 | 674 | #define X86_MODEL_ANY 0 |
| 675 | #define X86_STEPPING_ANY 0 | ||
| 674 | #define X86_FEATURE_ANY 0 /* Same as FPU, you can't test for that */ | 676 | #define X86_FEATURE_ANY 0 /* Same as FPU, you can't test for that */ |
| 675 | 677 | ||
| 676 | /* | 678 | /* |