From 7bfee2d70f45caf3fe6e769d7cd6ae6f305d9df5 Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Mon, 21 Jun 2021 19:17:00 +0530 Subject: soc/intel/jasperlake: Use devfn_disable() function for XDCI Use devfn_disable() for disabling a PCI device rather than using `dev->enabled = 0`. Also, use is_devfn_enabled() to get the device current state prior updating the FSP-S UPD for XDCI. TEST=FSP-S disabled XDCI when `xdci_can_enable` returns 0 and XDCI is disabled at PCI enumeration `PCI: 00:14.1: enabled 0`. Change-Id: I038e43deead70d598cf26f320dd9993f17591b88 Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/c/coreboot/+/55723 Reviewed-by: Karthik Ramasubramanian Reviewed-by: Angel Pons Reviewed-by: Furquan Shaikh Tested-by: build bot (Jenkins) --- src/soc/intel/jasperlake/fsp_params.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/soc/intel/jasperlake') diff --git a/src/soc/intel/jasperlake/fsp_params.c b/src/soc/intel/jasperlake/fsp_params.c index 9056943efd..0de02f28c6 100644 --- a/src/soc/intel/jasperlake/fsp_params.c +++ b/src/soc/intel/jasperlake/fsp_params.c @@ -50,7 +50,6 @@ static void parse_devicetree(FSP_S_CONFIG *params) void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) { unsigned int i; - struct device *dev; FSP_S_CONFIG *params = &supd->FspsConfig; struct soc_intel_jasperlake_config *config = config_of_soc(); @@ -159,14 +158,9 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) params->ScsEmmcHs400Enabled = config->ScsEmmcHs400Enabled; /* 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); /* Provide correct UART number for FSP debug logs */ params->SerialIoDebugUartNumber = CONFIG_UART_FOR_CONSOLE; -- cgit v1.2.3