From 8d4a8c50452fbb2e4402464ef9f2cce0af26f6d3 Mon Sep 17 00:00:00 2001 From: Mario Scheithauer Date: Wed, 8 Jan 2025 08:33:32 +0100 Subject: [PATCH] mb/siemens/mc_ehl{2...5}: Fix return in variant_mainboard_final() If no resource is found for a device, do not return directly, otherwise the following code will no longer be executed. Change-Id: Ida8019c383df4be2d37a1532a1759086e86124e6 Signed-off-by: Mario Scheithauer Reviewed-on: https://review.coreboot.org/c/coreboot/+/85891 Reviewed-by: Uwe Poeche Tested-by: build bot (Jenkins) Reviewed-by: Werner Zeh --- .../mc_ehl/variants/mc_ehl2/mainboard.c | 19 +++++++++---------- .../mc_ehl/variants/mc_ehl3/mainboard.c | 13 +++++++------ .../mc_ehl/variants/mc_ehl4/mainboard.c | 13 +++++++------ .../mc_ehl/variants/mc_ehl5/mainboard.c | 19 +++++++++---------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/mainboard.c b/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/mainboard.c index ac3ab14eef..b3846196fc 100644 --- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/mainboard.c +++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/mainboard.c @@ -42,22 +42,21 @@ void variant_mainboard_final(void) dev = pcidev_path_on_root(PCH_DEVFN_SDCARD); if (dev) { struct resource *res = probe_resource(dev, PCI_BASE_ADDRESS_0); - if (!res) - return; + if (res) { + disable_sdr_modes(res); - disable_sdr_modes(res); - - /* Use preset driver strength from preset value registers. */ - clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0, HOSTCTRL2_PRESET); + /* Use preset driver strength from preset value + registers. */ + clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0, + HOSTCTRL2_PRESET); + } } dev = pcidev_path_on_root(PCH_DEVFN_EMMC); if (dev) { struct resource *res = probe_resource(dev, PCI_BASE_ADDRESS_0); - if (!res) - return; - - disable_sdr_modes(res); + if (res) + disable_sdr_modes(res); } } diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/mainboard.c b/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/mainboard.c index d76ac036fb..c68ecdae0d 100644 --- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/mainboard.c +++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/mainboard.c @@ -33,13 +33,14 @@ void variant_mainboard_final(void) dev = pcidev_path_on_root(PCH_DEVFN_SDCARD); if (dev) { struct resource *res = probe_resource(dev, PCI_BASE_ADDRESS_0); - if (!res) - return; + if (res) { + disable_sdr_modes(res); - disable_sdr_modes(res); - - /* Use preset driver strength from preset value registers. */ - clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0, HOSTCTRL2_PRESET); + /* Use preset driver strength from preset value + registers. */ + clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0, + HOSTCTRL2_PRESET); + } } } diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl4/mainboard.c b/src/mainboard/siemens/mc_ehl/variants/mc_ehl4/mainboard.c index 3ef72fda0c..64cb3f318c 100644 --- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl4/mainboard.c +++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl4/mainboard.c @@ -32,12 +32,13 @@ void variant_mainboard_final(void) dev = pcidev_path_on_root(PCH_DEVFN_SDCARD); if (dev) { struct resource *res = probe_resource(dev, PCI_BASE_ADDRESS_0); - if (!res) - return; + if (res) { + disable_sdr_modes(res); - disable_sdr_modes(res); - - /* Use preset driver strength from preset value registers. */ - clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0, HOSTCTRL2_PRESET); + /* Use preset driver strength from preset value + registers. */ + clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0, + HOSTCTRL2_PRESET); + } } } diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl5/mainboard.c b/src/mainboard/siemens/mc_ehl/variants/mc_ehl5/mainboard.c index ac3ab14eef..b3846196fc 100644 --- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl5/mainboard.c +++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl5/mainboard.c @@ -42,22 +42,21 @@ void variant_mainboard_final(void) dev = pcidev_path_on_root(PCH_DEVFN_SDCARD); if (dev) { struct resource *res = probe_resource(dev, PCI_BASE_ADDRESS_0); - if (!res) - return; + if (res) { + disable_sdr_modes(res); - disable_sdr_modes(res); - - /* Use preset driver strength from preset value registers. */ - clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0, HOSTCTRL2_PRESET); + /* Use preset driver strength from preset value + registers. */ + clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0, + HOSTCTRL2_PRESET); + } } dev = pcidev_path_on_root(PCH_DEVFN_EMMC); if (dev) { struct resource *res = probe_resource(dev, PCI_BASE_ADDRESS_0); - if (!res) - return; - - disable_sdr_modes(res); + if (res) + disable_sdr_modes(res); } }