From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: chasel.chiu@intel.com) IronPort-SDR: lDtPFNcIBUlXsW2+jGS0UXLoN19X7TCYa5sZP3jOGjQrGhELoVVEMq77woIYb8i6kc8QMx8kXW qEEn8jvzpztQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False 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" 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-platforms: PATCH] Revert "MinPlatformPkg/PlatformInitPei: ReportCpuHobLib." Date: Tue, 21 Apr 2020 08:52:53 +0800 Message-Id: <20200421005253.6764-1-chasel.chiu@intel.com> X-Mailer: git-send-email 2.13.3.windows.1 The patch broke all OpenBoardPkg build so reverted: 944af47a8c83115dcd5dae581e5c3770a12a2ed2. Cc: Nate DeSimone Cc: Liming Gao Signed-off-by: Chasel Chiu --- Platform/Intel/MinPlatformPkg/PlatformInit/Library/ReportCpuHobLib/ReportCpuHobLib.c | 32 -------------------------------- Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.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/ReportCpuHobLib.inf | 27 --------------------------- 6 files changed, 26 insertions(+), 90 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/ReportCpuHobLib/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/ReportCpuHobLib.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 >= 0x80000008) { - AsmCpuid (0x80000008, &RegEax, NULL, NULL, NULL); - PhysicalAddressBits = (UINT8) RegEax; - } else { - PhysicalAddressBits = 36; - } - - /// - /// Create a CPU hand-off information - /// - BuildCpuHob (PhysicalAddressBits, 16); -} diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.c b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.c index 48cbe0dfbe..efdeb6a91c 100644 --- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.c +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.c @@ -1,7 +1,7 @@ /** @file Source code file for Platform Init Pre-Memory PEI module -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 **/ @@ -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; } +VOID +ReportCpuHob ( + VOID + ) +{ + UINT8 PhysicalAddressBits; + UINT32 RegEax; + + AsmCpuid (0x80000000, &RegEax, NULL, NULL, NULL); + if (RegEax >= 0x80000008) { + AsmCpuid (0x80000008, &RegEax, NULL, NULL, NULL); + PhysicalAddressBits = (UINT8) RegEax; + } else { + PhysicalAddressBits = 36; + } + + /// + /// Create a CPU hand-off information + /// + BuildCpuHob (PhysicalAddressBits, 16); +} + /** Install Firmware Volume Hob's once there is main memory 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/Intel/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 - SetCacheMtrrLib|Include/Library/SetCacheMtrrLib.h - - ReportCpuHobLib|Include/Library/ReportCpuHobLib.h +SetCacheMtrrLib|Include/Library/SetCacheMtrrLib.h [PcdsFixedAtBuild, PcdsPatchableInModule] diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc b/Platform/Intel/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/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.inf ReportFvLib|MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.inf - ReportCpuHobLib|MinPlatformPkg/PlatformInit/Library/ReportCpuHobLib/ReportCpuHobLib.inf TestPointCheckLib|MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.inf TestPointLib|MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.inf SetCacheMtrrLib|MinPlatformPkg/Library/SetCacheMtrrLib/SetCacheMtrrLibNull.inf diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/ReportCpuHobLib/ReportCpuHobLib.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/ReportCpuHobLib/ReportCpuHobLib.inf deleted file mode 100644 index ae6ec901a1..0000000000 --- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/ReportCpuHobLib/ReportCpuHobLib.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 = 0x00010005 - BASE_NAME = ReportCpuHobLib - FILE_GUID = F19AA754-CE24-448D-B755-1F939B00C25D - VERSION_STRING = 1.0 - MODULE_TYPE = BASE - LIBRARY_CLASS = ReportCpuHobLib - -[LibraryClasses] - BaseLib - HobLib - -[Packages] - MdePkg/MdePkg.dec - MinPlatformPkg/MinPlatformPkg.dec - -[Sources] - PeiReportFvLib.c -- 2.13.3.windows.1