[S] Change in coreboot[master]: arch/x86/include/cpu: introduce CPUID_FROM_FMS macro

[Felix Held (Code Review)]

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/72856 )

Change subject: arch/x86/include/cpu: introduce CPUID_FROM_FMS macro
......................................................................

arch/x86/include/cpu: introduce CPUID_FROM_FMS macro

Introduce a macro to get the raw CPUID leaf 1 EAX value from a given set
of CPU family, model and stepping. The processor type in bits 12 and 13
is assumed to be always be zero; at least this is the case for all
CPUIDs that are currently in the coreboot tree. This can be used to
make the device values in the CPU device ID tables easier to read.

Signed-off-by: Felix Held 
Change-Id: Idab77453712b14983b1d02ca365f7924239fc2bf
---
M src/arch/x86/include/arch/cpu.h
1 file changed, 26 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/56/72856/1

diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h
index ffa80a8..414acc0 100644
--- a/src/arch/x86/include/arch/cpu.h
+++ b/src/arch/x86/include/arch/cpu.h
@@ -111,6 +111,16 @@

struct device;

+#define CPUID_FROM_FMS(family, model, stepping) ( \
+	/* bits 31..28: reserved, set to 0 */ \
+	((family) > 0xf ? ((family) - 0xf) & 0xff : 0) << 20 | \
+	((model) >> 4 & 0xf) << 16 | \
+	/* bits 15..14: reserved, set to 0 */ \
+	/* bits 13..12: processor type, set to 0 */ \
+	((family) > 0xf ? 0xf : family & 0xf) << 8 | \
+	((model) & 0xf) << 4 | \
+	((stepping) & 0xf) << 0)
+
 #define CPUID_EXACT_MATCH_MASK		0xffffffff
 #define CPUID_ALL_STEPPINGS_MASK	0xfffffff0