From 61c69ebfa899867a7d0e19b422b53d0a7b75d8e9 Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Thu, 29 Jan 2026 12:09:35 +0000 Subject: [PATCH] mb/starlabs: Drop PCIe detect-timeout/hotplug workarounds With proper staged M.2 slot power sequencing in place, remove the root-port detect-timeout overrides and the StarBook ADL PCI hot-plug CFR option. Signed-off-by: Sean Rhodes Change-Id: I50820c776011508f4d6bfa7053e827d7c53700b6 Reviewed-on: https://review.coreboot.org/c/coreboot/+/90994 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) --- src/mainboard/starlabs/adl/variants/i5/devicetree.cb | 1 - src/mainboard/starlabs/adl/variants/y2/devicetree.cb | 1 - src/mainboard/starlabs/common/include/common/cfr.h | 8 -------- src/mainboard/starlabs/starbook/cfr.c | 3 --- .../starlabs/starbook/variants/adl/devicetree.cb | 1 - src/mainboard/starlabs/starbook/variants/adl/ramstage.c | 8 -------- .../starlabs/starbook/variants/adl_n/devicetree.cb | 1 - .../starlabs/starfighter/variants/mtl/devicetree.cb | 1 - .../starlabs/starfighter/variants/rpl/devicetree.cb | 1 - 9 files changed, 25 deletions(-) diff --git a/src/mainboard/starlabs/adl/variants/i5/devicetree.cb b/src/mainboard/starlabs/adl/variants/i5/devicetree.cb index b0080bd292..155ed5c08e 100644 --- a/src/mainboard/starlabs/adl/variants/i5/devicetree.cb +++ b/src/mainboard/starlabs/adl/variants/i5/devicetree.cb @@ -199,7 +199,6 @@ chip soc/intel/alderlake .flags = PCIE_RP_LTR | PCIE_RP_AER, .pcie_rp_aspm = ASPM_L0S_L1, .PcieRpL1Substates = L1_SS_L1_2, - .pcie_rp_detect_timeout_ms = 50, }" smbios_slot_desc "SlotTypeM2Socket3" diff --git a/src/mainboard/starlabs/adl/variants/y2/devicetree.cb b/src/mainboard/starlabs/adl/variants/y2/devicetree.cb index 0ea50a4f36..c8d856cc03 100644 --- a/src/mainboard/starlabs/adl/variants/y2/devicetree.cb +++ b/src/mainboard/starlabs/adl/variants/y2/devicetree.cb @@ -189,7 +189,6 @@ chip soc/intel/alderlake .flags = PCIE_RP_LTR | PCIE_RP_AER, .pcie_rp_aspm = ASPM_L0S_L1, .PcieRpL1Substates = L1_SS_L1_2, - .pcie_rp_detect_timeout_ms = 50, }" smbios_slot_desc "SlotTypePciExpressGen3X4" "SlotLengthLong" diff --git a/src/mainboard/starlabs/common/include/common/cfr.h b/src/mainboard/starlabs/common/include/common/cfr.h index 89405fd2b7..de4f108404 100644 --- a/src/mainboard/starlabs/common/include/common/cfr.h +++ b/src/mainboard/starlabs/common/include/common/cfr.h @@ -91,14 +91,6 @@ static const struct sm_object microphone = SM_DECLARE_BOOL({ .default_value = true, }); -static const struct sm_object pci_hot_plug = SM_DECLARE_BOOL({ - .opt_name = "pci_hot_plug", - .ui_name = "Third-Party SSD Support", - .ui_helptext = "Enables PCI Hot Plug, which slows down the SSD initialization. It" - " is required for certain third-party SSDs to be detected.", - .default_value = false, -}); - static const struct sm_object power_profile = SM_DECLARE_ENUM({ .opt_name = "power_profile", .ui_name = "Power Profile", diff --git a/src/mainboard/starlabs/starbook/cfr.c b/src/mainboard/starlabs/starbook/cfr.c index 10263c45fa..d2e8b7c9ae 100644 --- a/src/mainboard/starlabs/starbook/cfr.c +++ b/src/mainboard/starlabs/starbook/cfr.c @@ -50,9 +50,6 @@ static struct sm_obj_form io_expansion_group = { .ui_name = "I/O / Expansion", .obj_list = (const struct sm_object *[]) { &card_reader, - #if CONFIG(BOARD_STARLABS_STARBOOK_ADL) - &pci_hot_plug, - #endif #if CONFIG(DRIVERS_INTEL_USB4_RETIMER) &thunderbolt, #endif diff --git a/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb index 675cc27d3b..55cc2d5cb5 100644 --- a/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb @@ -199,7 +199,6 @@ chip soc/intel/alderlake .flags = PCIE_RP_LTR | PCIE_RP_AER, .pcie_rp_aspm = ASPM_L0S_L1, .PcieRpL1Substates = L1_SS_L1_2, - .pcie_rp_detect_timeout_ms = 50, }" smbios_slot_desc "SlotTypeM2Socket3" diff --git a/src/mainboard/starlabs/starbook/variants/adl/ramstage.c b/src/mainboard/starlabs/starbook/variants/adl/ramstage.c index 1dbad4fc98..3e9cfb13c4 100644 --- a/src/mainboard/starlabs/starbook/variants/adl/ramstage.c +++ b/src/mainboard/starlabs/starbook/variants/adl/ramstage.c @@ -1,17 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include #include #include void mainboard_silicon_init_params(FSP_S_CONFIG *supd) { configure_pin_mux(supd); - - /* - * Enable Hot Plug on RP5 to slow down coreboot so that - * third-party drives are detected. - */ - if (get_uint_option("pci_hot_plug", 0) == 1) - supd->PcieRpHotPlug[8] = 1; } diff --git a/src/mainboard/starlabs/starbook/variants/adl_n/devicetree.cb b/src/mainboard/starlabs/starbook/variants/adl_n/devicetree.cb index f0f16c4337..ca436a0d40 100644 --- a/src/mainboard/starlabs/starbook/variants/adl_n/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/adl_n/devicetree.cb @@ -184,7 +184,6 @@ chip soc/intel/alderlake .flags = PCIE_RP_LTR | PCIE_RP_AER, .pcie_rp_aspm = ASPM_L0S_L1, .PcieRpL1Substates = L1_SS_L1_2, - .pcie_rp_detect_timeout_ms = 50, }" smbios_slot_desc "SlotTypeM2Socket3" diff --git a/src/mainboard/starlabs/starfighter/variants/mtl/devicetree.cb b/src/mainboard/starlabs/starfighter/variants/mtl/devicetree.cb index b7b8cedf85..11384b8f13 100644 --- a/src/mainboard/starlabs/starfighter/variants/mtl/devicetree.cb +++ b/src/mainboard/starlabs/starfighter/variants/mtl/devicetree.cb @@ -250,7 +250,6 @@ chip soc/intel/meteorlake .flags = PCIE_RP_LTR | PCIE_RP_AER, .pcie_rp_aspm = ASPM_L0S_L1, .PcieRpL1Substates = L1_SS_L1_2, - .pcie_rp_detect_timeout_ms = 15, }" smbios_slot_desc "SlotTypeM2Socket3" diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb b/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb index 080bde0a19..20d2e3ba67 100644 --- a/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb +++ b/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb @@ -253,7 +253,6 @@ chip soc/intel/alderlake .flags = PCIE_RP_LTR | PCIE_RP_AER, .pcie_rp_aspm = ASPM_L0S_L1, .PcieRpL1Substates = L1_SS_L1_2, - .pcie_rp_detect_timeout_ms = 50, }" smbios_slot_desc "SlotTypeM2Socket3"