[edk2-devel] [edk2-platforms] [PATCH V2] KabylakeSiliconPkg: Default for PeciC10Reset should be 1
Chiu, Chasel
chasel.chiu at intel.com
Mon Aug 23 06:25:42 UTC 2021
Reviewed-by: Chasel Chiu <chasel.chiu at intel.com>
> -----Original Message-----
> From: Desimone, Nathaniel L <nathaniel.l.desimone at intel.com>
> Sent: Tuesday, August 17, 2021 5:54 AM
> To: devel at edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu at intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaganty at intel.com>; Benjamin Doron
> <benjamin.doron00 at gmail.com>; Michael Kubacki
> <michael.kubacki at microsoft.com>
> Subject: [edk2-platforms] [PATCH V2] KabylakeSiliconPkg: Default for
> PeciC10Reset should be 1
>
> The default value for CpuConfigLibPreMemConfig->PeciC10Reset
> should be 1 so that Peci Reset on C10 exit is disabled.
>
> Other bug fixes in
> KabylakeSiliconPkg\Cpu\Library\PeiCpuPolicyLibPreMem\PeiCpuPolicyLib.c
>
> 1. PCI configuration space can only be read 32-bits at a time.
> Converted MmioRead64 to MmioRead32.
> 2. Added a RShiftU64() call to prevent compiler instrinsics from
> being inserted. Since this is a 64-bit integer shift done in
> IA-32 mode it is possible for intrinsic calls to be added.
>
> Cc: Chasel Chiu <chasel.chiu at intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty at intel.com>
> Cc: Benjamin Doron <benjamin.doron00 at gmail.com>
> Cc: Michael Kubacki <michael.kubacki at microsoft.com>
> Signed-off-by: Nate DeSimone <nathaniel.l.desimone at intel.com>
> ---
> .../PeiCpuPolicyLibPreMem/PeiCpuPolicyLib.c | 30 +++++++++++++++----
> 1 file changed, 25 insertions(+), 5 deletions(-)
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Pei
> CpuPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Pei
> CpuPolicyLib.c
> index 35041322a7..9a334d8ec2 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Pei
> CpuPolicyLib.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem
> +++ /PeiCpuPolicyLib.c
> @@ -1,7 +1,7 @@
> /** @file
> This file is PeiCpuPolicy library.
>
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> @@ -45,13 +45,31 @@ LoadCpuConfigLibPreMemConfigDefault (
> CpuConfigLibPreMemConfig->BootFrequency = 1; // Maximum non-
> turbo Performance
> CpuConfigLibPreMemConfig->ActiveCoreCount = 0; // All cores active
> CpuConfigLibPreMemConfig->VmxEnable = CPU_FEATURE_ENABLE;
> - CpuConfigLibPreMemConfig->CpuRatio = ((AsmReadMsr64
> (MSR_PLATFORM_INFO) >> N_PLATFORM_INFO_MAX_RATIO) &
> B_PLATFORM_INFO_RATIO_MASK);
> + CpuConfigLibPreMemConfig->CpuRatio = RShiftU64 (AsmReadMsr64
> + (MSR_PLATFORM_INFO), N_PLATFORM_INFO_MAX_RATIO) &
> + B_PLATFORM_INFO_RATIO_MASK;
> +
> ///
> /// FCLK Frequency
> ///
> - CpuFamily = GetCpuFamily();
> - CpuSku = GetCpuSku();
> - MchBar = MmioRead64 (MmPciBase (SA_MC_BUS, SA_MC_DEV,
> SA_MC_FUN) + R_SA_MCHBAR) &~BIT0;
> + CpuFamily = GetCpuFamily ();
> + CpuSku = GetCpuSku ();
> +
> + DEBUG_CODE_BEGIN ();
> + ///
> + /// Ensure the upper 7-bits [38:32] of MCHBAR are zero so we can access
> MCHBAR in 32-bit mode.
> + ///
> + MchBar = MmioRead32 (MmPciBase (SA_MC_BUS, SA_MC_DEV,
> SA_MC_FUN) +
> + R_SA_MCHBAR + 0x4) & 0x7F; if (MchBar != 0x0) {
> + DEBUG ((
> + DEBUG_ERROR,
> + "Error: [%a]:[%dL] MCHBAR configured to >4GB\n",
> + __FUNCTION__,
> + __LINE__
> + ));
> + }
> + ASSERT (MchBar == 0x0);
> + DEBUG_CODE_END ();
> +
> + MchBar = MmioRead32 (MmPciBase (SA_MC_BUS, SA_MC_DEV,
> SA_MC_FUN) +
> + R_SA_MCHBAR) &~BIT0;
> if (IsPchLinkDmi (CpuFamily) && (MmioRead16 (MmPciBase
> (SA_PEG_BUS_NUM, SA_PEG_DEV_NUM, SA_PEG10_FUN_NUM) +
> PCI_VENDOR_ID_OFFSET) != 0xFFFF)) {
> PegDisabled = MmioRead32 ((UINTN) MchBar +
> R_SA_MCHBAR_BIOS_RESET_CPL_OFFSET) & BIT3;
> } else {
> @@ -67,6 +85,8 @@ LoadCpuConfigLibPreMemConfigDefault (
> } else {
> CpuConfigLibPreMemConfig->FClkFrequency = 0; // 800MHz
> }
> +
> + CpuConfigLibPreMemConfig->PeciC10Reset = 1; // Disables Peci Reset
> + on C10 exit
> }
>
> /**
> --
> 2.27.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#79703): https://edk2.groups.io/g/devel/message/79703
Mute This Topic: https://groups.io/mt/84935132/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list