soc/intel/cannonlake: Enable coreboot MP PPI service for WHL/CML

This patch performs MP initialization by FSP using coreboot MP
PPI service.

BUG=b:74436746
TEST=Able to perform MP initialization on WHL and CML platform.

Change-Id: I530d50e5aacc3cb9b625df14a50d4c5923e3fb4d
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32301
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Maulik V Vaghela <maulik.v.vaghela@intel.com>
This commit is contained in:
Subrata Banik 2019-04-12 14:39:42 +05:30
parent 79f92910eb
commit 41dad286d8
3 changed files with 17 additions and 1 deletions

View File

@ -27,6 +27,8 @@ config SOC_INTEL_WHISKEYLAKE
bool bool
default n default n
select SOC_INTEL_COMMON_CANNONLAKE_BASE select SOC_INTEL_COMMON_CANNONLAKE_BASE
select FSP_PEIM_TO_PEIM_INTERFACE
select USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI
help help
Intel Whiskeylake support Intel Whiskeylake support
@ -34,6 +36,12 @@ config SOC_INTEL_COMETLAKE
bool bool
default n default n
select SOC_INTEL_COMMON_CANNONLAKE_BASE select SOC_INTEL_COMMON_CANNONLAKE_BASE
# TODO:
# Delete FSP_PEIM_TO_PEIM_INTERFACE and
# USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI selection
# and select PLATFORM_USES_FSP2_1 once FSP support for CML is ready
select FSP_PEIM_TO_PEIM_INTERFACE
select USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI
help help
Intel Cometlake support Intel Cometlake support

View File

@ -18,7 +18,9 @@
#include <device/device.h> #include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <fsp/api.h> #include <fsp/api.h>
#include <fsp/ppi/mp_service_ppi.h>
#include <fsp/util.h> #include <fsp/util.h>
#include <intelblocks/mp_init.h>
#include <intelblocks/xdci.h> #include <intelblocks/xdci.h>
#include <soc/intel/common/vbt.h> #include <soc/intel/common/vbt.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
@ -142,6 +144,9 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
params->Usb3OverCurrentPin[i] = 0; params->Usb3OverCurrentPin[i] = 0;
} }
if (CONFIG(USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI))
params->CpuMpPpi = (uintptr_t) mp_fill_ppi_services_data();
mainboard_silicon_init_params(params); mainboard_silicon_init_params(params);
/* Set PsysPmax if it is available from DT */ /* Set PsysPmax if it is available from DT */

View File

@ -68,7 +68,10 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg, const config_t *config)
m_cfg->VmxEnable = config->VmxEnable; m_cfg->VmxEnable = config->VmxEnable;
#if CONFIG(SOC_INTEL_COMMON_CANNONLAKE_BASE) #if CONFIG(SOC_INTEL_COMMON_CANNONLAKE_BASE)
m_cfg->SkipMpInit = !CONFIG_USE_INTEL_FSP_MP_INIT; if (CONFIG(USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI))
m_cfg->SkipMpInit = 0;
else
m_cfg->SkipMpInit = !CONFIG_USE_INTEL_FSP_MP_INIT;
#endif #endif
/* Set CpuRatio to match existing MSR value */ /* Set CpuRatio to match existing MSR value */