summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2020-07-25 04:39:52 +0200
committerMichael Niewöhner <c0d3z3r0@review.coreboot.org>2020-07-26 12:53:33 +0000
commit4e58ce15351d95aabc529b6affe91d2b0a7993d0 (patch)
treef0d2b27fc4a03b80acaaec4f2c150955a6c89c25 /src/soc
parent1d0154cee023d7185436b9a3399d25276a532699 (diff)
downloadcoreboot-4e58ce15351d95aabc529b6affe91d2b0a7993d0.tar.xz
soc/skylake: Configure SATA options only if SATA is enabled
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
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/skylake/chip.c42
1 files changed, 23 insertions, 19 deletions
diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c
index 6ef01d8c0c..52e4d3061c 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -166,14 +166,29 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
}
}
- memcpy(params->SataPortsEnable, config->SataPortsEnable,
- sizeof(params->SataPortsEnable));
- memcpy(params->SataPortsDevSlp, config->SataPortsDevSlp,
- sizeof(params->SataPortsDevSlp));
- memcpy(params->SataPortsHotPlug, config->SataPortsHotPlug,
- sizeof(params->SataPortsHotPlug));
- memcpy(params->SataPortsSpinUp, config->SataPortsSpinUp,
- sizeof(params->SataPortsSpinUp));
+ params->SataEnable = config->EnableSata;
+ if (config->EnableSata) {
+ memcpy(params->SataPortsEnable, config->SataPortsEnable,
+ sizeof(params->SataPortsEnable));
+ memcpy(params->SataPortsDevSlp, config->SataPortsDevSlp,
+ sizeof(params->SataPortsDevSlp));
+ memcpy(params->SataPortsHotPlug, config->SataPortsHotPlug,
+ 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,
sizeof(params->PcieRpClkReqSupport));
memcpy(params->PcieRpClkReqNumber, config->PcieRpClkReqNumber,
@@ -233,7 +248,6 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
params->PchLanClkReqSupported = config->LanClkReqSupported;
params->PchLanClkReqNumber = config->LanClkReqNumber;
}
- params->SataSalpSupport = config->SataSalpSupport;
params->SsicPortEnable = config->SsicPortEnable;
params->ScsEmmcEnabled = config->ScsEmmcEnabled;
params->ScsEmmcHs400Enabled = config->ScsEmmcHs400Enabled;
@@ -257,22 +271,12 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
params->PchHdaIoBufferOwnership = config->IoBufferOwnership;
params->PchHdaDspEnable = config->DspEnable;
params->Device4Enable = config->Device4Enable;
- params->SataEnable = config->EnableSata;
- params->SataMode = config->SataMode;
- params->SataSpeedLimit = config->SataSpeedLimit;
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->PchLockDownRtcLock = config->LockDownConfigRtcLock;
tconfig->PowerLimit4 = config->PowerLimit4;
- tconfig->SataTestMode = config->SataTestMode;
/*
* To disable HECI, the Psf needs to be left unlocked
* by FSP till end of post sequence. Based on the devicetree