diff options
| author | Aamir Bohra <aamir.bohra@intel.com> | 2017-02-06 21:48:48 +0530 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-03-22 17:42:18 +0100 |
| commit | 63755128961089deba77413dad1f4f6d349a68f5 (patch) | |
| tree | 37fb876dc738b9900ca4bc3a06a89dcfa8d3b5e0 /src/soc | |
| parent | 8e1c12f12e3fb01d2228cca29de188507b3f2cc7 (diff) | |
soc/intel/skylake: Add configs for enabling DCI and TraceHub
Add configs for enabling Intel TraceHub and DCI for aid in debugging.
Change-Id: Ic40f9499c0125070049856e242e89024ca5a1c4e
Signed-off-by: Aamir Bohra <aamir.bohra@intel.com>
Signed-off-by: Rizwan Qureshi <rizwan.qureshi@intel.com>
Reviewed-on: https://review.coreboot.org/18791
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/intel/skylake/chip.h | 5 | ||||
| -rw-r--r-- | src/soc/intel/skylake/romstage/romstage_fsp20.c | 22 |
2 files changed, 19 insertions, 8 deletions
diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h index 4aa7ec9f78..445dcb67c1 100644 --- a/src/soc/intel/skylake/chip.h +++ b/src/soc/intel/skylake/chip.h @@ -157,6 +157,11 @@ struct soc_intel_skylake_config { /* Trace Hub function */ u8 EnableTraceHub; + u32 TraceHubMemReg0Size; + u32 TraceHubMemReg1Size; + + /* DCI Enable/Disable */ + u8 PchDciEn; /* Pcie Root Ports */ u8 PcieRpEnable[CONFIG_MAX_ROOT_PORTS]; diff --git a/src/soc/intel/skylake/romstage/romstage_fsp20.c b/src/soc/intel/skylake/romstage/romstage_fsp20.c index be71e58541..fbc5fe1c53 100644 --- a/src/soc/intel/skylake/romstage/romstage_fsp20.c +++ b/src/soc/intel/skylake/romstage/romstage_fsp20.c @@ -185,16 +185,12 @@ static void cpu_flex_override(FSP_M_CONFIG *m_cfg) m_cfg->CpuRatio = (flex_ratio.lo >> 8) & 0xff; } -static void soc_memory_init_params(FSP_M_CONFIG *m_cfg) +static void soc_memory_init_params(FSP_M_CONFIG *m_cfg, + const struct soc_intel_skylake_config *config) { - const struct device *dev; - const struct soc_intel_skylake_config *config; int i; uint32_t mask = 0; - /* Set the parameters for MemoryInit */ - dev = dev_find_slot(0, PCI_DEVFN(PCH_DEV_SLOT_LPC, 0)); - config = dev->chip_info; /* * Set IGD stolen size to 64MB. The FBC hardware for skylake does not * have access to the bios_reserved range so it always assumes 8MB is @@ -207,7 +203,6 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg) m_cfg->TsegSize = CONFIG_SMM_TSEG_SIZE; m_cfg->IedSize = CONFIG_IED_REGION_SIZE; m_cfg->ProbelessTrace = config->ProbelessTrace; - m_cfg->EnableTraceHub = config->EnableTraceHub; if (vboot_recovery_mode_enabled()) m_cfg->SaGv = 0; /* Disable SaGv in recovery mode. */ else @@ -228,10 +223,15 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg) void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version) { + const struct device *dev; + const struct soc_intel_skylake_config *config; FSP_M_CONFIG *m_cfg = &mupd->FspmConfig; FSP_M_TEST_CONFIG *m_t_cfg = &mupd->FspmTestConfig; - soc_memory_init_params(m_cfg); + dev = dev_find_slot(0, PCI_DEVFN(PCH_DEV_SLOT_LPC, 0)); + config = dev->chip_info; + + soc_memory_init_params(m_cfg, config); /* Enable DMI Virtual Channel for ME */ m_t_cfg->DmiVcm = 0x01; @@ -240,6 +240,12 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version) m_t_cfg->SendDidMsg = 0x01; m_t_cfg->DidInitStat = 0x01; + /* DCI and TraceHub configs */ + m_t_cfg->PchDciEn = config->PchDciEn; + m_cfg->EnableTraceHub = config->EnableTraceHub; + m_cfg->TraceHubMemReg0Size = config->TraceHubMemReg0Size; + m_cfg->TraceHubMemReg1Size = config->TraceHubMemReg1Size; + mainboard_memory_init_params(mupd); } |