From nobody Sun May 19 09:42:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39805+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39805+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556587816; cv=none; d=zoho.com; s=zohoarc; b=gzw0dLdEciaQkcWoPVSj6MIs5UR6tM2/1grE5CRc+AkKIQh9kBA3g4FF828naWbh/MPCivKhAopBzMF8A1qi2294iId9wdeTiVrC0Ub/Z4SBdcsTTuU/WdjMdQWRx5Q4hPjEENlynomkXv+PIKDl7b7mryhpNP3W1N6dBxx/BmA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556587816; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=BqmN7FS9KB5/o6SMnOmBounPh0Hzem2z7MxLnuFPAlM=; b=DK2BZH8QmjieRu46uX+S4UoFm0DVLVrjzAQt4f68kADyA7BJ5Jhkte6s4iKpe+D9yrVq1TiGK5PmA2f+lHszdjPdTCp5lVnUKGtVN3V/vFluL4lP7KXFSqeX30tS1L1I29Uq/gHSJ1K/0Imyx5YV82oH7V1IEljr6w6zjiKCDlw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39805+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 155658781646274.35422823370459; Mon, 29 Apr 2019 18:30:16 -0700 (PDT) Return-Path: X-Received: from mga04.intel.com (mga04.intel.com []) by groups.io with SMTP; Mon, 29 Apr 2019 18:30:15 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 18:30:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,411,1549958400"; d="scan'208";a="139954329" X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.111.157]) by orsmga006.jf.intel.com with ESMTP; 29 Apr 2019 18:30:14 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao Subject: [edk2-devel] [Patch V2 1/6] MdePkg: Add PcdSpeculationBarrierType Date: Mon, 29 Apr 2019 18:30:07 -0700 Message-Id: <20190430013012.24008-2-michael.d.kinney@intel.com> In-Reply-To: <20190430013012.24008-1-michael.d.kinney@intel.com> References: <20190430013012.24008-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556587816; bh=d0Q8TqK/+q0owxr983pVQf9MnVwXagRQJnK5ayoIj84=; h=Cc:Date:From:Reply-To:Subject:To; b=Mrzg93YJC2QFrwe7cMVT2mjEr3Szchev3apZxV5eH8MCJD+5q4zdkHqIEPrH2VfhjT3 ja01/m2cq7m5yg5tpTg0koCNb4GC3zfYFatLLuPIO8K8u1OTrCpI+ZmJ7jMvYXXtoUmDb DUpUboRHlyRhCsISQ4YkW+xmNArrOtUl8x4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add gEfiMdePkgTokenSpaceGuid.PcdSpeculationBarrierType that uses the PCD type FixedAtBuild. This performs a build time selection for the type of speculation barrier to use in the BaseLib function SpeculationBarrier(). The recommended speculation barrier for x86 is LFENCE and this is the default value for this PCD. x86 CPUs that do not support LFENCE must select one of the other supported values which includes CPUID and nothing. Cc: Liming Gao Signed-off-by: Michael D Kinney Reviewed-by: Laszlo Ersek --- MdePkg/MdePkg.dec | 9 +++++++++ MdePkg/MdePkg.uni | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index e2ea8fff66..28d4a966c2 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -2062,6 +2062,15 @@ [PcdsFixedAtBuild] # @Prompt Enable control flow enforcement. gEfiMdePkgTokenSpaceGuid.PcdControlFlowEnforcementPropertyMask|0x0|UINT3= 2|0x30001017 =20 + ## Indicates the type of instruction sequence to use for a speculation + # barrier. The default instruction sequence is LFENCE.

+ # 0x00 - No operation.
+ # 0x01 - LFENCE (IA32/X64).
+ # 0x02 - CPUID (IA32/X64).
+ # Other - reserved + # @Prompt Speculation Barrier Type. + gEfiMdePkgTokenSpaceGuid.PcdSpeculationBarrierType|0x01|UINT8|0x30001018 + [PcdsFixedAtBuild,PcdsPatchableInModule] ## Indicates the maximum length of unicode string used in the following # BaseLib functions: StrLen(), StrSize(), StrCmp(), StrnCmp(), StrCpy()= , StrnCpy()

