commit dfffcad66f4bad1d08c8bd9d6058c54b939422c5
author Matt Delco <delco@chromium.org> Mon Jul 23 12:44:15 2018 -0700
committer Patrick Georgi <pgeorgi@google.com> Fri Aug 17 12:25:52 2018 +0000
tree 08e10063036ab585fe46076e4cf188504f0af653
parent 12f6d91a98ea08e94be6458c6d7fb2ff3563a36a

soc/intel/skylake: permit Kconfig to set subsystem ID

This change permits the subsystem ID to be specified via Kconfig for the
devices on the SoC.

Some devices are getting zero'ed subsystem IDs because the unset (and thus
zero'ed) config options are overwriting the fsp defaults. With this change
the fsp defaults will only be overwritten by non-zero config values.

Change-Id: I0f7bb8e465f55e5dd6d8e0fad71b9b2a22f089dc
Signed-off-by: Matt Delco <delco@chromium.org>
Reviewed-on: https://review.coreboot.org/27609
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>

src/soc/intel/skylake/chip_fsp20.c

diff --git a/src/soc/intel/skylake/chip_fsp20.c b/src/soc/intel/skylake/chip_fsp20.c
index f51559f..d5f5433 100644
--- a/src/soc/intel/skylake/chip_fsp20.c
+++ b/src/soc/intel/skylake/chip_fsp20.c
@@ -374,8 +374,15 @@
 		 */
 		params->SpiFlashCfgLockDown = 0;
 	}
-	params->PchSubSystemVendorId = config->PchConfigSubSystemVendorId;
-	params->PchSubSystemId = config->PchConfigSubSystemId;
+	/* only replacing preexisting subsys ID defaults when non-zero */
+#if defined(CONFIG_SUBSYSTEM_VENDOR_ID) && CONFIG_SUBSYSTEM_VENDOR_ID
+	params->DefaultSvid = CONFIG_SUBSYSTEM_VENDOR_ID;
+	params->PchSubSystemVendorId = CONFIG_SUBSYSTEM_VENDOR_ID;
+#endif
+#if defined(CONFIG_SUBSYSTEM_DEVICE_ID) && CONFIG_SUBSYSTEM_DEVICE_ID
+	params->DefaultSid = CONFIG_SUBSYSTEM_DEVICE_ID;
+	params->PchSubSystemId = CONFIG_SUBSYSTEM_DEVICE_ID;
+#endif
 	params->PchPmWolEnableOverride = config->WakeConfigWolEnableOverride;
 	params->PchPmPcieWakeFromDeepSx = config->WakeConfigPcieWakeFromDeepSx;
 	params->PchPmDeepSxPol = config->PmConfigDeepSxPol;