diff options
| -rw-r--r-- | src/soc/intel/apollolake/chip.c | 8 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/romstage.c | 22 |
2 files changed, 21 insertions, 9 deletions
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index 4c8abda7f3..c49f73473e 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -538,6 +538,7 @@ static void apl_fsp_silicon_init_params_cb(struct soc_intel_apollolake_config static void glk_fsp_silicon_init_params_cb( struct soc_intel_apollolake_config *cfg, FSP_S_CONFIG *silconfig) { +#if IS_ENABLED(CONFIG_SOC_INTEL_GLK) silconfig->Gmm = 0; /* On Geminilake, we need to override the default FSP PCIe de-emphasis @@ -550,6 +551,13 @@ static void glk_fsp_silicon_init_params_cb( memcpy(silconfig->PcieRpSelectableDeemphasis, cfg->pcie_rp_deemphasis_enable, sizeof(silconfig->PcieRpSelectableDeemphasis)); + /* + * FSP does not know what the clock requirements are for the + * device on SPI bus, hence it should not modify what coreboot + * has set up. Hence skipping in FSP. + */ + silconfig->SkipSpiPCP = 1; +#endif } void __weak mainboard_devtree_update(struct device *dev) diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c index bccfc16ba6..cee23b6d6e 100644 --- a/src/soc/intel/apollolake/romstage.c +++ b/src/soc/intel/apollolake/romstage.c @@ -315,16 +315,20 @@ static void soc_memory_init_params(FSPM_UPD *mupd) m_cfg->PrmrrSize = config->PrmrrSize; - /* FSP performs a PERST# signal deassertion for PCIe ports with - * the GPIO address specified in these UPDs. Over-ride the default - * addresses with 0 to bypass PERST# signal deassertion in FSP. + /* + * CpuMemoryTest in FSP tests 0 to 1M of the RAM after MRC init. + * With PAGING_IN_CACHE_AS_RAM enabled for GLK, there was no page + * table entry for this range which caused a page fault. Since this + * test is anyway not exhaustive, skipping the memory test in FSP. + */ + m_cfg->SkipMemoryTestUpd = 1; + + /* + * PCIe power sequence can be done from within FSP when provided + * with the GPIOs used for PERST to FSP. Since this is done in + * coreboot, skipping the PCIe power sequence done by FSP. */ - m_cfg->RootPort0Perst = 0; - m_cfg->RootPort1Perst = 0; - m_cfg->RootPort2Perst = 0; - m_cfg->RootPort3Perst = 0; - m_cfg->RootPort4Perst = 0; - m_cfg->RootPort5Perst = 0; + m_cfg->SkipPciePowerSequence = 1; #endif } |