diff options
Diffstat (limited to 'Platform/BroxtonPlatformPkg/Common')
7 files changed, 13 insertions, 12 deletions
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspCpuPolicyInitLib.c b/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspCpuPolicyInitLib.c index 4af0dc2017..6c176d0685 100644 --- a/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspCpuPolicyInitLib.c +++ b/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspCpuPolicyInitLib.c @@ -1,7 +1,7 @@ /** @file
Implementation of Fsp PCH Policy Initialization.
- Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -112,7 +112,7 @@ PeiFspCpuPolicyInit ( FspsUpd->FspsConfig.EnableCx = SystemConfiguration->EnableCx;
FspsUpd->FspsConfig.C1e = SystemConfiguration->EnableCxe;
FspsUpd->FspsConfig.BiProcHot = SystemConfiguration->EnableProcHot;
- FspsUpd->FspsConfig.PkgCStateLimit = (MAX_PKG_C_STATE) SystemConfiguration->MaxPkgCState;
+ FspsUpd->FspsConfig.PkgCStateLimit = (MAX_PKG_C_STATE) PcdGet8 (PcdMaxPkgCState);
FspsUpd->FspsConfig.EnableCx = SystemConfiguration->EnableCx;
FspsUpd->FspsConfig.CStateAutoDemotion = SystemConfiguration->CStateAutoDemotion;
FspsUpd->FspsConfig.CStateUnDemotion = SystemConfiguration->CStateUnDemotion;
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf b/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf index f0e6bf710c..5ce0cc255a 100644 --- a/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf +++ b/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf @@ -85,6 +85,7 @@ gEfiBxtTokenSpaceGuid.PcdPmcGcrBaseAddress
gPlatformModuleTokenSpaceGuid.PcdResetType
gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid
+ gPlatformModuleTokenSpaceGuid.PcdMaxPkgCState
[Ppis]
gSiPolicyPpiGuid ## CONSUMES
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiCpuPolicyUpdate.c b/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiCpuPolicyUpdate.c index 27c4dfc710..db5b9a4870 100644 --- a/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiCpuPolicyUpdate.c +++ b/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiCpuPolicyUpdate.c @@ -68,7 +68,7 @@ UpdatePeiCpuPolicy ( PowerMgmtConfig->Cx = SystemConfiguration->EnableCx;
PowerMgmtConfig->C1e = SystemConfiguration->EnableCxe;
PowerMgmtConfig->BiProcHot = SystemConfiguration->EnableProcHot;
- PowerMgmtConfig->PkgCStateLimit = (MAX_PKG_C_STATE) SystemConfiguration->MaxPkgCState;
+ PowerMgmtConfig->PkgCStateLimit = (MAX_PKG_C_STATE) PcdGet8 (PcdMaxPkgCState);
PowerMgmtConfig->AutoThermalReporting = SystemConfiguration->AutoThermalReporting;
if (BxtStepping () >= BxtPB1) {
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf b/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf index ea8d7fb4b1..d1f8cc2793 100644 --- a/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf +++ b/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf @@ -81,6 +81,7 @@ gEfiBxtTokenSpaceGuid.PcdP2SBBaseAddress
gEfiBxtTokenSpaceGuid.PcdPmcGcrBaseAddress
gPlatformModuleTokenSpaceGuid.PcdResetType
+ gPlatformModuleTokenSpaceGuid.PcdMaxPkgCState
[FixedPcd]
gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platform.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platform.c index 54e80df917..b03f825f89 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platform.c +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platform.c @@ -773,11 +773,9 @@ InitializePlatform ( mSystemConfiguration.PlatformSettingEn = 1;
}
- mSystemConfiguration.PmicSetupDefault = 0;
- if (PlatformInfoHob->PmicVersion == 0) {
- mSystemConfiguration.PmicSetupDefault = 1;
- mSystemConfiguration.MaxPkgCState = 0;
- }
+ mSystemConfiguration.PmicSetupDefault = 1;
+ mSystemConfiguration.MaxPkgCState = PcdGet8 (PcdMaxPkgCState);
+
Status = gRT->SetVariable (
L"Setup",
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.inf b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.inf index b15d0ed8ae..8cb63e9460 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.inf +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.inf @@ -133,7 +133,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection
gEfiBxtTokenSpaceGuid.PcdP2SBBaseAddress
gPlatformModuleTokenSpaceGuid.PcdLogoFileGuid - gPlatformModuleTokenSpaceGuid.PcdLogoDisplay + gPlatformModuleTokenSpaceGuid.PcdLogoDisplay
+ gPlatformModuleTokenSpaceGuid.PcdMaxPkgCState
[FeaturePcd] gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/CpuPower.vfi b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/CpuPower.vfi index e15973a273..9deea25341 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/CpuPower.vfi +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/CpuPower.vfi @@ -64,13 +64,13 @@ form formid = CPU_PWR_CONFIGURATION_FORM_ID, oneof varid = Setup.MaxPkgCState,
prompt = STRING_TOKEN(STR_MAX_PKG_CSTATE_SUPPORT_PROMPT),
help = STRING_TOKEN(STR_MAX_PKG_CSTATE_STATE_SUPPORT_HELP),
- option text = STRING_TOKEN(STR_MAX_PKG_CSTATE_C2), value = 2, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
+ option text = STRING_TOKEN(STR_MAX_PKG_CSTATE_C2), value = 2, flags = RESET_REQUIRED;
option text = STRING_TOKEN(STR_MAX_PKG_CSTATE_C1), value = 1, flags = RESET_REQUIRED;
- option text = STRING_TOKEN(STR_MAX_PKG_CSTATE_C0), value = 0, flags = RESET_REQUIRED;
+ option text = STRING_TOKEN(STR_MAX_PKG_CSTATE_C0), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
endoneof;
endif;
- suppressif NOT ideqval Setup.PmicSetupDefault == 1;
+ suppressif TRUE;
text
help = STRING_TOKEN(STR_MAX_PKG_CSTATE_STATE_SUPPORT_HELP),
text = STRING_TOKEN(STR_MAX_PKG_CSTATE_SUPPORT_PROMPT),
|