cpuid: Add helper function for cpuid(1) functions

This patch introduces 3 helper function for cpuid(1) :

1. cpu_get_cpuid() -> to get processor id (from cpuid.eax)
2. cpu_get_feature_flags_ecx -> to get processor feature flag (from cpuid.ecx)
3. cpu_get_feature_flags_edx -> to get processor feature flag (from cpuid.edx)

Above 3 helper functions are targeted to replace majority of cpuid(1)
references.

Change-Id: Ib96a7c79dadb1feff0b8d58aa408b355fbb3bc50
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/c/30123
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>

3 files changed, 20 insertions, 16 deletions

diff --git a/src/cpu/intel/common/common_init.c b/src/cpu/intel/common/common_init.c
index 02eb0e201e..7dbbfda2e8 100644
--- a/src/cpu/intel/common/common_init.c
+++ b/src/cpu/intel/common/common_init.c
@@ -16,20 +16,21 @@
  */
 
 #include <arch/acpigen.h>
+#include <arch/cpu.h>
 #include <console/console.h>
 #include <cpu/x86/msr.h>
 #include "common.h"
 
 void set_vmx(void)
 {
-	struct cpuid_result regs;
 	msr_t msr;
+	uint32_t feature_flag;
 	int enable = IS_ENABLED(CONFIG_ENABLE_VMX);
 	int lock = IS_ENABLED(CONFIG_SET_VMX_LOCK_BIT);
 
-	regs = cpuid(1);
+	feature_flag = cpu_get_feature_flags_ecx();
 	/* Check that the VMX is supported before reading or writing the MSR. */
-	if (!((regs.ecx & CPUID_VMX) || (regs.ecx & CPUID_SMX))) {
+	if (!((feature_flag & CPUID_VMX) || (feature_flag & CPUID_SMX))) {
 		printk(BIOS_DEBUG, "CPU doesn't support VMX; exiting\n");
 		return;
 	}
@@ -52,7 +53,7 @@ void set_vmx(void)
 
 	if (enable) {
 		msr.lo |= (1 << 2);
-		if (regs.ecx & CPUID_SMX)
+		if (feature_flag & CPUID_SMX)
 			msr.lo |= (1 << 1);
 	}
 
diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c
index 2340dd0b03..20c1fac471 100644
--- a/src/cpu/intel/haswell/haswell_init.c
+++ b/src/cpu/intel/haswell/haswell_init.c
@@ -606,12 +606,12 @@ static void enable_lapic_tpr(void)
 
 static void configure_dca_cap(void)
 {
-	struct cpuid_result cpuid_regs;
+	uint32_t feature_flag;
 	msr_t msr;
 
 	/* Check feature flag in CPUID.(EAX=1):ECX[18]==1 */
-	cpuid_regs = cpuid(1);
-	if (cpuid_regs.ecx & (1 << 18)) {
+	feature_flag = cpu_get_feature_flags_ecx();
+	if (feature_flag & CPUID_DCA) {
 		msr = rdmsr(IA32_PLATFORM_DCA_CAP);
 		msr.lo |= 1;
 		wrmsr(IA32_PLATFORM_DCA_CAP, msr);
diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c
index da869567b6..27f56be67d 100644
--- a/src/cpu/intel/model_206ax/model_206ax_init.c
+++ b/src/cpu/intel/model_206ax/model_206ax_init.c
@@ -19,6 +19,7 @@
 #include <device/device.h>
 #include <string.h>
 #include <arch/acpi.h>
+#include <arch/cpu.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>
@@ -362,12 +363,12 @@ static void enable_lapic_tpr(void)
 
 static void configure_dca_cap(void)
 {
-	struct cpuid_result cpuid_regs;
+	uint32_t feature_flag;
 	msr_t msr;
 
 	/* Check feature flag in CPUID.(EAX=1):ECX[18]==1 */
-	cpuid_regs = cpuid(1);
-	if (cpuid_regs.ecx & (1 << 18)) {
+	feature_flag = cpu_get_feature_flags_ecx();
+	if (feature_flag & CPUID_DCA) {
 		msr = rdmsr(IA32_PLATFORM_DCA_CAP);
 		msr.lo |= 1;
 		wrmsr(IA32_PLATFORM_DCA_CAP, msr);
@@ -505,9 +506,9 @@ static void intel_cores_init(struct device *cpu)
 static void model_206ax_report(void)
 {
 	static const char *const mode[] = {"NOT ", ""};
-	struct cpuid_result cpuidr;
 	char processor_name[49];
 	int vt, txt, aes;
+	uint32_t cpu_id, cpu_feature_flag;
 
 	/* Print processor name */
 	fill_processor_name(processor_name);
@@ -517,11 +518,13 @@ static void model_206ax_report(void)
 	printk(BIOS_INFO, "CPU: platform id %x\n", get_platform_id());
 
 	/* CPUID and features */
-	cpuidr = cpuid(1);
-	printk(BIOS_INFO, "CPU: cpuid(1) 0x%x\n", cpuidr.eax);
-	aes = (cpuidr.ecx & (1 << 25)) ? 1 : 0;
-	txt = (cpuidr.ecx & (1 << 6)) ? 1 : 0;
-	vt = (cpuidr.ecx & (1 << 5)) ? 1 : 0;
+	cpu_id = cpu_get_cpuid();
+	printk(BIOS_INFO, "CPU: cpuid(1) 0x%x\n", cpu_id);
+
+	cpu_feature_flag = cpu_get_feature_flags_ecx();
+	aes = (cpu_feature_flag & CPUID_AES) ? 1 : 0;
+	txt = (cpu_feature_flag & CPUID_SMX) ? 1 : 0;
+	vt = (cpu_feature_flag & CPUID_VMX) ? 1 : 0;
 	printk(BIOS_INFO, "CPU: AES %ssupported\n", mode[aes]);
 	printk(BIOS_INFO, "CPU: TXT %ssupported\n", mode[txt]);
 	printk(BIOS_INFO, "CPU: VT %ssupported\n", mode[vt]);