4 files changed, 4 insertions, 8 deletions
diff --git a/src/soc/intel/baytrail/cpu.c b/src/soc/intel/baytrail/cpu.c
index 9c69d1675e..6188689c6c 100644
--- a/src/soc/intel/baytrail/cpu.c
+++ b/src/soc/intel/baytrail/cpu.c
@@ -83,8 +83,7 @@ void baytrail_init_cpus(device_t dev)
 	void *default_smm_area;
 
 	/* Set up MTRRs based on physical address size. */
-	x86_setup_fixed_mtrrs();
-	x86_setup_var_mtrrs(pattrs->address_bits, 2);
+	x86_setup_mtrrs_with_detect();
 	x86_mtrr_check();
 
 	mp_params.num_cpus = pattrs->num_cpus,
diff --git a/src/soc/intel/braswell/cpu.c b/src/soc/intel/braswell/cpu.c
index feb9d9b84a..71af487840 100644
--- a/src/soc/intel/braswell/cpu.c
+++ b/src/soc/intel/braswell/cpu.c
@@ -89,8 +89,7 @@ void soc_init_cpus(device_t dev)
 			__FILE__, __func__, dev_name(dev));
 
 	/* Set up MTRRs based on physical address size. */
-	x86_setup_fixed_mtrrs();
-	x86_setup_var_mtrrs(pattrs->address_bits, 2);
+	x86_setup_mtrrs_with_detect();
 	x86_mtrr_check();
 
 	mp_params.num_cpus = pattrs->num_cpus,
diff --git a/src/soc/intel/broadwell/cpu.c b/src/soc/intel/broadwell/cpu.c
index 4a94c1d3fa..5f3fb152cf 100644
--- a/src/soc/intel/broadwell/cpu.c
+++ b/src/soc/intel/broadwell/cpu.c
@@ -573,8 +573,7 @@ static void configure_mca(void)
 static void bsp_init_before_ap_bringup(struct bus *cpu_bus)
 {
 	/* Setup MTRRs based on physical address size. */
-	x86_setup_fixed_mtrrs();
-	x86_setup_var_mtrrs(cpuid_eax(0x80000008) & 0xff, 2);
+	x86_setup_mtrrs_with_detect();
 	x86_mtrr_check();
 
 	initialize_vr_config();
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index 327bee90c3..d154f0ec51 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -343,8 +343,7 @@ static void configure_mca(void)
 static void bsp_init_before_ap_bringup(struct bus *cpu_bus)
 {
 	/* Setup MTRRs based on physical address size. */
-	x86_setup_fixed_mtrrs();
-	x86_setup_var_mtrrs(cpuid_eax(0x80000008) & 0xff, 2);
+	x86_setup_mtrrs_with_detect();
 	x86_mtrr_check();
 }