From nobody Fri May 10 18:17:56 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+39568+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+39568+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556214821; cv=none; d=zoho.com; s=zohoarc; b=KrSDzmL0RvMDRPH7RZZVLAUfNY8l5sHCjzc6MK9gRm40YnY3lXdNKn+qUhMk5zpVM3aHwwFCTMaSYU6ubB/nBdhJz/tWg0IIT8crUfkeN2HMJHGgRf+9XY+c3GTIyUUfzjh7wzfbPRLuoH3zvSBr/5EEmcoFy8iPcwJA+djxHbg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556214821; 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=O2GyWBTHn9G9nH38LBXo6SIiSXW9kXGJMFFlqv0fZA8=; b=nYG0mvA4TV4W8AXO/yOOOgnLkVrS5yaPQ05+2EWu3QyQwPGe7uW1AT18Fj62phC1M2U1ylHryz/qzwnLzevAxn4t6HPN/eWTPccjc8hXWK39pD47NWjK1un7mMzD7SfkzUhVWObC9A8h+6UrxZRQ7PFzgBTXRKuI2dsa7wloKXA= 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+39568+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 1556214821466524.9753711094369; Thu, 25 Apr 2019 10:53:41 -0700 (PDT) Return-Path: X-Received: from mga06.intel.com (mga06.intel.com []) by groups.io with SMTP; Thu, 25 Apr 2019 10:53:40 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2019 10:53:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,394,1549958400"; d="scan'208";a="134369330" X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.111.154]) by orsmga007.jf.intel.com with ESMTP; 25 Apr 2019 10:53:38 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao Subject: [edk2-devel] [Patch 1/4] MdePkg/BaseLib: Verify SSE2 support in IA32 AsmLfence() Date: Thu, 25 Apr 2019 10:53:31 -0700 Message-Id: <20190425175334.5944-2-michael.d.kinney@intel.com> In-Reply-To: <20190425175334.5944-1-michael.d.kinney@intel.com> References: <20190425175334.5944-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=1556214821; bh=tlP+HVoolsGDC3DCtyZOC/9lCIcst6+qPb3F4pBh570=; h=Cc:Date:From:Reply-To:Subject:To; b=cX99cRYnsmVNeVE7/oQUx/QSl0anxpAQ1hIn+3Ll9qdUPdpTQ+MgTgKcgX1TJ/teDNy 7KIeUr5nJeWoNAJ5Bul+gwnBYIhNSDjOwmN0K1uk7STxmzg0ZACkOTzmjJhGOhbz6Tl+j lHsspbrKJWdFQQid1JVljynaliQXEdhhLRE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Use CPUID in IA32 implementation of AsmLfence() to verify that SSE2 is supported before using the LFENCE instruction. Cc: Liming Gao Signed-off-by: Michael D Kinney --- MdePkg/Library/BaseLib/Ia32/Lfence.nasm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/MdePkg/Library/BaseLib/Ia32/Lfence.nasm b/MdePkg/Library/BaseL= ib/Ia32/Lfence.nasm index 44478be35f..0a60ae1d57 100644 --- a/MdePkg/Library/BaseLib/Ia32/Lfence.nasm +++ b/MdePkg/Library/BaseLib/Ia32/Lfence.nasm @@ -1,5 +1,5 @@ ;-------------------------------------------------------------------------= ----- ; -; Copyright (c) 2018, Intel Corporation. All rights reserved.
+; Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.
; SPDX-License-Identifier: BSD-2-Clause-Patent ; ; Module Name: @@ -26,5 +26,17 @@ ;-------------------------------------------------------------------------= ----- global ASM_PFX(AsmLfence) ASM_PFX(AsmLfence): + ; + ; Use CPUID instruction (CPUID.01H:EDX.SSE2[bit 26] =3D 1) to test whe= ther the + ; processor supports SSE2 instruction. Save/restore non-volatile regi= ster + ; EBX that is modified by CPUID + ; + push ebx + mov eax, 1 + cpuid + bt edx, 26 + jnc Done lfence +Done: + pop ebx ret --=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 (#39568): https://edk2.groups.io/g/devel/message/39568 Mute This Topic: https://groups.io/mt/31345225/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 Fri May 10 18:17:56 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+39567+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+39567+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556214821; cv=none; d=zoho.com; s=zohoarc; b=cqTKIWcw4Udu8SXijeqmko+FgMzaLbckB901xgAMQd6axDvBTYSbn8bBBGTbARtghhXFlNVs3exkNVH2E7ezAtZDB/ZR+C6RHnlIJlk+viraTRx/jTnPRCnh6+GG4zFUevmmjbrCEvXvo/D4zZzQYEHLeN0LERZu3nIY/RBNepM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556214821; 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=aj68Bcm6qJVMmUeRy7iEfzwI9MItFVrUk/1X00cWTAc=; b=LsdBm8rBniYaa/zMYRVW//oA9xQmaSzxuf1fy9hilg/jYLx+6R5CKm5SQQvHohV5WF8JNMka1G81WTO87MEtJVAuVPPqNurr7/ZW5yKIpbw5qAPOu1JNbLkZ1MWPsqF+bzihisZHlcxVwJZHRUPMXT5c93zlqnl/EMJXFgTSUA4= 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+39567+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 15562148212641020.5536480900123; Thu, 25 Apr 2019 10:53:41 -0700 (PDT) Return-Path: X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by groups.io with SMTP; Thu, 25 Apr 2019 10:53:40 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2019 10:53:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,394,1549958400"; d="scan'208";a="134369333" X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.111.154]) by orsmga007.jf.intel.com with ESMTP; 25 Apr 2019 10:53:38 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Laszlo Ersek Subject: [edk2-devel] [Patch 2/4] UefiCpuPkg/MpInitLib: Avoid MSR_IA32_APIC_BASE for single core Date: Thu, 25 Apr 2019 10:53:32 -0700 Message-Id: <20190425175334.5944-3-michael.d.kinney@intel.com> In-Reply-To: <20190425175334.5944-1-michael.d.kinney@intel.com> References: <20190425175334.5944-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=1556214820; bh=Zi93hhHTnX0rtVY3I8O0MMWktpBNsTaqpIAy7oaNJ+4=; h=Cc:Date:From:Reply-To:Subject:To; b=aWu7JWguTr14t9CUlDbEnEpm/4rwpFDMJZh/8hTtNjm9sU0+PN6m4Pgeafi5DnPoQp1 pq0KE8YrgDN1+SpRRxl74PduGJ8LBYbIPsofzYlzIXxJDIgogq2mMzeunspeQ3E5BOUYd +jbF+7IH3+ApksK/a9I/sTDZJaVyBozDrX0= 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 Reviewed-by: Eric Dong Reviewed-by: Ray Ni --- 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 (#39567): https://edk2.groups.io/g/devel/message/39567 Mute This Topic: https://groups.io/mt/31345224/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 Fri May 10 18:17:56 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+39569+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+39569+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556214821; cv=none; d=zoho.com; s=zohoarc; b=OP3A79ODB9Arj23Mq4OuiTklIaVxLkOyy0H4SenX0AkYb6FBygJv7UWuDdjlf2bKf96o0xh8hzryxb8qdHZV+fVosufdMsh2C98DfoCOkm5maxFQ7NDeHTM2u6aeze7YpLbDzFD8WHChl+MMmmg4VkBdljknAd2W45Nxguvt2Wk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556214821; 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=AuFsO93OD0Pj+a7g4qeqrpkcGs39ftOgmklhTYGgxPo=; b=CvFA0w/sPhoGH0VlzKnq26OVyaq17Ar875JxGP5VGpI3oMJKcAtQls8q5OoZr3ydNFPM8Ab63OadbFfBLFdVs6MxZGZUMwpFbiF7a51i4idOgmn0yDq6HBNQxwQYt8aszkKbrT586orTY2hYbB6hviyOGCgC5XOcWPsiFtCkASg= 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+39569+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 1556214821491601.1899519813866; Thu, 25 Apr 2019 10:53:41 -0700 (PDT) Return-Path: X-Received: from mga06.intel.com (mga06.intel.com []) by groups.io with SMTP; Thu, 25 Apr 2019 10:53:40 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2019 10:53:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,394,1549958400"; d="scan'208";a="134369336" X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.111.154]) by orsmga007.jf.intel.com with ESMTP; 25 Apr 2019 10:53:38 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Kelly Steele Subject: [edk2-devel] [Patch 3/4] QuarkSocPkg/SmmAccessDxe: Set region to UC on SMRAM close Date: Thu, 25 Apr 2019 10:53:33 -0700 Message-Id: <20190425175334.5944-4-michael.d.kinney@intel.com> In-Reply-To: <20190425175334.5944-1-michael.d.kinney@intel.com> References: <20190425175334.5944-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=1556214821; bh=TrSf4oyhQ9OkzmVna0utZ593IdLA2ygOB/+5V6wNqLU=; h=Cc:Date:From:Reply-To:Subject:To; b=lqKccuCQ/tLl5Djh9bpTZERKIxUvaE/JlpuygzJKjnJYX1V5wZ5tHpvLsqHlZqKVM+2 rVYNks+wC5rq3fmz73uP7OKiBXcEgKhpB+oQU5hDczijds7NTQqqePoiIsvQKoXdPO9pE qBnrXico37vxWkJNXfX7LriyWuxgJIxvEP8= 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..205f51ddb0 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")); + } + } + =20 // // 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 (#39569): https://edk2.groups.io/g/devel/message/39569 Mute This Topic: https://groups.io/mt/31345226/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 Fri May 10 18:17:56 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+39566+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+39566+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556215001; cv=none; d=zoho.com; s=zohoarc; b=TVmSQ/eVzbAuLsjq70R/iQKjUNxiYBm3p0ROjqzkNa1ubA8/LCdvAmwHJyJRfblgKOKbMAVCEAP2MykApqKXwl2Pzm/JSnYSo1KqPMMlZHERHgnRenL78MTsmzm+OCHtuq7yNjsLGReTKNxDvNiX0EOgelPim0sunVgCwORIeRA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556215001; 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=YDLx723ShGo3oDDe8HZRLhvDZeruRt8dDqnDfYyRME8=; b=So0zdblB3JbelTWMlmDTWXp5Tv9gUOuNCO+NtjXBdoV96S7xUR4xVp1Y/tdulih64Ci25B3knSvi4qSw8u0FrtWWTDeprR59wFztswewVsJ828jj+Y8Sab4uaWRGDHB27fyXy5iAM+CkeK0nfhhIF/okTyxwtW623hnqHxKy34A= 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+39566+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 1556215001167855.4705915328194; Thu, 25 Apr 2019 10:56:41 -0700 (PDT) Return-Path: X-Received: from mga06.intel.com (mga06.intel.com []) by groups.io with SMTP; Thu, 25 Apr 2019 10:53:40 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2019 10:53:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,394,1549958400"; d="scan'208";a="134369339" X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.111.154]) by orsmga007.jf.intel.com with ESMTP; 25 Apr 2019 10:53:38 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Kelly Steele Subject: [edk2-devel] [Patch 4/4] QuarkPlatformPkg/PlatformInit: Resolve ResetSystemLib name collision Date: Thu, 25 Apr 2019 10:53:34 -0700 Message-Id: <20190425175334.5944-5-michael.d.kinney@intel.com> In-Reply-To: <20190425175334.5944-1-michael.d.kinney@intel.com> References: <20190425175334.5944-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=1556215000; bh=0DL9FgahwGlHH/iAuZq5Hwlxm6vW5emw1hY5l29ZhuQ=; h=Cc:Date:From:Reply-To:Subject:To; b=E+RummgPrlJ/oaPyUCpL8Ew1/valpGxIEcxsYVwK+j+SZcQVyOCdb4HnulzEcg5yGjf dzPSEojMQxEfOMvU8BNQ0zniXs4R11bhZ7pyRAMTlY97rzyotfE6KneCz6z78Dcz2+D2U j6mo7/FDfQdHbyOwX8sNluibynMxDcS+NTE= 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 Reviewed-by: Liming Gao --- 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 (#39566): https://edk2.groups.io/g/devel/message/39566 Mute This Topic: https://groups.io/mt/31345223/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-