GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

soc/skylake: Configure SATA options only if SATA is enabled

Browse source 
Change-Id: I2860375c8ec4f9cda7709ee26db4c132a3b252b9
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43842
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Michael Niewöhner
This commit is contained in:
Felix Singer 2020-07-25 04:39:52 +02:00 committed by Michael Niewöhner
parent 1d0154cee0
commit 4e58ce1535
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/soc/intel/skylake/chip.c
View file

@ -166,14 +166,29 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
} }
} }
memcpy(params->SataPortsEnable, config->SataPortsEnable, params->SataEnable = config->EnableSata;
sizeof(params->SataPortsEnable)); if (config->EnableSata) {
memcpy(params->SataPortsDevSlp, config->SataPortsDevSlp, memcpy(params->SataPortsEnable, config->SataPortsEnable,
sizeof(params->SataPortsDevSlp)); sizeof(params->SataPortsEnable));
memcpy(params->SataPortsHotPlug, config->SataPortsHotPlug, memcpy(params->SataPortsDevSlp, config->SataPortsDevSlp,
sizeof(params->SataPortsHotPlug)); sizeof(params->SataPortsDevSlp));
memcpy(params->SataPortsSpinUp, config->SataPortsSpinUp, memcpy(params->SataPortsHotPlug, config->SataPortsHotPlug,
sizeof(params->SataPortsSpinUp)); sizeof(params->SataPortsHotPlug));
memcpy(params->SataPortsSpinUp, config->SataPortsSpinUp,
sizeof(params->SataPortsSpinUp));
params->SataSalpSupport = config->SataSalpSupport;
params->SataMode = config->SataMode;
params->SataSpeedLimit = config->SataSpeedLimit;
/*
* For unknown reasons FSP skips writing some essential SATA init registers
* (SIR) when SataPwrOptEnable=0. This results in link errors, "unaligned
* write" errors and others. Enabling this option solves these problems.
*/
params->SataPwrOptEnable = 1;
tconfig->SataTestMode = config->SataTestMode;
}
memcpy(params->PcieRpClkReqSupport, config->PcieRpClkReqSupport, memcpy(params->PcieRpClkReqSupport, config->PcieRpClkReqSupport,
sizeof(params->PcieRpClkReqSupport)); sizeof(params->PcieRpClkReqSupport));
memcpy(params->PcieRpClkReqNumber, config->PcieRpClkReqNumber, memcpy(params->PcieRpClkReqNumber, config->PcieRpClkReqNumber,
@ -233,7 +248,6 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
params->PchLanClkReqSupported = config->LanClkReqSupported; params->PchLanClkReqSupported = config->LanClkReqSupported;
params->PchLanClkReqNumber = config->LanClkReqNumber; params->PchLanClkReqNumber = config->LanClkReqNumber;
} }
params->SataSalpSupport = config->SataSalpSupport;
params->SsicPortEnable = config->SsicPortEnable; params->SsicPortEnable = config->SsicPortEnable;
params->ScsEmmcEnabled = config->ScsEmmcEnabled; params->ScsEmmcEnabled = config->ScsEmmcEnabled;
params->ScsEmmcHs400Enabled = config->ScsEmmcHs400Enabled; params->ScsEmmcHs400Enabled = config->ScsEmmcHs400Enabled;
@ -257,22 +271,12 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
params->PchHdaIoBufferOwnership = config->IoBufferOwnership; params->PchHdaIoBufferOwnership = config->IoBufferOwnership;
params->PchHdaDspEnable = config->DspEnable; params->PchHdaDspEnable = config->DspEnable;
params->Device4Enable = config->Device4Enable; params->Device4Enable = config->Device4Enable;
params->SataEnable = config->EnableSata;
params->SataMode = config->SataMode;
params->SataSpeedLimit = config->SataSpeedLimit;
params->EnableTcoTimer = !config->PmTimerDisabled; params->EnableTcoTimer = !config->PmTimerDisabled;
/*
* For unknown reasons FSP skips writing some essential SATA init registers (SIR) when
* SataPwrOptEnable=0. This results in link errors, "unaligned write" errors and others.
* Enabling this option solves these problems.
*/
params->SataPwrOptEnable = 1;
tconfig->PchLockDownGlobalSmi = config->LockDownConfigGlobalSmi; tconfig->PchLockDownGlobalSmi = config->LockDownConfigGlobalSmi;
tconfig->PchLockDownRtcLock = config->LockDownConfigRtcLock; tconfig->PchLockDownRtcLock = config->LockDownConfigRtcLock;
tconfig->PowerLimit4 = config->PowerLimit4; tconfig->PowerLimit4 = config->PowerLimit4;
tconfig->SataTestMode = config->SataTestMode;
/* /*
* To disable HECI, the Psf needs to be left unlocked * To disable HECI, the Psf needs to be left unlocked
* by FSP till end of post sequence. Based on the devicetree * by FSP till end of post sequence. Based on the devicetree