From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web10.511.1587430704479506347 for ; Mon, 20 Apr 2020 17:58:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=lWQDv34S; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: liming.gao@intel.com) IronPort-SDR: 7aM2ui+NUWnN4JeiARG2WxCOhW8yhr8N8iqcD2P2k1ImWqXiXBT+I63ly2QBcrPShJ1dnVZYPZ cxJKQUP93Vmg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2020 17:58:24 -0700 IronPort-SDR: u3rayTgdtsK6lhRjKYLHdGGLJrVvK4iSY6ui/TbPLkBqAO5viClM4XPKkCKyvPPlsaoPxsZeQ/ b5OMR/l5hITA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,408,1580803200"; d="scan'208";a="429336668" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga005.jf.intel.com with ESMTP; 20 Apr 2020 17:58:24 -0700 Received: from fmsmsx151.amr.corp.intel.com (10.18.125.4) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 20 Apr 2020 17:58:23 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by FMSMSX151.amr.corp.intel.com (10.18.125.4) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 20 Apr 2020 17:58:17 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.170) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 20 Apr 2020 17:57:46 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WoqriFDbmM9W7zJ2tHtiqxEqRviR+HLp8SLs79on6/tlA26wJGI8UdWRyPPveSBdma7vZgOIrc674aXp4G8A7BmZxnmi1AIDPDB+9O4Yv9z9IIeqXzm3JKPxnHuoFgwGhirTVpdd3T65cFx8S0zOhmoMri9CHNcJ2LtFHMZ7WwfNftGEa1AbRYxLziF5Roti5wEvWYfNnHnvL0S61Ps9HhZvJmlqddxlFh4KATFI2OnBi2f+n8p+k9TOon0LP/NHzWXk91S8gmENmnin94pd1Gk4KBp+m2eCLatt+gqadmDYyU3RKuuAFTayciYoHwPN+MBYYN+ga4CmdyVEF2v8Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aVY1ZRSt74ooxo+W73mrPszAD8aafDuCOUUqs3a4fVY=; b=c+GwJajRcEVdsC33fznO6+11HG9viqzhjW+EXARYlkcU+tcf5G01UNp9bfSGAv4v+l4ad/mJeUkVxj6WuTKUEd6QnOzx9D7xfawHO4cWRufhPTCMXMOv0CfPZ9vw0XdhA7FnekvmXBwzQNAwIxkEB9+uN+01BHztFxX9gF1wJpHcGwKArlFw4NRipe6GHCZtMC16JAU5eO6WYm/Cs8xlDW1+D8ev0Jb6T63XecuC3Am8xI+1CqsRhYZZnbLV3PZCfA8Bg//xEJVFpeUxaWUGGpVhyfyf9CvsZjdXEQZ+Nh5Hyk53yegKgaQY1LaW/U8O13rC+P+wagqVu/t8XJJ3Xg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aVY1ZRSt74ooxo+W73mrPszAD8aafDuCOUUqs3a4fVY=; b=lWQDv34SL8HtUqU1yzRnY9zsJVmb/4PsZE/cJ6W+TGiCWQLOY6LBi2A03pvm3MEHM8uwO8EUuCRPhRY3+F/oPy9ylu9FKQHHmh9ktfp2v3TkrKetXHuxsYnFCdcvf2qysuuj+SHYbKt6KdmsyX0DL2aSaKN3X/Ql4QCrrQB333Y= Received: from BN6PR11MB3972.namprd11.prod.outlook.com (2603:10b6:405:7f::11) by BN6PR11MB1409.namprd11.prod.outlook.com (2603:10b6:404:46::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Tue, 21 Apr 2020 00:57:44 +0000 Received: from BN6PR11MB3972.namprd11.prod.outlook.com ([fe80::4dcc:bc5c:def:9ae9]) by BN6PR11MB3972.namprd11.prod.outlook.com ([fe80::4dcc:bc5c:def:9ae9%5]) with mapi id 15.20.2921.027; Tue, 21 Apr 2020 00:57:44 +0000 From: "Liming Gao" To: "Chiu, Chasel" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" Subject: Re: [edk2-platforms: PATCH] Revert "MinPlatformPkg/PlatformInitPei: ReportCpuHobLib." Thread-Topic: [edk2-platforms: PATCH] Revert "MinPlatformPkg/PlatformInitPei: ReportCpuHobLib." Thread-Index: AQHWF3dBomGbN7seHky4OZzgM8vwwaiCwMdQ Date: Tue, 21 Apr 2020 00:57:44 +0000 Message-ID: References: <20200421005253.6764-1-chasel.chiu@intel.com> In-Reply-To: <20200421005253.6764-1-chasel.chiu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.2.0.6 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: spf=none (sender IP is ) smtp.mailfrom=liming.gao@intel.com; x-originating-ip: [192.55.52.217] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 659358e0-c55f-4e6c-eec8-08d7e58f0087 x-ms-traffictypediagnostic: BN6PR11MB1409: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6108; x-forefront-prvs: 038002787A x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN6PR11MB3972.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10019020)(39860400002)(136003)(396003)(346002)(376002)(366004)(66446008)(66946007)(76116006)(66556008)(66476007)(64756008)(5660300002)(110136005)(4326008)(8936002)(71200400001)(7696005)(8676002)(52536014)(81156014)(186003)(26005)(9686003)(316002)(86362001)(33656002)(478600001)(53546011)(107886003)(2906002)(55016002)(6506007);DIR:OUT;SFP:1102; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: RIWPpaSsvBPQfIh1G8w48w6KBT02vC1+4CDm8spBZpmWTl6kJ87dX8aM7QVMgV5p3YtuGm5+p7CG31q2gCQuyhyikwxRL5HSIvBIa+llvsewmMEK33NzVdkFuszMmJWGD+gW9iAnB2Vv0vkC8mrHO1mRI4BMSO394X3WOttPbLcA3eD5chBIwB/wnwKZQ6znPMg0z+MkUJRnHARtpwHOvv6DsocqH0G2T4xNTMtvTkZq6SIuX3JKjXghv9dy38Px/k0GZYZd2ethG/fPFSuBrwrwXu2va2YDF2bKUTzPNdejqHXN7hj+4kQtWo/rnumXM7eHzIWY1u6qzpEHHyvcF+rV5m1FqUoOUiiJMb4W/nAle8MZFh7frnfduBqHR07kqjftJiQQFvO/Yoei/tBnjJmLvBY4+pxtHrKuFBpwVzWRVfwEgDN87uoVTbl8seKA x-ms-exchange-antispam-messagedata: FVtVtTUQZ2GeS/M1/1ltW4D4VKTByEnn3eN5Ls+8HK4WCryJipzKNzsfAkNvQg4tRHonuNvcDURQAEyHYX88qyQ6uMoVp7qI+21iPGqTYFQ2cGxi0GvkiCoY1Tjefxaa1Fq0gc1d/P1TXtxZMsPiTA== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 659358e0-c55f-4e6c-eec8-08d7e58f0087 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Apr 2020 00:57:44.6088 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: A+Z6C660snBx4oLPfdjgp1UEn0nUIp5MBbckFAUSHU8ejcr1iVHyGHz9v3sbjdgjjQySuHFSroQxPz13HXrSpw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1409 Return-Path: liming.gao@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao -----Original Message----- From: Chiu, Chasel =20 Sent: 2020=1B$BG/=1B(B4=1B$B7n=1B(B21=1B$BF|=1B(B 8:53 To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Gao, Liming Subject: [edk2-platforms: PATCH] Revert "MinPlatformPkg/PlatformInitPei: Re= portCpuHobLib." 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/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/Mi= nPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.c b/Platform/I= ntel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.c index 48cbe0dfbe..efdeb6a91c 100644 --- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformIn= itPreMem.c +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/Platfor +++ mInitPreMem.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 <= Guid/MemoryTypeInformation.h> #include #includ= e @@ -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=20 + 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 inf= rastructure. # -# Copyright (c) 2017 - 2020, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2019, Intel Corporation. All rights=20 +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=20 +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.in= f 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.
-# -# SP= DX-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 -- 2.13.3.windows.1