diff options
Diffstat (limited to 'src/soc/intel/common/block')
| -rw-r--r-- | src/soc/intel/common/block/chip/chip.c | 15 | ||||
| -rw-r--r-- | src/soc/intel/common/block/cpu/mp_init.c | 7 | ||||
| -rw-r--r-- | src/soc/intel/common/block/include/intelblocks/chip.h | 15 |
3 files changed, 37 insertions, 0 deletions
diff --git a/src/soc/intel/common/block/chip/chip.c b/src/soc/intel/common/block/chip/chip.c index cfec4eca39..aecf060e3f 100644 --- a/src/soc/intel/common/block/chip/chip.c +++ b/src/soc/intel/common/block/chip/chip.c @@ -32,3 +32,18 @@ const struct soc_intel_common_config *chip_get_common_soc_structure(void) return soc_config; } + +/* + * This function will get MP Init config + * + * Return values: + * 0 = Make use of coreboot MP Init + * 1 = Make use of FSP MP Init + */ +int chip_get_fsp_mp_init(void) +{ + const struct soc_intel_common_config *common_config; + common_config = chip_get_common_soc_structure(); + + return common_config->use_fsp_mp_init; +} diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c index e264348055..fd0ac992b5 100644 --- a/src/soc/intel/common/block/cpu/mp_init.c +++ b/src/soc/intel/common/block/cpu/mp_init.c @@ -22,6 +22,7 @@ #include <cpu/x86/msr.h> #include <cpu/x86/mp.h> #include <cpu/intel/microcode.h> +#include <intelblocks/chip.h> #include <intelblocks/cpulib.h> #include <intelblocks/fast_spi.h> #include <intelblocks/mp_init.h> @@ -124,6 +125,9 @@ static void init_cpus(void *unused) struct device *dev = dev_find_path(NULL, DEVICE_PATH_CPU_CLUSTER); assert(dev != NULL); + if (chip_get_fsp_mp_init()) + return; + microcode_patch = intel_microcode_find(); intel_microcode_load_unlocked(microcode_patch); @@ -138,6 +142,9 @@ static void wrapper_x86_setup_mtrrs(void *unused) /* Ensure to re-program all MTRRs based on DRAM resource settings */ static void post_cpus_init(void *unused) { + if (chip_get_fsp_mp_init()) + return; + if (mp_run_on_all_cpus(&wrapper_x86_setup_mtrrs, NULL, 1000) < 0) printk(BIOS_ERR, "MTRR programming failure\n"); diff --git a/src/soc/intel/common/block/include/intelblocks/chip.h b/src/soc/intel/common/block/include/intelblocks/chip.h index 555bdaa893..d761f6be76 100644 --- a/src/soc/intel/common/block/include/intelblocks/chip.h +++ b/src/soc/intel/common/block/include/intelblocks/chip.h @@ -33,9 +33,24 @@ struct soc_intel_common_config { int chipset_lockdown; struct gspi_cfg gspi[CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_MAX]; struct dw_i2c_bus_config i2c[CONFIG_SOC_INTEL_I2C_DEV_MAX]; + /* + * Option for mainboard to skip coreboot MP initialization + * 0 = Make use of coreboot MP Init + * 1 = Make use of FSP MP Init + */ + uint8_t use_fsp_mp_init; }; /* This function to retrieve soc config structure required by common code */ const struct soc_intel_common_config *chip_get_common_soc_structure(void); +/* + * This function will get MP Init config + * + * Return values: + * 0 = Make use of coreboot MP Init + * 1 = Make use of FSP MP Init + */ +int chip_get_fsp_mp_init(void); + #endif /* SOC_INTEL_COMMON_BLOCK_CHIP_H */ |