diff --git a/MdePkg/MdePkg.uni b/MdePkg/MdePkg.uni index c359bb4b5b..5c1fa24065 100644 --- a/MdePkg/MdePkg.uni +++ b/MdePkg/MdePkg.uni @@ -149,6 +149,14 @@ = " BIT0 - SMM CET Shadow Stack is enabled.
\n" = " Other - reserved" =20 +#string STR_gEfiMdePkgTokenSpaceGuid_PcdSpeculationBarrierType_PROMPT #la= nguage en-US "Speculation Barrier Type." + +#string STR_gEfiMdePkgTokenSpaceGuid_PcdSpeculationBarrierType_HELP #lang= uage en-US "Indicates the type of instruction sequence to use for a specul= ation.barrier. The default instruction sequence is LFENCE.

\n" + = "0x00 - No operation.
\n" + = "0x01 - LFENCE (IA32/X64).
\n" + = "0x02 - CPUID (IA32/X64).
\n" + = "Other - reserved" + #string STR_gEfiMdePkgTokenSpaceGuid_PcdMaximumAsciiStringLength_PROMPT #= language en-US "Maximum Length of Ascii String" =20 #string STR_gEfiMdePkgTokenSpaceGuid_PcdMaximumAsciiStringLength_HELP #la= nguage en-US "Sets the maximum number of ASCII characters used for string f= unctions. This affects the following BaseLib functions: AsciiStrLen(), Asc= iiStrSize(), AsciiStrCmp(), AsciiStrnCmp(), AsciiStrCpy(), AsciiStrnCpy(). =

