GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/tigerlake: Simplify is-device-enabled checks 

Simplify if-statements and use is_dev_enabled() where possible.

Change-Id: I791273e5dd633cd1d6218b322106e2f62a393259
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43897
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Michael Niewöhner
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Singer 2020-07-26 09:22:42 +02:00 committed by Michael Niewöhner
parent 0f82309562
commit 5c10704f58
3 changed files with 29 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/soc/intel/tigerlake/acpi.c
View File

@ -7,6 +7,7 @@
#include <arch/smp/mpspec.h> #include <arch/smp/mpspec.h>
#include <cbmem.h> #include <cbmem.h>
#include <console/console.h> #include <console/console.h>
#include <device/device.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <ec/google/chromeec/ec.h> #include <ec/google/chromeec/ec.h>
#include <intelblocks/cpulib.h> #include <intelblocks/cpulib.h>
@ -187,7 +188,7 @@ static unsigned long soc_fill_dmar(unsigned long current)
uint64_t gfxvtbar = MCHBAR64(GFXVTBAR) & VTBAR_MASK; uint64_t gfxvtbar = MCHBAR64(GFXVTBAR) & VTBAR_MASK;
bool gfxvten = MCHBAR32(GFXVTBAR) & VTBAR_ENABLED; bool gfxvten = MCHBAR32(GFXVTBAR) & VTBAR_ENABLED;
if (igfx_dev && igfx_dev->enabled && gfxvtbar && gfxvten) { if (is_dev_enabled(igfx_dev) && gfxvtbar && gfxvten) {
unsigned long tmp = current; unsigned long tmp = current;
current += acpi_create_dmar_drhd(current, 0, 0, gfxvtbar); current += acpi_create_dmar_drhd(current, 0, 0, gfxvtbar);
@ -200,7 +201,7 @@ static unsigned long soc_fill_dmar(unsigned long current)
uint64_t ipuvtbar = MCHBAR64(IPUVTBAR) & VTBAR_MASK; uint64_t ipuvtbar = MCHBAR64(IPUVTBAR) & VTBAR_MASK;
bool ipuvten = MCHBAR32(IPUVTBAR) & VTBAR_ENABLED; bool ipuvten = MCHBAR32(IPUVTBAR) & VTBAR_ENABLED;
if (ipu_dev && ipu_dev->enabled && ipuvtbar && ipuvten) { if (is_dev_enabled(ipu_dev) && ipuvtbar && ipuvten) {
unsigned long tmp = current; unsigned long tmp = current;
current += acpi_create_dmar_drhd(current, 0, 0, ipuvtbar); current += acpi_create_dmar_drhd(current, 0, 0, ipuvtbar);

36
src/soc/intel/tigerlake/fsp_params.c
View File

@ -99,10 +99,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
/* Check if IGD is present and fill Graphics init param accordingly */ /* Check if IGD is present and fill Graphics init param accordingly */
dev = pcidev_path_on_root(SA_DEVFN_IGD); dev = pcidev_path_on_root(SA_DEVFN_IGD);
if (CONFIG(RUN_FSP_GOP) && dev && dev->enabled) params->PeiGraphicsPeimInit = CONFIG(RUN_FSP_GOP) && is_dev_enabled(dev);
params->PeiGraphicsPeimInit = 1;
else
params->PeiGraphicsPeimInit = 0;
/* Use coreboot MP PPI services if Kconfig is enabled */ /* Use coreboot MP PPI services if Kconfig is enabled */
if (CONFIG(USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI)) { if (CONFIG(USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI)) {
@ -195,10 +192,8 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
/* SATA */ /* SATA */
dev = pcidev_path_on_root(PCH_DEVFN_SATA); dev = pcidev_path_on_root(PCH_DEVFN_SATA);
if (!dev) params->SataEnable = is_dev_enabled(dev);
params->SataEnable = 0; if (params->SataEnable) {
else {
params->SataEnable = dev->enabled;
params->SataMode = config->SataMode; params->SataMode = config->SataMode;
params->SataSalpSupport = config->SataSalpSupport; params->SataSalpSupport = config->SataSalpSupport;
memcpy(params->SataPortsEnable, config->SataPortsEnable, memcpy(params->SataPortsEnable, config->SataPortsEnable,
@ -244,37 +239,22 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
/* LAN */ /* LAN */
dev = pcidev_path_on_root(PCH_DEVFN_GBE); dev = pcidev_path_on_root(PCH_DEVFN_GBE);
if (!dev) params->PchLanEnable = is_dev_enabled(dev);
params->PchLanEnable = 0;
else
params->PchLanEnable = dev->enabled;
/* CNVi */ /* CNVi */
dev = pcidev_path_on_root(PCH_DEVFN_CNVI_WIFI); dev = pcidev_path_on_root(PCH_DEVFN_CNVI_WIFI);
if (dev) params->CnviMode = is_dev_enabled(dev);
params->CnviMode = dev->enabled;
else
params->CnviMode = 0;
/* VMD */ /* VMD */
dev = pcidev_path_on_root(SA_DEVFN_VMD); dev = pcidev_path_on_root(SA_DEVFN_VMD);
if (dev) params->VmdEnable = is_dev_enabled(dev);
params->VmdEnable = dev->enabled;
else
params->VmdEnable = 0;
/* THC */ /* THC */
dev = pcidev_path_on_root(PCH_DEVFN_THC0); dev = pcidev_path_on_root(PCH_DEVFN_THC0);
if (!dev) params->ThcPort0Assignment = is_dev_enabled(dev) ? THC_0 : THC_NONE;
params->ThcPort0Assignment = 0;
else
params->ThcPort0Assignment = dev->enabled ? THC_0 : THC_NONE;
dev = pcidev_path_on_root(PCH_DEVFN_THC1); dev = pcidev_path_on_root(PCH_DEVFN_THC1);
if (!dev) params->ThcPort1Assignment = is_dev_enabled(dev) ? THC_1 : THC_NONE;
params->ThcPort1Assignment = 0;
else
params->ThcPort1Assignment = dev->enabled ? THC_1 : THC_NONE;
/* Legacy 8254 timer support */ /* Legacy 8254 timer support */
params->Enable8254ClockGating = !CONFIG(USE_LEGACY_8254_TIMER); params->Enable8254ClockGating = !CONFIG(USE_LEGACY_8254_TIMER);

60
src/soc/intel/tigerlake/romstage/fsp_params.c
View File

@ -3,6 +3,7 @@
#include <assert.h> #include <assert.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include <device/device.h>
#include <fsp/util.h> #include <fsp/util.h>
#include <intelblocks/cpulib.h> #include <intelblocks/cpulib.h>
#include <intelblocks/mp_init.h> #include <intelblocks/mp_init.h>
@ -21,16 +22,13 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg,
uint32_t cpu_id, mask = 0; uint32_t cpu_id, mask = 0;
const struct device *dev; const struct device *dev;
/*
* If IGD is enabled, set IGD stolen size to 60MB.
* Otherwise, skip IGD init in FSP.
*/
dev = pcidev_path_on_root(SA_DEVFN_IGD); dev = pcidev_path_on_root(SA_DEVFN_IGD);
if (!dev || !dev->enabled) { m_cfg->InternalGfx = is_dev_enabled(dev);
/* Skip IGD initialization in FSP if device is disabled in devicetree.cb */ m_cfg->IgdDvmt50PreAlloc = m_cfg->InternalGfx ? 0xFE : 0;
m_cfg->InternalGfx = 0;
m_cfg->IgdDvmt50PreAlloc = 0;
} else {
m_cfg->InternalGfx = 1;
/* Set IGD stolen size to 60MB. */
m_cfg->IgdDvmt50PreAlloc = 0xFE;
}
m_cfg->TsegSize = CONFIG_SMM_TSEG_SIZE; m_cfg->TsegSize = CONFIG_SMM_TSEG_SIZE;
m_cfg->IedSize = CONFIG_IED_REGION_SIZE; m_cfg->IedSize = CONFIG_IED_REGION_SIZE;
@ -76,7 +74,7 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg,
/* TraceHub configuration */ /* TraceHub configuration */
dev = pcidev_path_on_root(PCH_DEVFN_TRACEHUB); dev = pcidev_path_on_root(PCH_DEVFN_TRACEHUB);
if (dev && dev->enabled && config->TraceHubMode) { if (is_dev_enabled(dev) && config->TraceHubMode) {
m_cfg->PcdDebugInterfaceFlags |= DEBUG_INTERFACE_TRACEHUB; m_cfg->PcdDebugInterfaceFlags |= DEBUG_INTERFACE_TRACEHUB;
m_cfg->PchTraceHubMode = config->TraceHubMode; m_cfg->PchTraceHubMode = config->TraceHubMode;
m_cfg->CpuTraceHubMode = config->TraceHubMode; m_cfg->CpuTraceHubMode = config->TraceHubMode;
@ -87,10 +85,7 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg,
/* ISH */ /* ISH */
dev = pcidev_path_on_root(PCH_DEVFN_ISH); dev = pcidev_path_on_root(PCH_DEVFN_ISH);
if (!dev || !dev->enabled) m_cfg->PchIshEnable = is_dev_enabled(dev);
m_cfg->PchIshEnable = 0;
else
m_cfg->PchIshEnable = 1;
/* DP port config */ /* DP port config */
m_cfg->DdiPortAConfig = config->DdiPortAConfig; m_cfg->DdiPortAConfig = config->DdiPortAConfig;
@ -119,39 +114,23 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg,
/* TCSS DMA */ /* TCSS DMA */
dev = pcidev_path_on_root(SA_DEVFN_TCSS_DMA0); dev = pcidev_path_on_root(SA_DEVFN_TCSS_DMA0);
if (dev) m_cfg->TcssDma0En = is_dev_enabled(dev);
m_cfg->TcssDma0En = dev->enabled;
else
m_cfg->TcssDma0En = 0;
dev = pcidev_path_on_root(SA_DEVFN_TCSS_DMA1); dev = pcidev_path_on_root(SA_DEVFN_TCSS_DMA1);
if (dev) m_cfg->TcssDma1En = is_dev_enabled(dev);
m_cfg->TcssDma1En = dev->enabled;
else
m_cfg->TcssDma1En = 0;
/* USB4/TBT */ /* USB4/TBT */
dev = pcidev_path_on_root(SA_DEVFN_TBT0); dev = pcidev_path_on_root(SA_DEVFN_TBT0);
if (dev) m_cfg->TcssItbtPcie0En = is_dev_enabled(dev);
m_cfg->TcssItbtPcie0En = dev->enabled;
else
m_cfg->TcssItbtPcie0En = 0;
dev = pcidev_path_on_root(SA_DEVFN_TBT1); dev = pcidev_path_on_root(SA_DEVFN_TBT1);
if (dev) m_cfg->TcssItbtPcie1En = is_dev_enabled(dev);
m_cfg->TcssItbtPcie1En = dev->enabled;
else
m_cfg->TcssItbtPcie1En = 0;
dev = pcidev_path_on_root(SA_DEVFN_TBT2); dev = pcidev_path_on_root(SA_DEVFN_TBT2);
if (dev) m_cfg->TcssItbtPcie2En = is_dev_enabled(dev);
m_cfg->TcssItbtPcie2En = dev->enabled;
else
m_cfg->TcssItbtPcie2En = 0;
dev = pcidev_path_on_root(SA_DEVFN_TBT3); dev = pcidev_path_on_root(SA_DEVFN_TBT3);
if (dev) m_cfg->TcssItbtPcie3En = is_dev_enabled(dev);
m_cfg->TcssItbtPcie3En = dev->enabled;
else
m_cfg->TcssItbtPcie3En = 0;
/* Hyper Threading */ /* Hyper Threading */
m_cfg->HyperThreading = !config->HyperThreadingDisable; m_cfg->HyperThreading = !config->HyperThreadingDisable;
@ -167,10 +146,7 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg,
/* Audio: HDAUDIO_LINK_MODE I2S/SNDW */ /* Audio: HDAUDIO_LINK_MODE I2S/SNDW */
dev = pcidev_path_on_root(PCH_DEVFN_HDA); dev = pcidev_path_on_root(PCH_DEVFN_HDA);
if (!dev) m_cfg->PchHdaEnable = is_dev_enabled(dev);
m_cfg->PchHdaEnable = 0;
else
m_cfg->PchHdaEnable = dev->enabled;
m_cfg->PchHdaDspEnable = config->PchHdaDspEnable; m_cfg->PchHdaDspEnable = config->PchHdaDspEnable;
m_cfg->PchHdaAudioLinkHdaEnable = config->PchHdaAudioLinkHdaEnable; m_cfg->PchHdaAudioLinkHdaEnable = config->PchHdaAudioLinkHdaEnable;