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.100; helo=mga07.intel.com; envelope-from=jian.j.wang@intel.com; receiver=edk2-devel@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 15410202E534E for ; Tue, 12 Feb 2019 17:14:04 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Feb 2019 17:14:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,364,1544515200"; d="scan'208";a="319891626" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga005.fm.intel.com with ESMTP; 12 Feb 2019 17:14:04 -0800 Received: from fmsmsx117.amr.corp.intel.com (10.18.116.17) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 12 Feb 2019 17:14:03 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx117.amr.corp.intel.com (10.18.116.17) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 12 Feb 2019 17:14:03 -0800 Received: from shsmsx107.ccr.corp.intel.com ([169.254.9.162]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.110]) with mapi id 14.03.0415.000; Wed, 13 Feb 2019 09:14:01 +0800 From: "Wang, Jian J" To: "Chiu, Chasel" , "edk2-devel@lists.01.org" CC: "Wu, Hao A" , "Ni, Ray" , "Zeng, Star" , "Gao, Liming" Thread-Topic: [PATCH 2/3] MdeModulePkg/PeiMain: Support EFI_PEI_CORE_FV_LOCATION_PPI Thread-Index: AQHUwtXMx55mByoFgU2VLpyL54pH+6Xc6+zw Date: Wed, 13 Feb 2019 01:14:00 +0000 Message-ID: References: <20190212131957.2576-1-chasel.chiu@intel.com> <20190212131957.2576-3-chasel.chiu@intel.com> In-Reply-To: <20190212131957.2576-3-chasel.chiu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMDM5OWY5MzgtOTJiOS00NGJjLTg0NWUtZjNiMjg3MWRjZGI4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiaDZLcjFcL255SjBTd2ZBR0Zxc2FhcDlwV2xqNlVaamV6SUs5N1RWaDRzd0tuTWZvekpjYlpzQ1lOb2phbDlybGYifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] 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: Wed, 13 Feb 2019 01:14:05 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Chasel, > -----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 >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1524 >=20 > 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. >=20 > Test: Verified on internal platform and booting successfully. >=20 > 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(-) >=20 > 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 >=20 > -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 BS= D > License > which accompanies this distribution. The full text of the license may b= e 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; >=20 > PeiCoreFileHandle =3D NULL; >=20 > // > - // Find the PEI Core in the BFV > + // Find the PEI Core either from EFI_PEI_CORE_FV_LOCATION_PPI indicate= d > 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 i= ndicated > FV. > + // > + for (Index =3D 0; Index < PrivateData->FvCount; Index ++) { > + if ((UINT32) PrivateData->Fv[Index].FvHandle !=3D (UINT32) > PeiCoreFvLocationPpi->PeiCoreFvLocation) { I think the UINT32 type cast is not necessary. FvHandle and PeiCoreFvLocati= on are actually type of VOID*. Do you encounter any compiler error here? Regards, Jian > + continue; > + } > + Status =3D PrivateData->Fv[Index].FvPpi->FindFileByType ( > + PrivateData->Fv[Index].Fv= Ppi, > + EFI_FV_FILETYPE_PEI_CORE, > + PrivateData->Fv[Index].Fv= Handle, > + &PeiCoreFileHandle > + ); > + if (!EFI_ERROR (Status)) { > + break; > + } > + } > + 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 > // > // 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 >=20 > -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 BS= D > License > which accompanies this distribution. The full text of the license may b= e found > at > @@ -49,6 +49,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY > KIND, EITHER EXPRESS OR IMPLIED. > #include > #include > #include > +#include >=20 > /// > /// It is an FFS type extension used for PeiFindFileEx. It indicates cur= rent > 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 >=20 > [Pcd] > gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize = ## > CONSUMES > -- > 2.13.3.windows.1