[coreboot-gerrit] Change in coreboot[master]: soc/intel/skylake: Use `devfn_disable()` to handle XDCI

[Werner Zeh (Code Review)]

Werner Zeh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/55787 )

Change subject: soc/intel/skylake: Use `devfn_disable()` to handle XDCI
......................................................................

soc/intel/skylake: Use `devfn_disable()` to handle XDCI

Done for consistency with other Intel SoCs. This allows moving the
pattern inside a helper function.

Change-Id: If95c4b6c1602e56436150a931210692f14630694
Signed-off-by: Angel Pons 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55787
Reviewed-by: Subrata Banik 
Tested-by: build bot (Jenkins) 
---
M src/soc/intel/skylake/chip.c
1 file changed, 3 insertions(+), 9 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Subrata Banik: Looks good to me, approved

diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c
index f0ed699..865fdf0 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -226,7 +226,6 @@
    FSP_S_CONFIG *params = &supd->FspsConfig;
    FSP_S_TEST_CONFIG *tconfig = &supd->FspsTestConfig;
    struct soc_intel_skylake_config *config;
-	struct device *dev;
    uintptr_t vbt_data = (uintptr_t)vbt_get();
    int i;

@@ -458,14 +457,9 @@
    params->ShowSpiController = is_devfn_enabled(PCH_DEVFN_SPI);

/* Enable xDCI controller if enabled in devicetree and allowed */
-	dev = pcidev_path_on_root(PCH_DEVFN_USBOTG);
-	if (dev) {
-		if (!xdci_can_enable())
-			dev->enabled = 0;
-		params->XdciEnable = dev->enabled;
-	} else {
-		params->XdciEnable = 0;
-	}
+	if (!xdci_can_enable())
+		devfn_disable(pci_root_bus(), PCH_DEVFN_USBOTG);
+	params->XdciEnable = is_devfn_enabled(PCH_DEVFN_USBOTG);

/* Enable or disable Gaussian Mixture Model in devicetree */
    params->GmmEnable = is_devfn_enabled(SA_DEVFN_GMM);