diff options
| -rw-r--r-- | src/soc/intel/elkhartlake/acpi.c | 3 | ||||
| -rw-r--r-- | src/soc/intel/elkhartlake/fsp_params.c | 12 | ||||
| -rw-r--r-- | src/soc/intel/elkhartlake/romstage/fsp_params.c | 10 |
3 files changed, 8 insertions, 17 deletions
diff --git a/src/soc/intel/elkhartlake/acpi.c b/src/soc/intel/elkhartlake/acpi.c index a0c966e89e..ed0421fb56 100644 --- a/src/soc/intel/elkhartlake/acpi.c +++ b/src/soc/intel/elkhartlake/acpi.c @@ -177,11 +177,10 @@ uint32_t soc_read_sci_irq_select(void) static unsigned long soc_fill_dmar(unsigned long current) { - const struct device *const igfx_dev = pcidev_path_on_root(SA_DEVFN_IGD); uint64_t gfxvtbar = MCHBAR64(GFXVTBAR) & VTBAR_MASK; bool gfxvten = MCHBAR32(GFXVTBAR) & VTBAR_ENABLED; - if (is_dev_enabled(igfx_dev) && gfxvtbar && gfxvten) { + if (is_devfn_enabled(SA_DEVFN_IGD) && gfxvtbar && gfxvten) { unsigned long tmp = current; current += acpi_create_dmar_drhd(current, 0, 0, gfxvtbar); diff --git a/src/soc/intel/elkhartlake/fsp_params.c b/src/soc/intel/elkhartlake/fsp_params.c index 2a8b07e45f..f61bfa7618 100644 --- a/src/soc/intel/elkhartlake/fsp_params.c +++ b/src/soc/intel/elkhartlake/fsp_params.c @@ -138,8 +138,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) params->GraphicsConfigPtr = (uintptr_t)vbt_get(); /* Check if IGD is present and fill Graphics init param accordingly */ - dev = pcidev_path_on_root(SA_DEVFN_IGD); - params->PeiGraphicsPeimInit = CONFIG(RUN_FSP_GOP) && is_dev_enabled(dev); + params->PeiGraphicsPeimInit = CONFIG(RUN_FSP_GOP) && is_devfn_enabled(SA_DEVFN_IGD); /* Display config */ params->DdiPortAHpd = config->DdiPortAHpd; @@ -240,8 +239,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) } /* SATA config */ - dev = pcidev_path_on_root(PCH_DEVFN_SATA); - params->SataEnable = is_dev_enabled(dev); + params->SataEnable = is_devfn_enabled(PCH_DEVFN_SATA); if (params->SataEnable) { params->SataMode = config->SataMode; params->SataSalpSupport = config->SataSalpSupport; @@ -260,8 +258,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) } /* SDCard config */ - dev = pcidev_path_on_root(PCH_DEVFN_SDCARD); - params->ScsSdCardEnabled = is_dev_enabled(dev); + params->ScsSdCardEnabled = is_devfn_enabled(PCH_DEVFN_SDCARD); if (params->ScsSdCardEnabled) { params->SdCardPowerEnableActiveHigh = config->SdCardPowerEnableActiveHigh; params->SdCardGpioCmdPadTermination = GPIO_TERM_NATIVE; @@ -272,8 +269,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) } /* eMMC config */ - dev = pcidev_path_on_root(PCH_DEVFN_EMMC); - params->ScsEmmcEnabled = is_dev_enabled(dev); + params->ScsEmmcEnabled = is_devfn_enabled(PCH_DEVFN_EMMC); if (params->ScsEmmcEnabled) { params->ScsEmmcHs400Enabled = config->ScsEmmcHs400Enabled; params->ScsEmmcDdr50Enabled = config->ScsEmmcDdr50Enabled; diff --git a/src/soc/intel/elkhartlake/romstage/fsp_params.c b/src/soc/intel/elkhartlake/romstage/fsp_params.c index 5264a74882..a0bb9344e1 100644 --- a/src/soc/intel/elkhartlake/romstage/fsp_params.c +++ b/src/soc/intel/elkhartlake/romstage/fsp_params.c @@ -14,15 +14,13 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg, const struct soc_intel_elkhartlake_config *config) { unsigned int i; - const struct device *dev; uint32_t mask = 0; /* * If IGD is enabled, set IGD stolen size to 60MB. * Otherwise, skip IGD init in FSP. */ - dev = pcidev_path_on_root(SA_DEVFN_IGD); - m_cfg->InternalGfx = !CONFIG(SOC_INTEL_DISABLE_IGD) && is_dev_enabled(dev); + m_cfg->InternalGfx = !CONFIG(SOC_INTEL_DISABLE_IGD) && is_devfn_enabled(SA_DEVFN_IGD); m_cfg->IgdDvmt50PreAlloc = m_cfg->InternalGfx ? 0xFE : 0; m_cfg->TsegSize = CONFIG_SMM_TSEG_SIZE; @@ -60,8 +58,7 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg, DEBUG_INTERFACE_UART_8250IO : DEBUG_INTERFACE_LPSS_SERIAL_IO; /* TraceHub configuration */ - dev = pcidev_path_on_root(PCH_DEVFN_TRACEHUB); - if (is_dev_enabled(dev) && config->TraceHubMode) { + if (is_devfn_enabled(PCH_DEVFN_TRACEHUB) && config->TraceHubMode) { m_cfg->PcdDebugInterfaceFlags |= DEBUG_INTERFACE_TRACEHUB; m_cfg->PchTraceHubMode = config->TraceHubMode; m_cfg->CpuTraceHubMode = config->TraceHubMode; @@ -103,8 +100,7 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg, m_cfg->SerialIoUartDebugControllerNumber = CONFIG_UART_FOR_CONSOLE; /* Audio */ - dev = pcidev_path_on_root(PCH_DEVFN_HDA); - m_cfg->PchHdaEnable = is_dev_enabled(dev); + m_cfg->PchHdaEnable = is_devfn_enabled(PCH_DEVFN_HDA); m_cfg->PchHdaDspEnable = config->PchHdaDspEnable; m_cfg->PchHdaAudioLinkHdaEnable = config->PchHdaAudioLinkHdaEnable; |