commit 6c3a89c431e938c276e5ed01e21b60cf04b44504
author Felix Singer <felixsinger@posteo.net> Sun Jul 26 09:26:52 2020 +0200
committer Michael Niewöhner <c0d3z3r0@review.coreboot.org> Tue Jul 28 08:38:06 2020 +0000
tree f40ffa39cf494b54138478728f39350a958ae487
parent ca4164e629a8162dc6b297c13a725a9f2b3ee4eb

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

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

Change-Id: Ieeec987dc2bfe5bdef31882edbbb36e52f63b0e6
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43899
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Michael Niewöhner
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/soc/intel/apollolake/acpi.c

diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c
index 16f6090..96a142a 100644
--- a/src/soc/intel/apollolake/acpi.c
+++ b/src/soc/intel/apollolake/acpi.c
@@ -4,6 +4,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <acpi/acpigen.h>
 #include <console/console.h>
+#include <device/device.h>
 #include <device/mmio.h>
 #include <arch/smp/mpspec.h>
 #include <assert.h>
@@ -170,7 +171,7 @@
 	unsigned long tmp;
 
 	/* IGD has to be enabled, GFXVTBAR set and enabled. */
-	if (igfx_dev && igfx_dev->enabled && gfxvtbar && gfxvten) {
+	if (is_dev_enabled(igfx_dev) && gfxvtbar && gfxvten) {
 		tmp = current;
 
 		current += acpi_create_dmar_drhd(current, 0, 0, gfxvtbar);

src/soc/intel/apollolake/chip.c

diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index b1b3ee8..d6e6187 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -554,7 +554,7 @@
 	}
 
 	dev = pcidev_path_on_root(SA_GLK_DEVFN_GMM);
-	silconfig->Gmm = dev ? dev->enabled : 0;
+	silconfig->Gmm = is_dev_enabled(dev);
 
 	/* On Geminilake, we need to override the default FSP PCIe de-emphasis
 	 * settings using the device tree settings. This is because PCIe
@@ -696,10 +696,7 @@
 	silconfig->VtdEnable = cfg->enable_vtd;
 
 	dev = pcidev_path_on_root(SA_DEVFN_IGD);
-	if (CONFIG(RUN_FSP_GOP) && dev && dev->enabled)
-		silconfig->PeiGraphicsPeimInit = 1;
-	else
-		silconfig->PeiGraphicsPeimInit = 0;
+	silconfig->PeiGraphicsPeimInit = CONFIG(RUN_FSP_GOP) && is_dev_enabled(dev);
 
 	mainboard_silicon_init_params(silconfig);
 }

src/soc/intel/apollolake/romstage.c

diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index c5b060f..54bdd2e 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -6,6 +6,7 @@
 #include <assert.h>
 #include <cf9_reset.h>
 #include <console/console.h>
+#include <device/device.h>
 #include <cpu/x86/pae.h>
 #include <delay.h>
 #include <device/pci_def.h>
@@ -258,9 +259,9 @@
 	DEVTREE_CONST struct device *dev = pcidev_path_on_root(PCH_DEVFN_NPK);
 
 #if CONFIG(SOC_INTEL_GLK)
-	m_upd->FspmConfig.TraceHubEn = dev ? dev->enabled : 0;
+	m_upd->FspmConfig.TraceHubEn = is_dev_enabled(dev);
 #else
-	m_upd->FspmConfig.NpkEn = dev ? dev->enabled : 0;
+	m_upd->FspmConfig.NpkEn = is_dev_enabled(dev);
 #endif
 }