From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=chasel.chiu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id EDBF5201B0441 for ; Thu, 14 Feb 2019 02:32:33 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Feb 2019 02:32:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,368,1544515200"; d="scan'208";a="138549842" Received: from kmsmsx155.gar.corp.intel.com ([172.21.73.106]) by orsmga001.jf.intel.com with ESMTP; 14 Feb 2019 02:32:31 -0800 Received: from pgsmsx111.gar.corp.intel.com ([169.254.2.192]) by KMSMSX155.gar.corp.intel.com ([169.254.15.138]) with mapi id 14.03.0415.000; Thu, 14 Feb 2019 18:32:30 +0800 From: "Chiu, Chasel" To: "Ni, Ray" , "edk2-devel@lists.01.org" CC: "Wang, Jian J" , "Wu, Hao A" , "Zeng, Star" , "Gao, Liming" Thread-Topic: [PATCH 2/3] MdeModulePkg/PeiMain: Support EFI_PEI_CORE_FV_LOCATION_PPI Thread-Index: AQHUwtXMnwUvpFupq0+iu2Q1eFjttKXecH4AgACqpLA= Date: Thu, 14 Feb 2019 10:32:30 +0000 Message-ID: <3C3EFB470A303B4AB093197B6777CCEC502649D9@PGSMSX111.gar.corp.intel.com> References: <20190212131957.2576-1-chasel.chiu@intel.com> <20190212131957.2576-3-chasel.chiu@intel.com> <734D49CCEBEEF84792F5B80ED585239D5C0197FD@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <734D49CCEBEEF84792F5B80ED585239D5C0197FD@SHSMSX104.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNmY1N2M5ZWUtMGM0Mi00OGZiLWI5YTgtYTI0NzgwYTRiNjI0IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiS05GdlNFcVJNKzdUQ2RcL2ZWaGpQbnJqWU1OZDNjK3dFVVdPQ0xwNFdTNHdBYk9GbzEzZDduSHpJWkExZXlRWjAifQ== x-ctpclassification: CTP_NT x-originating-ip: [172.30.20.205] MIME-Version: 1.0 Subject: Re: [PATCH 2/3] MdeModulePkg/PeiMain: Support EFI_PEI_CORE_FV_LOCATION_PPI X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Feb 2019 10:32:34 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable > -----Original Message----- > From: Ni, Ray > Sent: Thursday, February 14, 2019 4:20 PM > To: Chiu, Chasel ; edk2-devel@lists.01.org > Cc: Wang, Jian J ; Wu, Hao A ; > Zeng, Star ; Gao, Liming > Subject: RE: [PATCH 2/3] MdeModulePkg/PeiMain: Support > EFI_PEI_CORE_FV_LOCATION_PPI >=20 > Sorry, please ignore my other review mail and just check this mail. > 3 minor comments below. >=20 > > -----Original Message----- > > From: Chiu, Chasel > > Sent: Tuesday, February 12, 2019 9:20 PM > > To: edk2-devel@lists.01.org > > Cc: Wang, Jian J ; Wu, Hao A > > ; Ni, Ray ; Zeng, Star > > ; Gao, Liming ; Chiu, > > Chasel > > Subject: [PATCH 2/3] MdeModulePkg/PeiMain: Support > > EFI_PEI_CORE_FV_LOCATION_PPI > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1524 > > > > When shadowing PeiCore the EFI_PEI_CORE_FV_LOCATION_PPI should be > > checked to see if PeiCore not in BFV, otherwise just shadowing PeiCore > > from BFV. > > > > Test: Verified on internal platform and booting successfully. > > > > Cc: Jian J Wang > > Cc: Hao Wu > > Cc: Ray Ni > > Cc: Star Zeng > > Cc: Liming Gao > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Chasel Chiu > > --- > > MdeModulePkg/Core/Pei/PeiMain/PeiMain.c | 58 > > +++++++++++++++++++++++++++++++++++++++++++++------------- > > MdeModulePkg/Core/Pei/PeiMain.h | 3 ++- > > MdeModulePkg/Core/Pei/PeiMain.inf | 3 ++- > > 3 files changed, 49 insertions(+), 15 deletions(-) > > > > diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c > > b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c > > index 4da80a8222..408f24c216 100644 > > --- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c > > +++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c > > @@ -1,7 +1,7 @@ > > /** @file > > Pei Core Main Entry Point > > > > -Copyright (c) 2006 - 2018, Intel Corporation. All rights > > reserved.
> > +Copyright (c) 2006 - 2019, Intel Corporation. All rights > > +reserved.
> > This program and the accompanying materials are licensed and made > > available under the terms and conditions of the BSD License which > > accompanies this distribution. The full text of the license may be > > found at @@ -80,23 +80,55 @@ ShadowPeiCore ( > > IN PEI_CORE_INSTANCE *PrivateData > > ) > > { > > - EFI_PEI_FILE_HANDLE PeiCoreFileHandle; > > - EFI_PHYSICAL_ADDRESS EntryPoint; > > - EFI_STATUS Status; > > - UINT32 AuthenticationState; > > + EFI_PEI_FILE_HANDLE PeiCoreFileHandle; > > + EFI_PHYSICAL_ADDRESS EntryPoint; > > + EFI_STATUS Status; > > + UINT32 AuthenticationState; > > + UINTN Index; > > + EFI_PEI_CORE_FV_LOCATION_PPI *PeiCoreFvLocationPpi; > > > > PeiCoreFileHandle =3D NULL; > > > > // > > - // Find the PEI Core in the BFV > > + // Find the PEI Core either from EFI_PEI_CORE_FV_LOCATION_PPI > > + indicated FV or BFV > > // > > - Status =3D PrivateData->Fv[0].FvPpi->FindFileByType ( > > - PrivateData->Fv[0].FvPpi, > > - EFI_FV_FILETYPE_PEI_CORE, > > - PrivateData->Fv[0].FvHandle, > > - &PeiCoreFileHandle > > - ); > > - ASSERT_EFI_ERROR (Status); > > + Status =3D PeiServicesLocatePpi ( > > + &gEfiPeiCoreFvLocationPpiGuid, > > + 0, > > + NULL, > > + (VOID **) &PeiCoreFvLocationPpi > > + ); > > + if (!EFI_ERROR (Status) && (PeiCoreFvLocationPpi->PeiCoreFvLocation > > + !=3D > > NULL)) { > > + // > > + // If PeiCoreFvLocation present, the PEI Core should be found > > + from > > indicated FV. > > + // > > + for (Index =3D 0; Index < PrivateData->FvCount; Index ++) { > > + if ((UINT32) PrivateData->Fv[Index].FvHandle !=3D (UINT32) > > PeiCoreFvLocationPpi->PeiCoreFvLocation) { > > + continue; > > + } > > + Status =3D PrivateData->Fv[Index].FvPpi->FindFileByType ( > > + PrivateData->Fv[Index].= FvPpi, > > + EFI_FV_FILETYPE_PEI_COR= E, > > + PrivateData->Fv[Index].= FvHandle, > > + &PeiCoreFileHandle > > + ); > > + if (!EFI_ERROR (Status)) { > > + break; > 1. Is it valid that PEI_CORE cannot be found in the PeiCoreFvLocation? > If no, why not assert here? Agree. I will update the code. >=20 > > + } > > + } > > + ASSERT (Index < PrivateData->FvCount); } else { > > + // > > + // Find PEI Core from BFV > > + // > > + Status =3D PrivateData->Fv[0].FvPpi->FindFileByType ( > > + PrivateData->Fv[0].FvPpi, > > + EFI_FV_FILETYPE_PEI_CORE, > > + PrivateData->Fv[0].FvHandle, > > + &PeiCoreFileHandle > > + ); > > + ASSERT_EFI_ERROR (Status); >=20 > 2. Seems to have code duplication here. Can we have a local PeiCoreFvInde= x to > be 0 as default? > And when the gEfiPeiCoreFvLocationPpiGuid PPI exists, PeiCoreFvIndex is > updated to the correct value. > So that FindFileByType() is only used once in source code with first para= meter > PrivateData->Fv[PeiCoreFvIndex].FvPpi. Good suggestion! I will optimize this code. >=20 > > + } > > > > // > > // Shadow PEI Core into memory so it will run faster diff --git > > a/MdeModulePkg/Core/Pei/PeiMain.h > b/MdeModulePkg/Core/Pei/PeiMain.h > > index 322e7cd845..38542ab072 > > 100644 > > --- a/MdeModulePkg/Core/Pei/PeiMain.h > > +++ b/MdeModulePkg/Core/Pei/PeiMain.h > > @@ -1,7 +1,7 @@ > > /** @file > > Definition of Pei Core Structures and Services > > > > -Copyright (c) 2006 - 2018, Intel Corporation. All rights > > reserved.
> > +Copyright (c) 2006 - 2019, Intel Corporation. All rights > > +reserved.
> > This program and the accompanying materials are licensed and made > > available under the terms and conditions of the BSD License which > > accompanies this distribution. The full text of the license may be > > found at @@ -49,6 +49,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS > OF > > ANY KIND, EITHER EXPRESS OR IMPLIED. > > #include #include > > #include > > +#include >=20 > 3. please move the #include adjacent to other #include Yes. >=20 > > > > /// > > /// It is an FFS type extension used for PeiFindFileEx. It indicates > > current diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf > > b/MdeModulePkg/Core/Pei/PeiMain.inf > > index 140c4444b1..5bab2aab8c 100644 > > --- a/MdeModulePkg/Core/Pei/PeiMain.inf > > +++ b/MdeModulePkg/Core/Pei/PeiMain.inf > > @@ -6,7 +6,7 @@ > > # 2) Dispatch PEIM from discovered FV. > > # 3) Handoff control to DxeIpl to load DXE core and enter DXE phase. > > # > > -# Copyright (c) 2006 - 2018, Intel Corporation. All rights > > reserved.
> > +# Copyright (c) 2006 - 2019, Intel Corporation. All rights > > +reserved.
> > # > > # This program and the accompanying materials # are licensed and > > made available under the terms and conditions of the BSD License @@ > > -102,6 > > +102,7 @@ > > gEfiTemporaryRamDonePpiGuid ## > SOMETIMES_CONSUMES > > gEfiPeiReset2PpiGuid ## SOMETIMES_CONSUMES > > gEfiSecHobDataPpiGuid ## SOMETIMES_CONSUMES > > + gEfiPeiCoreFvLocationPpiGuid ## SOMETIMES_CONSUMES > > > > [Pcd] > > gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize > > ## CONSUMES > > -- > > 2.13.3.windows.1