From nobody Sat May 4 10:35:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+57669+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57669+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587430380; cv=none; d=zohomail.com; s=zohoarc; b=Z309LPbymMciHdrhXvanXPiyoUR3ZAtz7o38J8k4gByIHAB2KU43oOqfQnCbccmFqi2xPKBR0nn1RN1nce3jD5zwsZnh6Ac1PifYijJBL/Y81ZDR3vjjsFO72jCsnCnEEYwIFM4MbC8XB6OMHwgkKV/35LmryGcmj/Ht2Y9kJiA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587430380; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=UAQzw8w83spO/rId4N4Quu2+tKSyNeGr4WS8wBphQsU=; b=M0hUhehgNB95YXN7v5v30TmPWaKUiZiSzNASCEZSmD9Ks6nWf8Qor/Y0jRUARsoYhArxB8XZYyJfHEmtYWQ2EA3vAZIPqYFmROJ5V6xwWOeNeEYmdt/z4nFmMEsuGObsFQ6fS42AoDpkj6acifdKDT3v7uWzx4FiAKg+mkc+MgA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57669+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 1587430380113625.2519878127691; Mon, 20 Apr 2020 17:53:00 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id RBgWYY1788612xOUrpm9D8pl; Mon, 20 Apr 2020 17:52:59 -0700 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web11.503.1587430378765551708 for ; Mon, 20 Apr 2020 17:52:59 -0700 IronPort-SDR: lDtPFNcIBUlXsW2+jGS0UXLoN19X7TCYa5sZP3jOGjQrGhELoVVEMq77woIYb8i6kc8QMx8kXW qEEn8jvzpztQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2020 17:52:57 -0700 IronPort-SDR: 4NjGVUJ89fYeaNKS+Wqk0pJdQ/FLKORqk45nboe1j3s+YDk6Pu0BByU8p5i9EoqhCwJ2NuxxSr ELUucAIvkcLA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,408,1580803200"; d="scan'208";a="334101460" X-Received: from cchiu4-mobl1.gar.corp.intel.com ([10.254.108.57]) by orsmga001.jf.intel.com with ESMTP; 20 Apr 2020 17:52:56 -0700 From: "Chiu, Chasel" To: devel@edk2.groups.io Cc: Nate DeSimone , Liming Gao Subject: [edk2-devel] [edk2-platforms: PATCH] Revert "MinPlatformPkg/PlatformInitPei: ReportCpuHobLib." Date: Tue, 21 Apr 2020 08:52:53 +0800 Message-Id: <20200421005253.6764-1-chasel.chiu@intel.com> 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,chasel.chiu@intel.com X-Gm-Message-State: XdNazlCss1UiT0HbG7gWLYoNx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587430379; bh=aPbnyjOElmibQqLW282py1vBpBSvC1XQRlfrin67YlM=; h=Cc:Date:From:Reply-To:Subject:To; b=cvyjEvBZtzXVpAxeOMssRfL1c3HG6lqWqVEA/9eYAEK0USmv9W3GTWvUWQBof9yKESc mj5V7vkYZvUmiBMEL2qVi5dHa7aL2QDNyjFt2okIYzoAC53XFNuLkL0DxTR0ZPXoIyeo0 V9O4/lSL3JMn5TJ3ejQRQOMzZqdjoRHo8+U= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The patch broke all OpenBoardPkg build so reverted: 944af47a8c83115dcd5dae581e5c3770a12a2ed2. Cc: Nate DeSimone Cc: Liming Gao Signed-off-by: Chasel Chiu Reviewed-by: Liming Gao --- Platform/Intel/MinPlatformPkg/PlatformInit/Library/ReportCpuHobLib/ReportC= puHobLib.c | 32 -------------------------------- Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPre= Mem.c | 25 +++++++++++++++++++++++-- Platform/Intel/MinPlatformPkg/Include/Library/ReportCpuHobLib.h = | 23 ----------------------- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec = | 6 ++---- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc = | 3 +-- Platform/Intel/MinPlatformPkg/PlatformInit/Library/ReportCpuHobLib/ReportC= puHobLib.inf | 27 --------------------------- 6 files changed, 26 insertions(+), 90 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/ReportCpuHo= bLib/ReportCpuHobLib.c b/Platform/Intel/MinPlatformPkg/PlatformInit/Library= /ReportCpuHobLib/ReportCpuHobLib.c deleted file mode 100644 index aa2565343c..0000000000 --- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/ReportCpuHobLib/Re= portCpuHobLib.c +++ /dev/null @@ -1,32 +0,0 @@ -/** @file - Source code file for Report CPU HOB library. - -Copyright (c) 2020, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#include -#include - -VOID -ReportCpuHob ( - VOID - ) -{ - UINT8 PhysicalAddressBits; - UINT32 RegEax; - - AsmCpuid (0x80000000, &RegEax, NULL, NULL, NULL); - if (RegEax >=3D 0x80000008) { - AsmCpuid (0x80000008, &RegEax, NULL, NULL, NULL); - PhysicalAddressBits =3D (UINT8) RegEax; - } else { - PhysicalAddressBits =3D 36; - } - - /// - /// Create a CPU hand-off information - /// - BuildCpuHob (PhysicalAddressBits, 16); -} diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/Pla= tformInitPreMem.c b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInit= Pei/PlatformInitPreMem.c index 48cbe0dfbe..efdeb6a91c 100644 --- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformIn= itPreMem.c +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformIn= itPreMem.c @@ -1,7 +1,7 @@ /** @file Source code file for Platform Init Pre-Memory PEI module =20 -Copyright (c) 2017 - 2020, Intel Corporation. All rights reserved.
+Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -26,7 +26,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include -#include #include #include #include @@ -356,6 +355,28 @@ Done: return EFI_SUCCESS; } =20 +VOID +ReportCpuHob ( + VOID + ) +{ + UINT8 PhysicalAddressBits; + UINT32 RegEax; + + AsmCpuid (0x80000000, &RegEax, NULL, NULL, NULL); + if (RegEax >=3D 0x80000008) { + AsmCpuid (0x80000008, &RegEax, NULL, NULL, NULL); + PhysicalAddressBits =3D (UINT8) RegEax; + } else { + PhysicalAddressBits =3D 36; + } + + /// + /// Create a CPU hand-off information + /// + BuildCpuHob (PhysicalAddressBits, 16); +} + /** Install Firmware Volume Hob's once there is main memory =20 diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/ReportCpuHobLib.= h b/Platform/Intel/MinPlatformPkg/Include/Library/ReportCpuHobLib.h deleted file mode 100644 index 79e5d4efb2..0000000000 --- a/Platform/Intel/MinPlatformPkg/Include/Library/ReportCpuHobLib.h +++ /dev/null @@ -1,23 +0,0 @@ -/** @file - - Report CPU HOB library - - This library report the CPU HOB with Physical Address bits. - -Copyright (c) 2020, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef _REPORT_CPU_HOB_LIB_H_ -#define _REPORT_CPU_HOB_LIB_H_ - -#include -#include - -VOID -ReportCpuHob ( - VOID - ) - -#endif diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec b/Platform/In= tel/MinPlatformPkg/MinPlatformPkg.dec index 9e141d7b8e..7f74ac9380 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec @@ -6,7 +6,7 @@ # INF files to generate AutoGen.c and AutoGen.h files # for the build infrastructure. # -# Copyright (c) 2017 - 2020, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -68,9 +68,7 @@ TestPointLib|Include/Library/TestPointLib.h TestPointCheckLib|Include/Library/TestPointCheckLib.h =20 - SetCacheMtrrLib|Include/Library/SetCacheMtrrLib.h - - ReportCpuHobLib|Include/Library/ReportCpuHobLib.h +SetCacheMtrrLib|Include/Library/SetCacheMtrrLib.h =20 [PcdsFixedAtBuild, PcdsPatchableInModule] =20 diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc b/Platform/In= tel/MinPlatformPkg/MinPlatformPkg.dsc index b62351dac6..13a0fda272 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc @@ -1,7 +1,7 @@ ## @file # Platform description. # -# Copyright (c) 2017 - 2020, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -92,7 +92,6 @@ # FspWrapperPlatformLib|MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPla= tformLib/PeiFspWrapperPlatformLib.inf ReportFvLib|MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReport= FvLib.inf - ReportCpuHobLib|MinPlatformPkg/PlatformInit/Library/ReportCpuHobLib/Repo= rtCpuHobLib.inf TestPointCheckLib|MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestP= ointCheckLib.inf TestPointLib|MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.inf SetCacheMtrrLib|MinPlatformPkg/Library/SetCacheMtrrLib/SetCacheMtrrLibNu= ll.inf diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/ReportCpuHo= bLib/ReportCpuHobLib.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/Libra= ry/ReportCpuHobLib/ReportCpuHobLib.inf deleted file mode 100644 index ae6ec901a1..0000000000 --- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/ReportCpuHobLib/Re= portCpuHobLib.inf +++ /dev/null @@ -1,27 +0,0 @@ -### @file -# Component information file for the Report CPU HOB library. -# -# Copyright (c) 2020, Intel Corporation. All rights reserved.
-# -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -### - -[Defines] - INF_VERSION =3D 0x00010005 - BASE_NAME =3D ReportCpuHobLib - FILE_GUID =3D F19AA754-CE24-448D-B755-1F939B00C25D - VERSION_STRING =3D 1.0 - MODULE_TYPE =3D BASE - LIBRARY_CLASS =3D ReportCpuHobLib - -[LibraryClasses] - BaseLib - HobLib - -[Packages] - MdePkg/MdePkg.dec - MinPlatformPkg/MinPlatformPkg.dec - -[Sources] - PeiReportFvLib.c --=20 2.13.3.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 (#57669): https://edk2.groups.io/g/devel/message/57669 Mute This Topic: https://groups.io/mt/73163615/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-