Attention is currently required from: Andrey Petrov, Dinesh Gehlot, Jayvik Desai, Kapil Porwal, Lean Sheng Tan, Nick Vaccaro, Pranava Y N, Rishika Raj, Ronak Kanabar, Sean Rhodes, Werner Zeh.
Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/84540?usp=email )
Change subject: soc/intel: Deprecate `FSP_STATUS_GLOBAL_RESET` configs ......................................................................
soc/intel: Deprecate `FSP_STATUS_GLOBAL_RESET` configs
This patch drops SoC-specific FSP_STATUS_GLOBAL_RESET and FSP_STATUS_GLOBAL_RESET_REQUIRED_X Kconfigs. Global reset requests from FSP are now handled generically.
Previously, Coreboot's FSP reset handling was tied to 32-bit interfaces and relied on platform-specific Kconfigs to define reset status codes. This was incompatible with newer 64-bit platforms using FSP 2.4, which use different reset status codes.
This change introduces a generic mechanism to detect and handle global reset requests based on the reset GUID. This eliminates the need for SoC-specific configurations and ensures compatibility across different FSP versions and platforms.
BUG=b:347669091 TEST=Verified global reset functionality on both 32-bit (google/rex0) and 64-bit (google/rex64) platforms.
Change-Id: Ica2faea5ff0dae50fa130cd891f06e5d94aed186 Signed-off-by: Subrata Banik subratabanik@google.com --- M src/drivers/intel/fsp2_0/Kconfig M src/soc/intel/alderlake/Kconfig M src/soc/intel/apollolake/Kconfig M src/soc/intel/cannonlake/Kconfig M src/soc/intel/elkhartlake/Kconfig M src/soc/intel/jasperlake/Kconfig M src/soc/intel/pantherlake/Kconfig M src/soc/intel/skylake/Kconfig M src/soc/intel/tigerlake/Kconfig 9 files changed, 0 insertions(+), 53 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/84540/1
diff --git a/src/drivers/intel/fsp2_0/Kconfig b/src/drivers/intel/fsp2_0/Kconfig index 8e9dcdc..7850bdb 100644 --- a/src/drivers/intel/fsp2_0/Kconfig +++ b/src/drivers/intel/fsp2_0/Kconfig @@ -341,51 +341,6 @@ help The address FSP-M will be relocated to during build time
-config FSP_STATUS_GLOBAL_RESET_REQUIRED_3 - bool - help - FSP Reset Status code used for global reset as per FSP EAS v2.0 section 11.2.2 - -config FSP_STATUS_GLOBAL_RESET_REQUIRED_4 - bool - help - FSP Reset Status code used for global reset as per FSP EAS v2.0 section 11.2.2 - -config FSP_STATUS_GLOBAL_RESET_REQUIRED_5 - bool - help - FSP Reset Status code used for global reset as per FSP EAS v2.0 section 11.2.2 - -config FSP_STATUS_GLOBAL_RESET_REQUIRED_6 - bool - help - FSP Reset Status code used for global reset as per FSP EAS v2.0 section 11.2.2 - -config FSP_STATUS_GLOBAL_RESET_REQUIRED_7 - bool - help - FSP Reset Status code used for global reset as per FSP EAS v2.0 section 11.2.2 - -config FSP_STATUS_GLOBAL_RESET_REQUIRED_8 - bool - help - FSP Reset Status code used for global reset as per FSP EAS v2.0 section 11.2.2 - -config FSP_STATUS_GLOBAL_RESET - hex - depends on SOC_INTEL_COMMON_FSP_RESET - default 0x40000003 if FSP_STATUS_GLOBAL_RESET_REQUIRED_3 - default 0x40000004 if FSP_STATUS_GLOBAL_RESET_REQUIRED_4 - default 0x40000005 if FSP_STATUS_GLOBAL_RESET_REQUIRED_5 - default 0x40000006 if FSP_STATUS_GLOBAL_RESET_REQUIRED_6 - default 0x40000007 if FSP_STATUS_GLOBAL_RESET_REQUIRED_7 - default 0x40000008 if FSP_STATUS_GLOBAL_RESET_REQUIRED_8 - default 0xffffffff - help - If global reset is supported by SoC then select the correct status value for global - reset type from SoC Kconfig based on available Kconfig options - FSP_STATUS_GLOBAL_RESET_REQUIRED_X. Default is unsupported. - config SOC_INTEL_COMMON_FSP_RESET bool help diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig index ec6123d..3afd993 100644 --- a/src/soc/intel/alderlake/Kconfig +++ b/src/soc/intel/alderlake/Kconfig @@ -18,7 +18,6 @@ select FAST_SPI_SUPPORTS_EXT_BIOS_WINDOW select FSP_M_XIP select FSP_MULTIPHASE_SI_INIT_RETURN_BROKEN - select FSP_STATUS_GLOBAL_RESET_REQUIRED_3 select FSP_USES_CB_DEBUG_EVENT_HANDLER select FSPS_HAS_ARCH_UPD select GENERIC_GPIO_LIB diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index 61aaa44..97b63c4 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -21,7 +21,6 @@ select EDK2_CPU_TIMER_LIB if PAYLOAD_EDK2 select FAST_SPI_GENERATE_SSDT select FSP_PLATFORM_MEMORY_SETTINGS_VERSIONS - select FSP_STATUS_GLOBAL_RESET_REQUIRED_5 select GENERIC_GPIO_LIB select HAVE_ASAN_IN_ROMSTAGE select HAVE_CF9_RESET_PREPARE diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index d012dad..59b09a5 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -15,7 +15,6 @@ select EDK2_CPU_TIMER_LIB if PAYLOAD_EDK2 select FSP_COMPRESS_FSP_S_LZMA select FSP_M_XIP - select FSP_STATUS_GLOBAL_RESET_REQUIRED_3 select FSP_USES_CB_STACK select GENERIC_GPIO_LIB select HAVE_DPTF_EISA_HID diff --git a/src/soc/intel/elkhartlake/Kconfig b/src/soc/intel/elkhartlake/Kconfig index 815a7a1..ff3c82f 100644 --- a/src/soc/intel/elkhartlake/Kconfig +++ b/src/soc/intel/elkhartlake/Kconfig @@ -13,7 +13,6 @@ select EDK2_CPU_TIMER_LIB if PAYLOAD_EDK2 select FSP_COMPRESS_FSP_S_LZ4 select FSP_M_XIP - select FSP_STATUS_GLOBAL_RESET_REQUIRED_3 select GENERIC_GPIO_LIB select HAVE_FSP_GOP select HAVE_SMI_HANDLER diff --git a/src/soc/intel/jasperlake/Kconfig b/src/soc/intel/jasperlake/Kconfig index 1502c75..3fd6826 100644 --- a/src/soc/intel/jasperlake/Kconfig +++ b/src/soc/intel/jasperlake/Kconfig @@ -14,7 +14,6 @@ select EDK2_CPU_TIMER_LIB if PAYLOAD_EDK2 select FSP_COMPRESS_FSP_S_LZ4 select FSP_M_XIP - select FSP_STATUS_GLOBAL_RESET_REQUIRED_3 select GENERIC_GPIO_LIB select HAVE_DPTF_EISA_HID select HAVE_FSP_GOP diff --git a/src/soc/intel/pantherlake/Kconfig b/src/soc/intel/pantherlake/Kconfig index 94104cc..8cb0aa8 100644 --- a/src/soc/intel/pantherlake/Kconfig +++ b/src/soc/intel/pantherlake/Kconfig @@ -17,7 +17,6 @@ select FAST_SPI_SUPPORTS_EXT_BIOS_WINDOW select FSP_COMPRESS_FSP_S_LZ4 select FSP_M_XIP - select FSP_STATUS_GLOBAL_RESET_REQUIRED_3 select FSP_UGOP_EARLY_SIGN_OF_LIFE select FSP_USES_CB_DEBUG_EVENT_HANDLER select FSPS_HAS_ARCH_UPD diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index 3ec84ab..22017c8 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -13,7 +13,6 @@ select EDK2_CPU_TIMER_LIB if PAYLOAD_EDK2 select FSP_COMPRESS_FSP_S_LZ4 select FSP_M_XIP - select FSP_STATUS_GLOBAL_RESET_REQUIRED_3 select GENERIC_GPIO_LIB select HAVE_FSP_GOP select HAVE_FSP_LOGO_SUPPORT diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig index 77e53ad..1b04fbc 100644 --- a/src/soc/intel/tigerlake/Kconfig +++ b/src/soc/intel/tigerlake/Kconfig @@ -17,7 +17,6 @@ select FAST_SPI_SUPPORTS_EXT_BIOS_WINDOW select FSP_COMPRESS_FSP_S_LZ4 select FSP_M_XIP - select FSP_STATUS_GLOBAL_RESET_REQUIRED_3 select GENERIC_GPIO_LIB select HAVE_FSP_GOP select HAVE_HYPERTHREADING