From 0277c75bddfa8cd6b26eb23422fd349fba6c09e5 Mon Sep 17 00:00:00 2001 From: Jeremy Compostella Date: Sat, 14 Feb 2026 00:00:08 -0800 Subject: [PATCH] soc/intel/cannonlake: 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/cannonlake/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: If5a70a0e05c50ab893ba8861e200b078982dfad9 Signed-off-by: Jeremy Compostella Reviewed-on: https://review.coreboot.org/c/coreboot/+/91213 Reviewed-by: Guvendik, Bora Tested-by: build bot (Jenkins) --- src/soc/intel/cannonlake/Kconfig | 1 + src/soc/intel/cannonlake/Makefile.mk | 2 -- src/soc/intel/cannonlake/reset.c | 17 ----------------- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 src/soc/intel/cannonlake/reset.c diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index 0389d58f9c..cd1eb24760 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -60,6 +60,7 @@ config SOC_INTEL_CANNONLAKE_BASE select SOC_INTEL_COMMON_BLOCK_XHCI select SOC_INTEL_COMMON_BLOCK_XHCI_ELOG select SOC_INTEL_COMMON_FEATURE + 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/cannonlake/Makefile.mk b/src/soc/intel/cannonlake/Makefile.mk index a281068425..f869176ca7 100644 --- a/src/soc/intel/cannonlake/Makefile.mk +++ b/src/soc/intel/cannonlake/Makefile.mk @@ -18,7 +18,6 @@ romstage-y += cnl_memcfg_init.c romstage-y += lpc.c romstage-y += pcie_rp.c romstage-y += pmutil.c -romstage-y += reset.c romstage-y += spi.c ramstage-y += acpi.c @@ -35,7 +34,6 @@ ramstage-y += p2sb.c ramstage-y += pcie_rp.c ramstage-y += pmc.c ramstage-y += pmutil.c -ramstage-y += reset.c ramstage-y += spi.c ramstage-y += systemagent.c ramstage-y += vr_config.c diff --git a/src/soc/intel/cannonlake/reset.c b/src/soc/intel/cannonlake/reset.c deleted file mode 100644 index 3c13f6dfe5..0000000000 --- a/src/soc/intel/cannonlake/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(); -}