[coreboot-gerrit] Change in coreboot[master]: libpayload/x86: Add some more CPUID helpers

[Angel Pons (Code Review)]

Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46285 )

Change subject: libpayload/x86: Add some more CPUID helpers
......................................................................

libpayload/x86: Add some more CPUID helpers

Change-Id: Ic88defd30c6d3791a51b78a14135aff55e89394d
Signed-off-by: Nico Huber 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46285
Tested-by: build bot (Jenkins) 
Reviewed-by: Michael Niewöhner 
Reviewed-by: Angel Pons 
---
M payloads/libpayload/include/x86/arch/cpuid.h
1 file changed, 32 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved
  Michael Niewöhner: Looks good to me, but someone else must approve

diff --git a/payloads/libpayload/include/x86/arch/cpuid.h b/payloads/libpayload/include/x86/arch/cpuid.h
index 8373301..c77be9c 100644
--- a/payloads/libpayload/include/x86/arch/cpuid.h
+++ b/payloads/libpayload/include/x86/arch/cpuid.h
@@ -32,4 +32,36 @@
 #define cpuid(fn, eax, ebx, ecx, edx) \
    asm("cpuid" : "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) : "0"(fn))

+#define _declare_cpuid(reg)					\
+	static inline unsigned int cpuid_##reg(unsigned int fn)	\
+	{							\
+		unsigned int eax, ebx, ecx, edx;		\
+		cpuid(fn, eax, ebx, ecx, edx);			\
+		return reg;					\
+	}
+
+_declare_cpuid(eax)
+_declare_cpuid(ebx)
+_declare_cpuid(ecx)
+_declare_cpuid(edx)
+
+#undef _declare_cpuid
+
+static inline unsigned int cpuid_max(void)
+{
+	return cpuid_eax(0);
+}
+
+static inline unsigned int cpuid_family(void)
+{
+	const unsigned int eax = cpuid_eax(1);
+	return (eax & 0xff00000) >> (20 - 4) | (eax & 0xf00) >> 8;
+}
+
+static inline unsigned int cpuid_model(void)
+{
+	const unsigned int eax = cpuid_eax(1);
+	return (eax & 0xf0000) >> (16 - 4) | (eax & 0xf0) >> 4;
+}
+
 #endif