summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/jasperlake/chip.h11
-rw-r--r--src/soc/intel/jasperlake/fsp_params.c19
2 files changed, 21 insertions, 9 deletions
diff --git a/src/soc/intel/jasperlake/chip.h b/src/soc/intel/jasperlake/chip.h
index 884071fdbd..3b813398a8 100644
--- a/src/soc/intel/jasperlake/chip.h
+++ b/src/soc/intel/jasperlake/chip.h
@@ -353,18 +353,23 @@ struct soc_intel_jasperlake_config {
uint8_t FivrSpreadSpectrum;
/*
- * Disable Fast Slew Rate for Deep Package C States for VR domains
+ * Disable Fast Slew Rate for Deep Package C States for VCCIN VR domain
* Disable Fast Slew Rate for Deep Package C States based on
* Acoustic Noise Mitigation feature enabled.
*/
uint8_t FastPkgCRampDisable;
/*
- * Slew Rate configuration for Deep Package C States for VR domains
+ * Slew Rate configuration for Deep Package C States for VCCIN VR domain
* based on Acoustic Noise Mitigation feature enabled.
* 0: Fast/2 ; 1: Fast/4; 2: Fast/8; 3: Fast/16
*/
- uint8_t SlowSlewRate;
+ enum {
+ SlewRateFastBy2 = 0,
+ SlewRateFastBy4,
+ SlewRateFastBy8,
+ SlewRateFastBy16
+ } SlowSlewRate;
/*
* Enable or Disable Acoustic Noise Mitigation feature.
diff --git a/src/soc/intel/jasperlake/fsp_params.c b/src/soc/intel/jasperlake/fsp_params.c
index c03e9dd15b..eefbf6cf0f 100644
--- a/src/soc/intel/jasperlake/fsp_params.c
+++ b/src/soc/intel/jasperlake/fsp_params.c
@@ -236,13 +236,20 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
config->PchPmSlpS3MinAssert, config->PchPmSlpAMinAssert,
config->PchPmPwrCycDur);
- /* Fill Acoustic noise mitigation related configuration */
- params->FastPkgCRampDisable[0] = config->FastPkgCRampDisable;
- params->SlowSlewRate[0] = config->SlowSlewRate;
+ /*
+ * Fill Acoustic noise mitigation related configuration
+ * JSL only has single VR domain (VCCIN VR), thus filling only index 0 for
+ * Slew rate and FastPkgCRamp for VR0 only.
+ */
params->AcousticNoiseMitigation = config->AcousticNoiseMitigation;
- params->PreWake = config->PreWake;
- params->RampUp = config->RampUp;
- params->RampDown = config->RampDown;
+
+ if (params->AcousticNoiseMitigation) {
+ params->FastPkgCRampDisable[0] = config->FastPkgCRampDisable;
+ params->SlowSlewRate[0] = config->SlowSlewRate;
+ params->PreWake = config->PreWake;
+ params->RampUp = config->RampUp;
+ params->RampDown = config->RampDown;
+ }
/* Override/Fill FSP Silicon Param for mainboard */
mainboard_silicon_init_params(params);