summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorMaxim Polyakov <max.senia.poliak@gmail.com>2020-02-16 11:51:57 +0300
committerPatrick Georgi <pgeorgi@google.com>2020-03-03 10:20:30 +0000
commit7b98e3ebfc3ac12972ba36418f5de7595cc2fb8f (patch)
tree7fa736a3dd7a85911177527a528bde3b8c38e30e /src/soc
parent3a02147d227b16f6b6adb0c4b4529cade902f27c (diff)
downloadcoreboot-7b98e3ebfc3ac12972ba36418f5de7595cc2fb8f.tar.xz
soc/intel/apl: disable NPK device in devicetree.cb
Allows to enable/disable NPK device from the device tree: device pci 00.2 off end # NPK Tested on Kontron come-mal10. Change-Id: I910245d4ff35a6a0a9059fb6911d4426cdb999b6 Signed-off-by: Maxim Polyakov <max.senia.poliak@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/38814 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/apollolake/chip.c6
-rw-r--r--src/soc/intel/apollolake/romstage.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index 03e6dbd038..37fdfff90b 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -425,6 +425,12 @@ static void soc_final(void *data)
static void disable_dev(struct device *dev, FSP_S_CONFIG *silconfig)
{
switch (dev->path.pci.devfn) {
+ case PCH_DEVFN_NPK:
+ /*
+ * Disable this device in the parse_devicetree_setting() function
+ * in romstage.c
+ */
+ break;
case PCH_DEVFN_ISH:
silconfig->IshEnable = 0;
break;
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index 13adeeef40..05cd0db401 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -291,12 +291,12 @@ static void soc_memory_init_params(FSPM_UPD *mupd)
static void parse_devicetree_setting(FSPM_UPD *m_upd)
{
-#if CONFIG(SOC_INTEL_GLK)
DEVTREE_CONST struct device *dev = pcidev_path_on_root(PCH_DEVFN_NPK);
- if (!dev)
- return;
- m_upd->FspmConfig.TraceHubEn = dev->enabled;
+#if CONFIG(SOC_INTEL_GLK)
+ m_upd->FspmConfig.TraceHubEn = dev ? dev->enabled : 0;
+#else
+ m_upd->FspmConfig.NpkEn = dev ? dev->enabled : 0;
#endif
}