intel: Drop FSP_PEIM_TO_PEIM_INTERFACE

This change drops the config FSP_PEIM_TO_PEIM_INTERFACE.

FSP_PEIM_TO_PEIM_INTERFACE is used for:
* Auto-selecting FSP_USES_MP_SERVICES_PPI
* Including src/drivers/intel/fsp2_0/ppi/Kconfig
* Adding ppi to subdirs-y
* Setting USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI to y

and is selected by SoCs that want to enable MP PPI services.

Instead of using the indirect path of selecting MP PPI services, this
change allows SoC to select FSP_USES_MP_SERVICES_PPI directly. The
above uses are handled as follows:

* Auto-selecting FSP_USES_MP_SERVICES_PPI
  --> This is handled by SoC selection of FSP_USES_MP_SERVICES_PPI.
* Including src/drivers/intel/fsp2_0/ppi/Kconfig
  --> The guard isn't really required. The Kconfig options in this
  file don't present user prompts and don't really need to be guarded.
* Adding ppi to subdirs-y
  --> Makefile under ppi/ already has conditional inclusion of files
  and does not require a top-level conditional.
* Setting USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI to y
  --> This is set to y if FSP_USES_MP_SERVICES_PPI is selected by SoC.

TEST=Verified that timeless build for brya, volteer, icelake_rvp,
elkhartlake_crb and waddledee shows no change in generated coreboot.rom

Change-Id: I0664f09d85f5be372d19925d47034c76aeeef2ae
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50274
Reviewed-by: Aamir Bohra <aamir.bohra@intel.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Furquan Shaikh 2021-02-03 23:02:34 -08:00 committed by Patrick Georgi
parent 0f30063abf
commit 1a5f25ea7f
8 changed files with 7 additions and 21 deletions

View File

@ -180,16 +180,6 @@ config FSP_PLATFORM_MEMORY_SETTINGS_VERSIONS
This allows deployed systems to bump their version number This allows deployed systems to bump their version number
with the same FSP which will trigger a retrain of the memory. with the same FSP which will trigger a retrain of the memory.
config FSP_PEIM_TO_PEIM_INTERFACE
bool
select FSP_USES_MP_SERVICES_PPI
help
This option allows SOC user to create specific PPI for Intel FSP
usage, coreboot will provide required PPI structure definitions
along with all APIs as per EFI specification. So far this feature
is limited till EFI_PEI_MP_SERVICE_PPI and this option might be
useful to add further PPI if required.
config HAVE_FSP_LOGO_SUPPORT config HAVE_FSP_LOGO_SUPPORT
bool bool
default n default n
@ -279,8 +269,6 @@ config SOC_INTEL_COMMON_FSP_RESET
will use the FSP EAS v2.0 section 12.2.2 (OEM Status Code) to indicate that will use the FSP EAS v2.0 section 12.2.2 (OEM Status Code) to indicate that
a reset is required. a reset is required.
if FSP_PEIM_TO_PEIM_INTERFACE
source "src/drivers/intel/fsp2_0/ppi/Kconfig" source "src/drivers/intel/fsp2_0/ppi/Kconfig"
endif
endif endif

View File

@ -95,7 +95,6 @@ ifneq ($(call strip_quotes,$(CONFIG_FSP_HEADER_PATH)),)
CPPFLAGS_common+=-I$(CONFIG_FSP_HEADER_PATH) CPPFLAGS_common+=-I$(CONFIG_FSP_HEADER_PATH)
endif endif
# Include PPI directory of CONFIG_FSP_PEIM_TO_PEIM_INTERFACE is enable subdirs-y += ppi
subdirs-$(CONFIG_FSP_PEIM_TO_PEIM_INTERFACE) += ppi
endif endif

View File

@ -39,7 +39,7 @@ config CPU_SPECIFIC_OPTIONS
select PARALLEL_MP_AP_WORK select PARALLEL_MP_AP_WORK
select MICROCODE_BLOB_UNDISCLOSED select MICROCODE_BLOB_UNDISCLOSED
select PLATFORM_USES_FSP2_2 select PLATFORM_USES_FSP2_2
select FSP_PEIM_TO_PEIM_INTERFACE select FSP_USES_MP_SERVICES_PPI
select REG_SCRIPT select REG_SCRIPT
select PMC_GLOBAL_RESET_ENABLE_LOCK select PMC_GLOBAL_RESET_ENABLE_LOCK
select PMC_LOW_POWER_MODE_PROGRAM select PMC_LOW_POWER_MODE_PROGRAM

