sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/apl: disable NPK device in devicetree.cb

Browse Source 
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>
This commit is contained in:
Maxim Polyakov
2020-02-16 11:51:57 +03:00
committed by Patrick Georgi
parent 3a02147d22
commit 7b98e3ebfc
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/soc/intel/apollolake/chip.c
View File

@@ -425,6 +425,12 @@ static void soc_final(void *data)
static void disable_dev(struct device *dev, FSP_S_CONFIG *silconfig) static void disable_dev(struct device *dev, FSP_S_CONFIG *silconfig)
{ {
switch (dev->path.pci.devfn) { 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: case PCH_DEVFN_ISH:
silconfig->IshEnable = 0; silconfig->IshEnable = 0;
break; break;

8
src/soc/intel/apollolake/romstage.c
View File

@@ -291,12 +291,12 @@ static void soc_memory_init_params(FSPM_UPD *mupd)
static void parse_devicetree_setting(FSPM_UPD *m_upd) 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); 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 #endif
} }