From c9ba628d512e1cb8693e1fc7b2b2b1e661d7a309 Mon Sep 17 00:00:00 2001 From: Jeremy Compostella Date: Sat, 14 Feb 2026 00:00:09 -0800 Subject: [PATCH] soc/intel/elkhartlake: Switch to common global reset implementation Replace platform-specific reset.c with the common global reset implementation using CSE with PMC fallback. Changes: - Remove src/soc/intel/elkhartlake/reset.c - Enable SOC_INTEL_COMMON_FEATURE_GLOBAL_RESET_CSE_PMC in Kconfig - Update Makefile.mk to remove reset.c from build The global reset implementation was identical to 6 other platforms, making it an ideal candidate for consolidation. Change-Id: I635347f15e35ec8e69c24edcec8c45c55a496ffd Signed-off-by: Jeremy Compostella Reviewed-on: https://review.coreboot.org/c/coreboot/+/91215 Tested-by: build bot (Jenkins) Reviewed-by: Guvendik, Bora --- src/soc/intel/elkhartlake/Kconfig | 1 + src/soc/intel/elkhartlake/Makefile.mk | 2 -- src/soc/intel/elkhartlake/reset.c | 17 ----------------- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 src/soc/intel/elkhartlake/reset.c diff --git a/src/soc/intel/elkhartlake/Kconfig b/src/soc/intel/elkhartlake/Kconfig index e8629039a2..a3abfe650d 100644 --- a/src/soc/intel/elkhartlake/Kconfig +++ b/src/soc/intel/elkhartlake/Kconfig @@ -57,6 +57,7 @@ config SOC_INTEL_ELKHARTLAKE select SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP select SOC_INTEL_COMMON_FEATURE select SOC_INTEL_COMMON_FEATURE_ESPI + select SOC_INTEL_COMMON_FEATURE_GLOBAL_RESET_CSE_PMC select SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN select SOC_INTEL_COMMON_FEATURE_I2C_DEVFN select SOC_INTEL_COMMON_FEATURE_UART_DEVICES diff --git a/src/soc/intel/elkhartlake/Makefile.mk b/src/soc/intel/elkhartlake/Makefile.mk index e46946f0bb..5fc5336723 100644 --- a/src/soc/intel/elkhartlake/Makefile.mk +++ b/src/soc/intel/elkhartlake/Makefile.mk @@ -18,7 +18,6 @@ bootblock-y += p2sb.c romstage-y += gpio.c romstage-y += meminit.c romstage-y += pcie_rp.c -romstage-y += reset.c ramstage-y += acpi.c ramstage-y += chip.c @@ -30,7 +29,6 @@ ramstage-y += lockdown.c ramstage-y += p2sb.c ramstage-y += pcie_rp.c ramstage-y += pmc.c -ramstage-y += reset.c ramstage-y += systemagent.c ramstage-y += sd.c ramstage-$(CONFIG_EHL_TSN_DRIVER) += tsn_gbe.c diff --git a/src/soc/intel/elkhartlake/reset.c b/src/soc/intel/elkhartlake/reset.c deleted file mode 100644 index 3c13f6dfe5..0000000000 --- a/src/soc/intel/elkhartlake/reset.c +++ /dev/null @@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include -#include - -void do_global_reset(void) -{ - /* Ask CSE to do the global reset */ - if (cse_request_global_reset() == CSE_TX_RX_SUCCESS) - return; - - /* global reset if CSE fail to reset */ - pmc_global_reset_enable(1); - do_full_reset(); -}