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

src/soc/intel/cnl/chip.h: Fix preprocessor condition 

Commit dc666f5 (soc/intel/cannonlake: Change in SaGv options) added a
conditional preprocessor directive, but its condition was incorrect
because SOC_INTEL_CANNONLAKE is selected for CNL, CFL and WHL. Thus, an
explicit check for !SOC_INTEL_COFFEELAKE is required.

While we are at it, clean up the comment above a bit.

BUG=b:123184474
Change-Id: I8a6959bb615fb5668cbfe54339747d135bd5a005
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/31095
Reviewed-by: Shelley Chen <shchen@google.com>
Reviewed-by: Rizwan Qureshi <rizwan.qureshi@intel.com>
Reviewed-by: Ronak Kanabar <ronak.kanabar@intel.com>
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2019-01-25 20:05:38 +01:00 committed by Subrata Banik
parent d731a24ff1
commit acb6e138b2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/soc/intel/cannonlake/chip.h
View File

@ -100,16 +100,16 @@ struct soc_intel_cannonlake_config {
uint16_t FreqSaGvMid; uint16_t FreqSaGvMid;
/* System Agent dynamic frequency support. Only effects ULX/ULT CPUs. /* System Agent dynamic frequency support. Only effects ULX/ULT CPUs.
* for CNL options are as following * For CNL, options are as following
* When enabled memory will be training at three different frequencies. * When enabled, memory will be training at three different frequencies.
* 0:Disabled, 1:FixedLow, 2:FixedMid, 3:FixedHigh, 4:Enabled * 0:Disabled, 1:FixedLow, 2:FixedMid, 3:FixedHigh, 4:Enabled
* for WHL/CFL options are as following * For WHL/CFL options are as following
* When enabled memory will be training at two different frequencies. * When enabled, memory will be training at two different frequencies.
* 0:Disabled, 1:FixedLow, 2:FixedHigh, 3:Enabled*/ * 0:Disabled, 1:FixedLow, 2:FixedHigh, 3:Enabled*/
enum { enum {
SaGv_Disabled, SaGv_Disabled,
SaGv_FixedLow, SaGv_FixedLow,
#if IS_ENABLED(CONFIG_SOC_INTEL_CANNONLAKE) #if !IS_ENABLED(CONFIG_SOC_INTEL_COFFEELAKE)
SaGv_FixedMid, SaGv_FixedMid,
#endif #endif
SaGv_FixedHigh, SaGv_FixedHigh,