[coreboot-gerrit] Patch set updated for coreboot: c474867 cpu/intel: Rename 'enable_vmx()' func to 'configure_vmx()'

Edward O'Callaghan (eocallaghan@alterapraxis.com) gerrit at coreboot.org
Thu Jul 31 00:58:29 CEST 2014


Edward O'Callaghan (eocallaghan at alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6414

-gerrit

commit c474867e5a28cd5e2931d3e0f4c3d12e5c505435
Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date:   Wed Jul 30 12:44:35 2014 +1000

    cpu/intel: Rename 'enable_vmx()' func to 'configure_vmx()'
    
    In preparation for introduce runtime configurable VMX feature bit
    setting in cmos.layout.
    
    Change-Id: I3997348fdf2d66f2ea7c9b6e64c8ab98f1cd7858
    Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
---
 src/cpu/intel/fsp_model_206ax/model_206ax_init.c | 4 ++--
 src/cpu/intel/haswell/haswell_init.c             | 4 ++--
 src/cpu/intel/model_1067x/model_1067x_init.c     | 4 ++--
 src/cpu/intel/model_106cx/model_106cx_init.c     | 4 ++--
 src/cpu/intel/model_2065x/model_2065x_init.c     | 4 ++--
 src/cpu/intel/model_206ax/model_206ax_init.c     | 4 ++--
 src/cpu/intel/model_6ex/model_6ex_init.c         | 4 ++--
 src/cpu/intel/model_6fx/model_6fx_init.c         | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/cpu/intel/fsp_model_206ax/model_206ax_init.c b/src/cpu/intel/fsp_model_206ax/model_206ax_init.c
index c2f9f19..b375d60 100644
--- a/src/cpu/intel/fsp_model_206ax/model_206ax_init.c
+++ b/src/cpu/intel/fsp_model_206ax/model_206ax_init.c
@@ -36,7 +36,7 @@
 #include "model_206ax.h"
 #include "chip.h"
 
-static void enable_vmx(void)
+static void configure_vmx(void)
 {
 	struct cpuid_result regs;
 	msr_t msr;
@@ -373,7 +373,7 @@ static void model_206ax_init(device_t cpu)
 	setup_lapic();
 
 	/* Enable virtualization if enabled in CMOS */
-	enable_vmx();
+	configure_vmx();
 
 	/* Configure Enhanced SpeedStep and Thermal Sensors */
 	configure_misc();
diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c
index 043ba3a..1d1fef4 100644
--- a/src/cpu/intel/haswell/haswell_init.c
+++ b/src/cpu/intel/haswell/haswell_init.c
@@ -150,7 +150,7 @@ static acpi_cstate_t cstate_map[NUM_C_STATES] = {
 	},
 };
 