View File

@ -75,8 +75,7 @@ config USE_INTEL_FSP_MP_INIT
config USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI config USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI
bool "Perform MP Initialization by FSP using coreboot MP PPI service" bool "Perform MP Initialization by FSP using coreboot MP PPI service"
depends on FSP_USES_MP_SERVICES_PPI default y if FSP_USES_MP_SERVICES_PPI
default y if FSP_PEIM_TO_PEIM_INTERFACE
default n default n
help help
This option allows FSP to make use of MP services PPI published by This option allows FSP to make use of MP services PPI published by

View File

@ -31,7 +31,7 @@ config CPU_SPECIFIC_OPTIONS
select PARALLEL_MP_AP_WORK select PARALLEL_MP_AP_WORK
select MICROCODE_BLOB_UNDISCLOSED select MICROCODE_BLOB_UNDISCLOSED
select PLATFORM_USES_FSP2_1 select PLATFORM_USES_FSP2_1
select FSP_PEIM_TO_PEIM_INTERFACE select FSP_USES_MP_SERVICES_PPI
select REG_SCRIPT select REG_SCRIPT
select PMC_GLOBAL_RESET_ENABLE_LOCK select PMC_GLOBAL_RESET_ENABLE_LOCK
select PMC_LOW_POWER_MODE_PROGRAM select PMC_LOW_POWER_MODE_PROGRAM

View File

@ -31,7 +31,7 @@ config CPU_SPECIFIC_OPTIONS
select PARALLEL_MP_AP_WORK select PARALLEL_MP_AP_WORK
select MICROCODE_BLOB_UNDISCLOSED select MICROCODE_BLOB_UNDISCLOSED
select PLATFORM_USES_FSP2_1 select PLATFORM_USES_FSP2_1
select FSP_PEIM_TO_PEIM_INTERFACE select FSP_USES_MP_SERVICES_PPI
select REG_SCRIPT select REG_SCRIPT
select PMC_GLOBAL_RESET_ENABLE_LOCK select PMC_GLOBAL_RESET_ENABLE_LOCK
select PMC_LOW_POWER_MODE_PROGRAM select PMC_LOW_POWER_MODE_PROGRAM

View File

@ -32,7 +32,7 @@ config CPU_SPECIFIC_OPTIONS
select PARALLEL_MP_AP_WORK select PARALLEL_MP_AP_WORK
select MICROCODE_BLOB_UNDISCLOSED select MICROCODE_BLOB_UNDISCLOSED
select PLATFORM_USES_FSP2_2 select PLATFORM_USES_FSP2_2
select FSP_PEIM_TO_PEIM_INTERFACE select FSP_USES_MP_SERVICES_PPI
select REG_SCRIPT select REG_SCRIPT
select PMC_GLOBAL_RESET_ENABLE_LOCK select PMC_GLOBAL_RESET_ENABLE_LOCK
select PMC_LOW_POWER_MODE_PROGRAM select PMC_LOW_POWER_MODE_PROGRAM

View File

@ -35,7 +35,7 @@ config CPU_SPECIFIC_OPTIONS
select PARALLEL_MP_AP_WORK select PARALLEL_MP_AP_WORK
select MICROCODE_BLOB_UNDISCLOSED select MICROCODE_BLOB_UNDISCLOSED
select PLATFORM_USES_FSP2_2 select PLATFORM_USES_FSP2_2
select FSP_PEIM_TO_PEIM_INTERFACE select FSP_USES_MP_SERVICES_PPI
select REG_SCRIPT select REG_SCRIPT
select PMC_GLOBAL_RESET_ENABLE_LOCK select PMC_GLOBAL_RESET_ENABLE_LOCK
select PMC_LOW_POWER_MODE_PROGRAM select PMC_LOW_POWER_MODE_PROGRAM