10 files changed, 25 insertions, 48 deletions

diff --git a/src/drivers/intel/fsp2_0/Kconfig b/src/drivers/intel/fsp2_0/Kconfig
index 8e9dcdc4dc..c5c485bad2 100644
--- a/src/drivers/intel/fsp2_0/Kconfig
+++ b/src/drivers/intel/fsp2_0/Kconfig
@@ -341,50 +341,32 @@ config FSP_M_ADDR
 	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
+	range 0x4000000000000003 0x4000000000000008 if !PLATFORM_USES_FSP2_X86_32
+	range 0x40000003 0x40000008
+	default 0x4000000000000003 if !PLATFORM_USES_FSP2_X86_32
+	default 0x40000003
 	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.
+	  reset type.
+
+	  This option specifies the global reset status code used by the
+	  platform, as defined in the FSP specification.
+
+	  The FSP specification allows for a range of values to indicate a
+	  global reset request, typically between
+	  FSP_STATUS_GLOBAL_RESET_REQUIRED_3 and
+	  FSP_STATUS_GLOBAL_RESET_REQUIRED_8.
+
+	  This option defaults to the most commonly used global reset
+	  status code in FSP implementations:
+	  - 0x40000003 for 32-bit FSP interfaces
+	  - 0x4000000000000003 for 64-bit FSP interfaces
+
+	  If your FSP implementation uses a different global reset status
+	  code, override this default value accordingly.
 
 config SOC_INTEL_COMMON_FSP_RESET
 	bool
diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig
index ec6123db48..3afd9931fc 100644
--- a/src/soc/intel/alderlake/Kconfig
+++ b/src/soc/intel/alderlake/Kconfig
@@ -18,7 +18,6 @@ config SOC_INTEL_ALDERLAKE
 	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 61aaa44a7e..55f59b3bed 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -21,7 +21,6 @@ config SOC_INTEL_APOLLOLAKE
 	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
@@ -102,6 +101,10 @@ config SOC_INTEL_GEMINILAKE
 
 if SOC_INTEL_APOLLOLAKE
 
+config FSP_STATUS_GLOBAL_RESET
+	hex
+	default 0x40000005
+
 config USE_LEGACY_8254_TIMER
 	default y
 
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index d012dadbe2..59b09a5d33 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -15,7 +15,6 @@ config SOC_INTEL_CANNONLAKE_BASE
 	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 815a7a1137..ff3c82f6ff 100644
--- a/src/soc/intel/elkhartlake/Kconfig
+++ b/src/soc/intel/elkhartlake/Kconfig
@@ -13,7 +13,6 @@ config SOC_INTEL_ELKHARTLAKE
 	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 1502c7509c..3fd6826e12 100644
--- a/src/soc/intel/jasperlake/Kconfig
+++ b/src/soc/intel/jasperlake/Kconfig
@@ -14,7 +14,6 @@ config SOC_INTEL_JASPERLAKE
 	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/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig
index 955b8bf629..b6252c5a93 100644
--- a/src/soc/intel/meteorlake/Kconfig
+++ b/src/soc/intel/meteorlake/Kconfig
@@ -19,7 +19,6 @@ config SOC_INTEL_METEORLAKE
 	select FSP_COMPRESS_FSP_S_LZ4
 	select FAST_SPI_SUPPORTS_EXT_BIOS_WINDOW
 	select FSP_M_XIP
-	select FSP_STATUS_GLOBAL_RESET_REQUIRED_3
 	select FSP_UGOP_EARLY_SIGN_OF_LIFE if !SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON
 	select FSP_USES_CB_DEBUG_EVENT_HANDLER
 	select FSPS_HAS_ARCH_UPD
diff --git a/src/soc/intel/pantherlake/Kconfig b/src/soc/intel/pantherlake/Kconfig
index 94104cca55..8cb0aa8f1b 100644
--- a/src/soc/intel/pantherlake/Kconfig
+++ b/src/soc/intel/pantherlake/Kconfig
@@ -17,7 +17,6 @@ config SOC_INTEL_PANTHERLAKE_BASE
 	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 3ec84abcc4..22017c848b 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -13,7 +13,6 @@ config SOC_INTEL_COMMON_SKYLAKE_BASE
 	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 77e53ad937..1b04fbc0c8 100644
--- a/src/soc/intel/tigerlake/Kconfig
+++ b/src/soc/intel/tigerlake/Kconfig
@@ -17,7 +17,6 @@ config SOC_INTEL_TIGERLAKE
 	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