-static void enable_vmx(void)
+static void configure_vmx(void)
 {
 	struct cpuid_result regs;
 	msr_t msr;
@@ -745,7 +745,7 @@ static void haswell_init(device_t cpu)
 	setup_lapic();
 
 	/* Enable virtualization if Kconfig option is set */
-	enable_vmx();
+	configure_vmx();
 
 	/* Configure C States */
 	configure_c_states();
diff --git a/src/cpu/intel/model_1067x/model_1067x_init.c b/src/cpu/intel/model_1067x/model_1067x_init.c
index 4779a51..88c506e 100644
--- a/src/cpu/intel/model_1067x/model_1067x_init.c
+++ b/src/cpu/intel/model_1067x/model_1067x_init.c
@@ -51,7 +51,7 @@ static void init_timer(void)
 
 #define CPUID_VMX (1 << 5)
 #define CPUID_SMX (1 << 6)
-static void enable_vmx(void)
+static void configure_vmx(void)
 {
 	struct cpuid_result regs;
 	msr_t msr;
@@ -333,7 +333,7 @@ static void model_1067x_init(device_t cpu)
 	init_timer();
 
 	/* Enable virtualization */
-	enable_vmx();
+	configure_vmx();
 
 	/* Configure C States */
 	configure_c_states(quad);
diff --git a/src/cpu/intel/model_106cx/model_106cx_init.c b/src/cpu/intel/model_106cx/model_106cx_init.c
index 73ee5cd..d44b538 100644
--- a/src/cpu/intel/model_106cx/model_106cx_init.c
+++ b/src/cpu/intel/model_106cx/model_106cx_init.c
@@ -34,7 +34,7 @@
 
 #define CPUID_VMX (1 << 5)
 #define CPUID_SMX (1 << 6)
-static void enable_vmx(void)
+static void configure_vmx(void)
 {
 	struct cpuid_result regs;
 	msr_t msr;
@@ -132,7 +132,7 @@ static void model_106cx_init(device_t cpu)
 	setup_lapic();
 
 	/* Enable virtualization */
-	enable_vmx();
+	configure_vmx();
 
 	/* Configure C States */
 	configure_c_states();
diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c
index 9a2afa4..d1ec124 100644
--- a/src/cpu/intel/model_2065x/model_2065x_init.c
+++ b/src/cpu/intel/model_2065x/model_2065x_init.c
@@ -114,7 +114,7 @@ static acpi_cstate_t cstate_map[] = {
 	{ 0 }
 };
 
-static void enable_vmx(void)
+static void configure_vmx(void)
 {
 	struct cpuid_result regs;
 	msr_t msr;
@@ -369,7 +369,7 @@ static void model_2065x_init(device_t cpu)
 	setup_lapic();
 
 	/* Enable virtualization if enabled in CMOS */
-	enable_vmx();
+	configure_vmx();
 
 	/* Configure Enhanced SpeedStep and Thermal Sensors */
 	configure_misc();
diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c
index 4e56414..6debf3a 100644
--- a/src/cpu/intel/model_206ax/model_206ax_init.c
+++ b/src/cpu/intel/model_206ax/model_206ax_init.c
@@ -114,7 +114,7 @@ static acpi_cstate_t cstate_map[] = {
 	{ 0 }
 };
 
-static void enable_vmx(void)
+static void configure_vmx(void)
 {
 	struct cpuid_result regs;
 	msr_t msr;
@@ -562,7 +562,7 @@ static void model_206ax_init(device_t cpu)
 	setup_lapic();
 
 	/* Enable virtualization if enabled in CMOS */
-	enable_vmx();
+	configure_vmx();
 
 	/* Configure C States */
 	configure_c_states();
diff --git a/src/cpu/intel/model_6ex/model_6ex_init.c b/src/cpu/intel/model_6ex/model_6ex_init.c
index 8f9fbf8..4697b17 100644
--- a/src/cpu/intel/model_6ex/model_6ex_init.c
+++ b/src/cpu/intel/model_6ex/model_6ex_init.c
@@ -37,7 +37,7 @@
 
 #define CPUID_VMX (1 << 5)
 #define CPUID_SMX (1 << 6)
-static void enable_vmx(void)
+static void configure_vmx(void)
 {
 	struct cpuid_result regs;
 	msr_t msr;
@@ -163,7 +163,7 @@ static void model_6ex_init(device_t cpu)
 	setup_lapic();
 
 	/* Enable virtualization */
-	enable_vmx();
+	configure_vmx();
 
 	/* Configure C States */
 	configure_c_states();
diff --git a/src/cpu/intel/model_6fx/model_6fx_init.c b/src/cpu/intel/model_6fx/model_6fx_init.c
index 93635d4..1db70b9 100644
--- a/src/cpu/intel/model_6fx/model_6fx_init.c
+++ b/src/cpu/intel/model_6fx/model_6fx_init.c
@@ -36,7 +36,7 @@
 
 #define CPUID_VMX (1 << 5)
 #define CPUID_SMX (1 << 6)
-static void enable_vmx(void)
+static void configure_vmx(void)
 {
 	struct cpuid_result regs;
 	msr_t msr;
@@ -186,7 +186,7 @@ static void model_6fx_init(device_t cpu)
 	setup_lapic();
 
 	/* Enable virtualization */
-	enable_vmx();
+	configure_vmx();
 
 	/* Configure C States */
 	configure_c_states();



More information about the coreboot-gerrit mailing list