From 87bb5f5e7a4476a2e9a70cc8d234fa0b479f1e26 Mon Sep 17 00:00:00 2001 From: Aamir Bohra Date: Tue, 10 Sep 2019 08:39:14 +0530 Subject: soc/intel/cannonlake: Add config for sata devslp pad reset configuration CML FSP now provides a provision to configure the SATA devslp GPIO pad reset configuration. This config would help set the the required pad reset configuration. BUG=b:133000685 Change-Id: I4eaea9c6da67f1274ad3e392046a68cddc1b99b6 Signed-off-by: Aamir Bohra Reviewed-on: https://review.coreboot.org/c/coreboot/+/35306 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak Reviewed-by: V Sowmya Reviewed-by: Subrata Banik --- src/soc/intel/cannonlake/chip.h | 10 ++++++++++ src/soc/intel/cannonlake/fsp_params.c | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/src/soc/intel/cannonlake/chip.h b/src/soc/intel/cannonlake/chip.h index 2ebe017fbd..9c7c17147e 100644 --- a/src/soc/intel/cannonlake/chip.h +++ b/src/soc/intel/cannonlake/chip.h @@ -136,9 +136,19 @@ struct soc_intel_cannonlake_config { Sata_AHCI, Sata_RAID, } SataMode; + + /* SATA devslp pad reset configuration */ + enum { + SataDevSlpResumeReset = 1, + SataDevSlpHostDeepReset = 3, + SataDevSlpPlatformReset = 5, + SataDevSlpDswReset = 7 + } SataDevSlpRstConfig; + uint8_t SataSalpSupport; uint8_t SataPortsEnable[8]; uint8_t SataPortsDevSlp[8]; + uint8_t SataPortsDevSlpResetConfig[8]; /* Enable/Disable SLP_S0 with GBE Support. 0: disable, 1: enable */ uint8_t SlpS0WithGbeSupport; diff --git a/src/soc/intel/cannonlake/fsp_params.c b/src/soc/intel/cannonlake/fsp_params.c index 4038335787..f48a626be9 100644 --- a/src/soc/intel/cannonlake/fsp_params.c +++ b/src/soc/intel/cannonlake/fsp_params.c @@ -186,6 +186,11 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) sizeof(params->SataPortsEnable)); memcpy(params->SataPortsDevSlp, config->SataPortsDevSlp, sizeof(params->SataPortsDevSlp)); +#if CONFIG(SOC_INTEL_COMETLAKE) + memcpy(params->SataPortsDevSlpResetConfig, + config->SataPortsDevSlpResetConfig, + sizeof(params->SataPortsDevSlpResetConfig)); +#endif } /* Lan */ -- cgit v1.2.3