\n" --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39805): https://edk2.groups.io/g/devel/message/39805 Mute This Topic: https://groups.io/mt/31415900/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 09:42:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39806+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39806+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556587816; cv=none; d=zoho.com; s=zohoarc; b=MqBOmf48gDcQ1RioJ3ibP1uczuK6UcBV1RrBYotlGuiCF3MuRlp0dgRG7yXDKDNeSQP+J+E4g17v1j5haBhXxJGnCy2x3XB897Q/WxZKfDAD0kdgTuZ/fRpSzxvqCPC7SED27Gma71ljaxmSVsdzlziBVB4YsAKes3wvRF+zbpo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556587816; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=IEyeQDGx8+wQbSuSXnWURicc2AV/KI1DadSNCw7ocVc=; b=ltktKM3QpBSkb/pYNmCCtJRT6yJyUZuYyPlhDyPvV1D+yk9vXyCz9GsMc2/7pGnzbFYfy6k5d61Z4Q+ZaQ28ttAvKiiv1Y/QWRPa0Ip8fZQKG+vKjEximaf+ATJ4DQqeq+fZ/mfg6bUsOL/eFTNok/2FUVk+3hTAUlnsEkMuunw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39806+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556587816585331.1854415503492; Mon, 29 Apr 2019 18:30:16 -0700 (PDT) Return-Path: X-Received: from mga04.intel.com (mga04.intel.com []) by groups.io with SMTP; Mon, 29 Apr 2019 18:30:15 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 18:30:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,411,1549958400"; d="scan'208";a="139954332" X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.111.157]) by orsmga006.jf.intel.com with ESMTP; 29 Apr 2019 18:30:15 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao Subject: [edk2-devel] [Patch V2 2/6] MdePkg/BaseLib: Use PcdSpeculationBarrierType Date: Mon, 29 Apr 2019 18:30:08 -0700 Message-Id: <20190430013012.24008-3-michael.d.kinney@intel.com> In-Reply-To: <20190430013012.24008-1-michael.d.kinney@intel.com> References: <20190430013012.24008-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556587816; bh=AublY4DfG5/AUdr4MvQAKTIQ9YPTBAyMkywDtm45GvY=; h=Cc:Date:From:Reply-To:Subject:To; b=JY5sbWwIN/BZ2Cv/QQKrOd6Pwjhq+ro2RsqgifpGDT5NAVGtL+3bz00RmRqThW4SSFC 0THyM375kWF5GtFCpbzDLaGiNoEclUslNRZDywuk9/btb4LUxu9JAkyz/jov78pdoqfXj 5v3RCXlcF0FtDqCscTDpQSXwM37LXba4Zs4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Use PcdSpeculationBarrierType in the x86 implementation of SpeculationBarrier() to select between AsmLfence(), AsmCpuid(), and no operation. Cc: Liming Gao Signed-off-by: Michael D Kinney Reviewed-by: Brian J. Johnson Reviewed-by: Laszlo Ersek --- MdePkg/Library/BaseLib/BaseLib.inf | 1 + MdePkg/Library/BaseLib/X86SpeculationBarrier.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/Ba= seLib.inf index 533e83e0b2..3586beb0ab 100644 --- a/MdePkg/Library/BaseLib/BaseLib.inf +++ b/MdePkg/Library/BaseLib/BaseLib.inf @@ -394,6 +394,7 @@ [Pcd] gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength ## SOMETIMES_CO= NSUMES gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength ## SOMETIMES_CO= NSUMES gEfiMdePkgTokenSpaceGuid.PcdControlFlowEnforcementPropertyMask ## SOME= TIMES_CONSUMES + gEfiMdePkgTokenSpaceGuid.PcdSpeculationBarrierType ## SOMETIMES_CO= NSUMES =20 [FeaturePcd] gEfiMdePkgTokenSpaceGuid.PcdVerifyNodeInList ## CONSUMES diff --git a/MdePkg/Library/BaseLib/X86SpeculationBarrier.c b/MdePkg/Librar= y/BaseLib/X86SpeculationBarrier.c index 8e5f983bb8..b28fd8de9b 100644 --- a/MdePkg/Library/BaseLib/X86SpeculationBarrier.c +++ b/MdePkg/Library/BaseLib/X86SpeculationBarrier.c @@ -1,7 +1,7 @@ /** @file SpeculationBarrier() function for IA32 and x64. =20 - Copyright (C) 2018, Intel Corporation. All rights reserved.
+ Copyright (C) 2018 - 2019, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -22,5 +22,9 @@ SpeculationBarrier ( VOID ) { - AsmLfence (); + if (PcdGet8 (PcdSpeculationBarrierType) =3D=3D 0x01) { + AsmLfence (); + } else if (PcdGet8 (PcdSpeculationBarrierType) =3D=3D 0x02) { + AsmCpuid (0x01, NULL, NULL, NULL, NULL); + } } --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39806): https://edk2.groups.io/g/devel/message/39806 Mute This Topic: https://groups.io/mt/31415901/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 09:42:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39807+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39807+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556587816; cv=none; d=zoho.com; s=zohoarc; b=TiZ0YfZoFOngbULGE4aUJawwTcdJEKnouoo6nLP0xqFZwdQvXe1SEB5IEYD2wcCTITZNAUUk1jxuzNjBd0wq3mO0AxMA5+pHEdXN9ryPbASJnj3Rt8CXTa2uXYoNZyTDSV/fYNXrhsjgxETvWxWLABvO1g2MvHxuPUz8iFxlqGg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556587816; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=4xTlfv3P1aEoep+Bck24xXoCgkkM3nuBbEiGSmA0P5c=; b=NHiwxf2MbP2eGNMjNk4lN7kTpIycugcQWtm9nEwKwsxKTA1kJIjjp+JqNSoQbZTUAlQoE1jdeEN84o1KGn1+DxuTKUiESIKY+MbMw+lBqMG0iAruh0PwqBvES4R5GSlgGGVFktnflTPT3tPaEr4R7TXdt5rlgSeS+55CytnplTo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39807+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556587816859225.75443054968173; Mon, 29 Apr 2019 18:30:16 -0700 (PDT) Return-Path: X-Received: from mga04.intel.com (mga04.intel.com []) by groups.io with SMTP; Mon, 29 Apr 2019 18:30:16 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 18:30:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,411,1549958400"; d="scan'208";a="139954335" X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.111.157]) by orsmga006.jf.intel.com with ESMTP; 29 Apr 2019 18:30:15 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Kelly Steele Subject: [edk2-devel] [Patch V2 3/6] QuarkPlatformPkg: Set PcdSpeculationBarrierType to CPUID Date: Mon, 29 Apr 2019 18:30:09 -0700 Message-Id: <20190430013012.24008-4-michael.d.kinney@intel.com> In-Reply-To: <20190430013012.24008-1-michael.d.kinney@intel.com> References: <20190430013012.24008-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556587816; bh=TYJO5yk+M2ISKlOvPofPHzCcok7EOMRqK+4rfkQ5w5k=; h=Cc:Date:From:Reply-To:Subject:To; b=D1m1DPunuJIIIPfSF2Xl3Z2o/YG2Nl8fj9CzGTdxazMS97UEB+J/Wn202BhTVfZfY/u ryNoH0ELtUkSf3HFIkADmauB0Xya2ixB0aPwoxv6EwDp+MD9dvpjyI6dZQqUNDZgQutUA taZrxuBm1LQLjOeI4RFn1en8Cd3mUueXT74= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Set PcdSpeculationBarrierType to use CPUID instead of the default LFENCE in the BaseLib function SpeculationBarrier(). LFENCE requires SSE2, and Quark platforms do not support SSE2. Cc: Kelly Steele Signed-off-by: Michael D Kinney --- QuarkPlatformPkg/Quark.dsc | 7 ++++++- QuarkPlatformPkg/QuarkMin.dsc | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/QuarkPlatformPkg/Quark.dsc b/QuarkPlatformPkg/Quark.dsc index 422fd9cf8d..96ddc1565a 100644 --- a/QuarkPlatformPkg/Quark.dsc +++ b/QuarkPlatformPkg/Quark.dsc @@ -2,7 +2,7 @@ # Clanton Peak CRB platform with 32-bit DXE for 4MB/8MB flash devices. # # This package provides Clanton Peak CRB platform specific modules. -# Copyright (c) 2013 - 2018 Intel Corporation. +# Copyright (c) 2013 - 2019 Intel Corporation. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -448,6 +448,11 @@ [PcdsFixedAtBuild] gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName|L"QUARKREC.Cap" !endif =20 + # + # Quark does not support LFENCE. Use CPUID as speculation barrier + # + gEfiMdePkgTokenSpaceGuid.PcdSpeculationBarrierType|0x02 + [PcdsPatchableInModule] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803000C7 gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0 diff --git a/QuarkPlatformPkg/QuarkMin.dsc b/QuarkPlatformPkg/QuarkMin.dsc index 00e2febb54..8ca75bc474 100644 --- a/QuarkPlatformPkg/QuarkMin.dsc +++ b/QuarkPlatformPkg/QuarkMin.dsc @@ -406,6 +406,11 @@ [PcdsFixedAtBuild] =20 gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand|FALSE =20 + # + # Quark does not support LFENCE. Use CPUID as speculation barrier + # + gEfiMdePkgTokenSpaceGuid.PcdSpeculationBarrierType|0x02 + [PcdsPatchableInModule] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803000C7 gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0 --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39807): https://edk2.groups.io/g/devel/message/39807 Mute This Topic: https://groups.io/mt/31415902/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 09:42:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39808+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39808+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556587817; cv=none; d=zoho.com; s=zohoarc; b=mJEaMPzN0nErwCuM1KCxVHsPh0UpUqGJME0RL96B7Dp7jxCi4nVzb+z1Ynfk7kCZFITeEYiZkJcKTyrR3ng1QHFAvKFLIWyYFtbOZUSgDcUiXq8WhnbCXCbtIMSv559Ma0Ot9SiHW2fCudP9MY71riSOobCmitC2bRIGP9ZHSoY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556587817; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=/0QRNz6FsnXeuiAmzT24HHq2FVVKngRNevoSmQfSgHA=; b=gqyncrsge8r4UsKxkuWtN11HCwK42YLl3gK1+v6YYjACDf5TE9nevLHkDQ/MJzcwdsGSa6vwFj1ydEmUaRmJUyilIUY2ntsM2SzCi1yQFBSszJWb+lbUnn1dJ1/N8t8US3bSf/IPNsqRHUYl5rTJuW9etRI5Ag5yL3j+ORKRq8Q= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39808+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556587817068728.2372883614379; Mon, 29 Apr 2019 18:30:17 -0700 (PDT) Return-Path: X-Received: from mga04.intel.com (mga04.intel.com []) by groups.io with SMTP; Mon, 29 Apr 2019 18:30:16 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 18:30:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,411,1549958400"; d="scan'208";a="139954338" X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.111.157]) by orsmga006.jf.intel.com with ESMTP; 29 Apr 2019 18:30:15 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Laszlo Ersek Subject: [edk2-devel] [Patch V2 4/6] UefiCpuPkg/MpInitLib: Avoid MSR_IA32_APIC_BASE for single core Date: Mon, 29 Apr 2019 18:30:10 -0700 Message-Id: <20190430013012.24008-5-michael.d.kinney@intel.com> In-Reply-To: <20190430013012.24008-1-michael.d.kinney@intel.com> References: <20190430013012.24008-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556587816; bh=AGqbS+Ct/C/Pnb/cLze6YvVS8P3PHa9Ld+7KoM5gL2M=; h=Cc:Date:From:Reply-To:Subject:To; b=lT6O6yAzuAPWxRO5SLy8lqxNVCktD+HBo56HTq7JO/aVfmbGZRzleqvSbO249/awawJ OoFR1drc/84/Jh6SAm3nlHIcpYyplua79F38+BH7Qfp6jn9T8s+S++Gpx5hIz4wQjcFTT 2p97qWkQ2PVceEQg3PwU4ojj90OoE55qXI0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Avoid access to MSR_IA32_APIC_BASE that may not be supported on single core CPUs. If PcdCpuMaxLogicalProcessorNumber is 1, then there is only one CPU that must be the BSP. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Signed-off-by: Michael D Kinney --- UefiCpuPkg/Library/MpInitLib/PeiMpLib.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c b/UefiCpuPkg/Library/M= pInitLib/PeiMpLib.c index 35dff91fd2..5488049c08 100644 --- a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c @@ -1,7 +1,7 @@ /** @file MP initialize support functions for PEI phase. =20 - Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -101,6 +101,19 @@ GetCpuMpData ( MSR_IA32_APIC_BASE_REGISTER ApicBaseMsr; IA32_DESCRIPTOR Idtr; =20 + // + // If there is only 1 CPU, then it must be the BSP. This avoids an acce= ss to + // MSR_IA32_APIC_BASE that may not be supported on single core CPUs. + // + if (PcdGet32 (PcdCpuMaxLogicalProcessorNumber) =3D=3D 1) { + CpuMpData =3D GetCpuMpDataFromGuidedHob (); + ASSERT (CpuMpData !=3D NULL); + return CpuMpData; + } + + // + // Otherwise use MSR_IA32_APIC_BASE to determine if the CPU is BSP or AP. + // ApicBaseMsr.Uint64 =3D AsmReadMsr64 (MSR_IA32_APIC_BASE); if (ApicBaseMsr.Bits.BSP =3D=3D 1) { CpuMpData =3D GetCpuMpDataFromGuidedHob (); --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39808): https://edk2.groups.io/g/devel/message/39808 Mute This Topic: https://groups.io/mt/31415903/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 09:42:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39809+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39809+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556587817; cv=none; d=zoho.com; s=zohoarc; b=awy9PJwpX1jIVp58NMps52h70P7/g7Lz7wuHFymI/OOPJcMExqQi4MWBpKPpIfxiyNeysPN/tD0/AS8WGHeb1h506zFYIvxw4zu/YSFTX/yxDwu4P0/u77kY0GExZpErJC0aSrjXPhF6HQHXlPedEbYEObDvc5iPRiWzh7nj/uQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556587817; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=wMLbrWdXqv3atIu1Rd9wPMF5buvRG0tLngY969dHAgc=; b=ZImwhy+yHHYDQEuLFYqBIf3ZNCPFJ7pH9z+kjzZ1nKIdeg2Q7t78Ctuf3d3ef/ICrPcld0EgGba1Ods11n16U6632wKm3tejZ1jUejnU9T5c3sVaoDL7X+n9vDw7TUK9a6AG3TzsSS8WQ88piBOakutWu7XbT2qiBn4N1ny3qP4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39809+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556587817248581.9701248310207; Mon, 29 Apr 2019 18:30:17 -0700 (PDT) Return-Path: X-Received: from mga04.intel.com (mga04.intel.com []) by groups.io with SMTP; Mon, 29 Apr 2019 18:30:16 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 18:30:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,411,1549958400"; d="scan'208";a="139954342" X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.111.157]) by orsmga006.jf.intel.com with ESMTP; 29 Apr 2019 18:30:15 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Kelly Steele Subject: [edk2-devel] [Patch V2 5/6] QuarkSocPkg/SmmAccessDxe: Set region to UC on SMRAM close Date: Mon, 29 Apr 2019 18:30:11 -0700 Message-Id: <20190430013012.24008-6-michael.d.kinney@intel.com> In-Reply-To: <20190430013012.24008-1-michael.d.kinney@intel.com> References: <20190430013012.24008-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556587816; bh=NDiOzie9PuhzuqTJohO1cEMdtIb+8POOWHHIkMJj7Qk=; h=Cc:Date:From:Reply-To:Subject:To; b=k3qDJowOgEewmc2EVbh86EiTdduby6xl6BjD5RyWb74NHgl0NbkoZeXO4CvT4qheg4T KY4FHAAHa/LEUQg6rFC9w8dYPJRTFdsh/eqQqk4xE2fUiQHz7/fjR4ATcixuptQHDd2nI kw8WQm+UCKxrir18Y1XI+lVvmPsHPm8oy0o= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The following commit removed the unconditional UC setting just prior to closing the SMRAM region. This is a correct change for most platforms. https://github.com/tianocore/edk2/commit/bfc87aa78e77ed15b09d1b4499c5eab63e= 8842bb The Quark platforms still require this UC setting, so move the UC setting into the Quark specific SMM Access Protocol when the Close() service is called. Cc: Kelly Steele Signed-off-by: Michael D Kinney Reviewed-by: Kelly Steele --- .../Smm/Dxe/SmmAccessDxe/SmmAccess.inf | 3 ++- .../Smm/Dxe/SmmAccessDxe/SmmAccessDriver.c | 18 +++++++++++++++++- .../Smm/Dxe/SmmAccessDxe/SmmAccessDriver.h | 3 ++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccess.i= nf b/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccess.inf index db916f686a..405e9eb7fd 100644 --- a/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccess.inf +++ b/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccess.inf @@ -1,7 +1,7 @@ ## @file # Component description file for SmmAccess module # -# Copyright (c) 2013-2015 Intel Corporation. +# Copyright (c) 2013-2019 Intel Corporation. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -34,6 +34,7 @@ [LibraryClasses] S3BootScriptLib UefiDriverEntryPoint UefiBootServicesTableLib + DxeServicesTableLib PcdLib SmmLib =20 diff --git a/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccessDr= iver.c b/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccessDriver= .c index 6148dea1b4..830f8b83c3 100644 --- a/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccessDriver.c +++ b/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccessDriver.c @@ -2,7 +2,7 @@ This is the driver that publishes the SMM Access Protocol instance for the Tylersburg chipset. =20 -Copyright (c) 2013-2015 Intel Corporation. +Copyright (c) 2013-2019 Intel Corporation. =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -221,6 +221,7 @@ Returns: =20 --*/ { + EFI_STATUS Status; SMM_ACCESS_PRIVATE_DATA *SmmAccess; BOOLEAN OpenState; UINTN Index; @@ -239,6 +240,21 @@ Returns: return EFI_DEVICE_ERROR; } =20 + // + // Reset SMRAM cacheability to UC + // + for (Index =3D 0; Index < mSmmAccess.NumberRegions; Index++) { + DEBUG ((DEBUG_INFO, "SmmAccess->Close: Set to UC Base=3D%016lx Size= =3D%016lx\n", SmmAccess->SmramDesc[Index].CpuStart, SmmAccess->SmramDesc[In= dex].PhysicalSize)); + Status =3D gDS->SetMemorySpaceAttributes( + SmmAccess->SmramDesc[Index].CpuStart, + SmmAccess->SmramDesc[Index].PhysicalSize, + EFI_MEMORY_UC + ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_WARN, "SmmAccess: Failed to reset SMRAM window to EFI_= MEMORY_UC\n")); + } + } + // // Close TSEG // diff --git a/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccessDr= iver.h b/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccessDriver= .h index 80f73ba0e3..aca169d3e2 100644 --- a/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccessDriver.h +++ b/QuarkSocPkg/QuarkNorthCluster/Smm/Dxe/SmmAccessDxe/SmmAccessDriver.h @@ -3,7 +3,7 @@ Header file for SMM Access Driver. =20 This file includes package header files, library classes and protocol, PPI= & GUID definitions. =20 -Copyright (c) 2013-2015 Intel Corporation. +Copyright (c) 2013-2019 Intel Corporation. =20 SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -21,6 +21,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include +#include #include =20 // --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39809): https://edk2.groups.io/g/devel/message/39809 Mute This Topic: https://groups.io/mt/31415904/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 09:42:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39810+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39810+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556587817; cv=none; d=zoho.com; s=zohoarc; b=T/5itmcAvKmaA+7XH+UCtyuC/Fq8S7R28Id3brsUsTK1woj3qTWBwoB+u4wBY4p8dWgFNQ6fDqAtzNxh1u/TzKd11R3pwZ1PSw7NMSUjdsQLMYtQuQR6KhKrP+XHbJOt36aJK7kIIdO2JY/Fa2jGWv4IIEMWjs4kqqIViBX9v4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556587817; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=oyAT4+rChTsPjqu0Hj+38k3FXjK3Fs8S0Yy8czwlXOo=; b=bVmybqAT8oihtduxV0TKUrORFVAyT/1mUPY/6/3+mNtLkzdrVfrqmnFIxlu/Ic95p4NzfEhDemYEzf1MAXcet9o80aXfOJ2OiRYAV1pgH0ByPEF9Y892wV41oEUPJ/xp3RR/zM6v9SDt85NHg4/KQN32Fo4iSs6NDnov5sWyevU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39810+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556587817327790.5617932839793; Mon, 29 Apr 2019 18:30:17 -0700 (PDT) Return-Path: X-Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by groups.io with SMTP; Mon, 29 Apr 2019 18:30:16 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 18:30:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,411,1549958400"; d="scan'208";a="139954346" X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.111.157]) by orsmga006.jf.intel.com with ESMTP; 29 Apr 2019 18:30:15 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Kelly Steele Subject: [edk2-devel] [Patch V2 6/6] QuarkPlatformPkg/PlatformInit: Resolve ResetSystemLib name collision Date: Mon, 29 Apr 2019 18:30:12 -0700 Message-Id: <20190430013012.24008-7-michael.d.kinney@intel.com> In-Reply-To: <20190430013012.24008-1-michael.d.kinney@intel.com> References: <20190430013012.24008-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556587816; bh=fn+PsCRKjwFithrIjIBdj1ef1LZJ3ou6MtTZIluLfsw=; h=Cc:Date:From:Reply-To:Subject:To; b=MuWQ6vx6EdhkqvZ+Uk06IyJR90JuI/m2PGbcGH3ZndFA7iiZYp1eGjA59BHDnSTmxlr W4dtDSpJUdrrkUiqUiiKeYxJdEdSz9Ulp+EygTdXRmx4MV9lt5NQzeqiJ/4BcpvoIS69l DgYb6GR3VV8xVgQZrFTMwjQu5wHLNUbX7KU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Change function name from ResetSystem() to PlatformResetSystem() to resolve name collision with ResetSystemLib. Cc: Kelly Steele Signed-off-by: Michael D Kinney Reviewed-by: Kelly Steele --- QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c | 6 +++--- .../Platform/Pei/PlatformInit/PlatformEarlyInit.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c b/= QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c index cc2a6674d0..cfdcba8e02 100644 --- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c +++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c @@ -7,7 +7,7 @@ following action is performed in this file, 4. Set MTRR for PEI 5. Create FV HOB and Flash HOB =20 -Copyright (c) 2013 - 2016, Intel Corporation. +Copyright (c) 2013 - 2019, Intel Corporation. =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -20,7 +20,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 extern EFI_PEI_PPI_DESCRIPTOR mPpiStall[]; =20 -EFI_PEI_RESET_PPI mResetPpi =3D { ResetSystem }; +EFI_PEI_RESET_PPI mResetPpi =3D { PlatformResetSystem }; =20 EFI_PEI_PPI_DESCRIPTOR mPpiList[1] =3D { { @@ -40,7 +40,7 @@ EFI_PEI_PPI_DESCRIPTOR mPpiList[1] =3D { **/ EFI_STATUS EFIAPI -ResetSystem ( +PlatformResetSystem ( IN CONST EFI_PEI_SERVICES **PeiServices ) { diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h= b/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h index 6792538d42..84def44717 100644 --- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h +++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h @@ -1,7 +1,7 @@ /** @file The header file of Platform PEIM. =20 -Copyright (c) 2013 Intel Corporation. +Copyright (c) 2013 - 2019 Intel Corporation. =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -59,7 +59,7 @@ UpdateBootMode ( **/ EFI_STATUS EFIAPI -ResetSystem ( +PlatformResetSystem ( IN CONST EFI_PEI_SERVICES **PeiServices ); =20 --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39810): https://edk2.groups.io/g/devel/message/39810 Mute This Topic: https://groups.io/mt/31415905/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-