diff options
| author | Rizwan Qureshi <rizwan.qureshi@intel.com> | 2015-10-05 19:11:39 +0530 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-10-27 15:15:39 +0100 |
| commit | 952cb03b9e08883da46fb57f99aec919f5a9b60a (patch) | |
| tree | da6bb212c26c33607b8d18a318b6f3296ae9dac0 /src/soc/intel/skylake/chip.c | |
| parent | e57e72681fa218bb747f658576c64111c20363e3 (diff) | |
| download | coreboot-952cb03b9e08883da46fb57f99aec919f5a9b60a.tar.xz | |
intel/skylake: FSP 1.7.0 MemoryInit/SiliconInit params update
In FSP 1.7.0 SataMode and SataEnable have been moved from
MemoryInit to SiliconInit. Also, GpioTablePtr has been removed.
USB phy settings added to SiliconInit, Enable the configs for USB
equalization settings in coreboot.
Addition of serialIO UPD to indicate FSP not to reinitialise
UART2 controller during MemoryInit.
BRANCH=none BUG=chrome-os-partner:45684, chrome-os-partner:42284, chrome-os-partner:41374
TEST=build for Kunimitsu, boot on FAB3, Also checked for Boot from USB, Boot from eMMC,
USB Audio, Onboard Audio, Touch, Wifi, S3 entry/resume
CQ-DEPEND=CL:*232947, CL:*232946, CL:*232948, CL:*232949
Change-Id: I2e8e6e32fc7074774ddcf1fb4c270bb56372b7df
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 623c5a52f3afedaf2c0bfe7361cfd627d093cb73
Original-Change-Id: I8b3be2c49893c564fe2197aa32bde6323bf425e9
Original-Signed-off-by: Rizwan Qureshi <rizwan.qureshi@intel.com>
Original-Signed-off-by: Rishavnath Satapathy <rishavnath.satapathy@intel.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/303661
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/12144
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/soc/intel/skylake/chip.c')
| -rw-r--r-- | src/soc/intel/skylake/chip.c | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c index fd959b2807..25235c910c 100644 --- a/src/soc/intel/skylake/chip.c +++ b/src/soc/intel/skylake/chip.c @@ -80,11 +80,28 @@ void soc_silicon_init_params(SILICON_INIT_UPD *params) memcpy(params->PortUsb30Enable, config->PortUsb30Enable, sizeof(params->PortUsb30Enable)); + memcpy(params->Usb2AfePetxiset, config->Usb2AfePetxiset, + sizeof(params->Usb2AfePetxiset)); + memcpy(params->Usb2AfeTxiset, config->Usb2AfeTxiset, + sizeof(params->Usb2AfeTxiset)); + memcpy(params->Usb2AfePredeemp, config->Usb2AfePredeemp, + sizeof(params->Usb2AfePredeemp)); + memcpy(params->Usb2AfePehalfbit, config->Usb2AfePehalfbit, + sizeof(params->Usb2AfePehalfbit)); + + memcpy(params->Usb3HsioTxDeEmphEnable, config->Usb3HsioTxDeEmphEnable, + sizeof(params->Usb3HsioTxDeEmphEnable)); + memcpy(params->Usb3HsioTxDeEmph, config->Usb3HsioTxDeEmph, + sizeof(params->Usb3HsioTxDeEmph)); + memcpy(params->Usb3HsioTxDownscaleAmpEnable, config->Usb3HsioTxDownscaleAmpEnable, + sizeof(params->Usb3HsioTxDownscaleAmpEnable)); + memcpy(params->Usb3HsioTxDownscaleAmp, config->Usb3HsioTxDownscaleAmp, + sizeof(params->Usb3HsioTxDownscaleAmp)); + params->SataSalpSupport = config->SataSalpSupport; params->SataPortsEnable[0] = config->SataPortsEnable[0]; params->SsicPortEnable = config->SsicPortEnable; params->SmbusEnable = config->SmbusEnable; - params->Cio2Enable = config->Cio2Enable; params->ScsEmmcEnabled = config->ScsEmmcEnabled; params->ScsEmmcHs400Enabled = config->ScsEmmcHs400Enabled; params->ScsSdCardEnabled = config->ScsSdCardEnabled; @@ -95,6 +112,8 @@ void soc_silicon_init_params(SILICON_INIT_UPD *params) params->XdciEnable = config->XdciEnable; params->Device4Enable = config->Device4Enable; params->RtcLock = config->RtcLock; + params->EnableSata = config->EnableSata; + params->SataMode = config->SataMode; /* Show SPI controller if enabled in devicetree.cb */ dev = dev_find_slot(0, PCH_DEVFN_SPI); @@ -124,9 +143,6 @@ void soc_display_silicon_init_params(const SILICON_INIT_UPD *original, soc_display_upd_value("TurboMode", 1, (uint32_t)original->TurboMode, (uint32_t)params->TurboMode); - soc_display_upd_value("GpioTablePtr", 4, - (uint32_t)original->GpioTablePtr, - (uint32_t)params->GpioTablePtr); soc_display_upd_value("Device4Enable", 1, original->Device4Enable, params->Device4Enable); @@ -250,8 +266,6 @@ void soc_display_silicon_init_params(const SILICON_INIT_UPD *original, original->SerialIoDevMode[9], params->SerialIoDevMode[9]); soc_display_upd_value("SerialIoDevMode[10]", 1, original->SerialIoDevMode[10], params->SerialIoDevMode[10]); - soc_display_upd_value("Cio2Enable", 1, original->Cio2Enable, - params->Cio2Enable); soc_display_upd_value("ScsEmmcEnabled", 1, original->ScsEmmcEnabled, params->ScsEmmcEnabled); soc_display_upd_value("ScsEmmcHs400Enabled", 1, @@ -268,6 +282,10 @@ void soc_display_silicon_init_params(const SILICON_INIT_UPD *original, params->Heci3Enabled); soc_display_upd_value("RtcLock", 1, original->RtcLock, params->RtcLock); + soc_display_upd_value("EnableSata", 1, original->EnableSata, + params->EnableSata); + soc_display_upd_value("SataMode", 1, original->SataMode, + params->SataMode); } static void pci_set_subsystem(device_t dev, unsigned vendor, unsigned device) |