From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.5455.1575010254989939616 for ; Thu, 28 Nov 2019 22:50:55 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: chasel.chiu@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Nov 2019 22:50:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,256,1571727600"; d="scan'208";a="203643817" Received: from kmsmsx157.gar.corp.intel.com ([172.21.138.134]) by orsmga008.jf.intel.com with ESMTP; 28 Nov 2019 22:50:52 -0800 Received: from pgsmsx111.gar.corp.intel.com ([169.254.2.24]) by kmsmsx157.gar.corp.intel.com ([169.254.5.66]) with mapi id 14.03.0439.000; Fri, 29 Nov 2019 14:50:52 +0800 From: "Chiu, Chasel" To: "Kubacki, Michael A" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" Subject: Re: [edk2-platforms][PATCH V2 32/47] WhiskeylakeOpenBoardPkg/WhiskeylakeURvp: Add FvAdvancedPreMemory Thread-Topic: [edk2-platforms][PATCH V2 32/47] WhiskeylakeOpenBoardPkg/WhiskeylakeURvp: Add FvAdvancedPreMemory Thread-Index: AQHVpYhYOpvFHHjNlEa8bJQKC1cwH6eht5Zw Date: Fri, 29 Nov 2019 06:50:51 +0000 Message-ID: <3C3EFB470A303B4AB093197B6777CCEC505B1F59@PGSMSX111.gar.corp.intel.com> References: <20191128010614.43628-1-michael.a.kubacki@intel.com> <20191128010614.43628-33-michael.a.kubacki@intel.com> In-Reply-To: <20191128010614.43628-33-michael.a.kubacki@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMTU4NTk1ZTEtYWNiOC00NmJmLWE5NGUtZDhhMDI0YWIxZjJkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiZEhIdUNlQ1wvMHNveUc0RDRkUmh3VkhSYWxnS01iVUp1T1J3OFBiaktkK01TUEVHOEE1VFJaU1o3aVFEc1JObngifQ== x-ctpclassification: CTP_NT x-originating-ip: [172.30.20.206] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Chasel Chiu > -----Original Message----- > From: Kubacki, Michael A > Sent: Thursday, November 28, 2019 9:06 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L > > Subject: [edk2-platforms][PATCH V2 32/47] > WhiskeylakeOpenBoardPkg/WhiskeylakeURvp: Add FvAdvancedPreMemory >=20 > This change adds a standalone firmware volume for pre-memory advanced > features called FvAdvancedPreMemory to the flash map. >=20 > Pre-memory advanced feature modules were previously kept in a child > firmware volume of FvAdvanced called FvAdvancedPreMem. This change > simplifies the flash layout and separation of pre-memory and post-memory > modules. >=20 > Cc: Chasel Chiu > Cc: Nate DeSimone > Signed-off-by: Michael Kubacki > Reviewed-by: Nate DeSimone > --- >=20 > Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/Fla > shMapInclude.fdf | 24 +++++----- >=20 > Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg. > fdf | 46 +++++++------------- > 2 files changed, 28 insertions(+), 42 deletions(-) >=20 > diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/F > lashMapInclude.fdf > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/ > FlashMapInclude.fdf > index 9209b9e88a..e0db381942 100644 > --- > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/F > lashMapInclude.fdf > +++ > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf > +++ /FlashMapInclude.fdf > @@ -1,12 +1,10 @@ > ## @file > -# FDF file of Platform. > -# > +# FDF file for the WhiskeylakeURvp board. > # > # Copyright (c) 2019, Intel Corporation. All rights reserved.
# # > SPDX-License-Identifier: BSD-2-Clause-Patent # -# ## >=20 >=20 > #=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D# > @@ -27,23 +25,25 @@ SET > gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize =3D > 0x00002000 > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareOffset > =3D 0x00020000 # Flash addr (0xFF820000) > SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize > =3D 0x00020000 # > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedOffset > =3D 0x00040000 # Flash addr (0xFF840000) > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize > =3D 0x00060000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset =3D > 0x000A0000 # Flash addr (0xFF8A0000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize > =3D 0x00050000 # > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset > =3D 0x00090000 # Flash addr (0xFF890000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecuritySize > =3D 0x00070000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset > =3D 0x00110000 # Flash addr (0xFF910000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset > =3D 0x00100000 # Flash addr (0xFF900000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootSize > =3D 0x00090000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset > =3D 0x001A0000 # Flash addr (0xFF9A0000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset > =3D 0x00190000 # Flash addr (0xFF990000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootSize > =3D 0x00190000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset > =3D 0x00330000 # Flash addr (0xFFB30000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset > =3D 0x00320000 # Flash addr (0xFFB20000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize > =3D 0x00170000 # > -SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset > =3D 0x004A0000 # Flash addr (0xFFCA0000) > +SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset > =3D 0x00490000 # Flash addr (0xFFC90000) > SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize > =3D 0x000B0000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset > =3D 0x00550000 # Flash addr (0xFFD50000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset > =3D 0x00540000 # Flash addr (0xFFD40000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize > =3D 0x00070000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset > =3D 0x005C0000 # Flash addr (0xFFDC0000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset > =3D 0x005B0000 # Flash addr (0xFFDB0000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMSize > =3D 0x000EC000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTOffset > =3D 0x006AC000 # Flash addr (0xFFEAC000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTOffset > =3D 0x0069C000 # Flash addr (0xFFE9C000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTSize > =3D 0x00014000 # > +SET > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemoryOffset =3D > 0x006B0000 # Flash addr (0xFFEB0000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemorySize > =3D 0x00010000 # > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryOffset > =3D 0x006C0000 # Flash addr (0xFFEC0000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemorySize > =3D 0x00140000 # >=20 > diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > kg.fdf > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > kg.fdf > index 8a4fd973b4..130930ad40 100644 > --- > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > kg.fdf > +++ > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > k > +++ g.fdf > @@ -175,6 +175,10 @@ > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTBase|gMinPlatformPkgToke > nSpaceGuid.P > # FSP_T Section > FILE =3D $(PLATFORM_FSP_BIN_PACKAGE)/Fsp_Rebased_T.fd >=20 > +gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemoryOffset|g > MinPla > +tformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemorySize > +gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemoryBase|gMi > nPlatf > +ormPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemorySize > +FV =3D FvAdvancedPreMemory > + >=20 > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryOffset|gMinPlatform > PkgTokenSpaceGuid.PcdFlashFvPreMemorySize >=20 > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryBase|gMinPlatformP > kgTokenSpaceGuid.PcdFlashFvPreMemorySize > FV =3D FvPreMemory > @@ -597,7 +601,10 @@ FILE FV_IMAGE =3D > C83522D9-80A1-4D95-8C25-3F1370497406 { > } > } >=20 > -[FV.FvAdvancedPreMem] > +# > +# Pre-memory Advanced Features > +# > +[FV.FvAdvancedPreMemory] > FvAlignment =3D 16 > ERASE_POLARITY =3D 1 > MEMORY_MAPPED =3D TRUE > @@ -620,7 +627,10 @@ FvNameGuid =3D > 6053D78A-457E-4490-A237-31D0FBE2F305 > INF $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf > !endif >=20 > -[FV.FvAdvancedPostMem] > +# > +# Post-Memory Advanced Features > +# > +[FV.FvAdvancedUncompact] > FvAlignment =3D 16 > ERASE_POLARITY =3D 1 > MEMORY_MAPPED =3D TRUE > @@ -639,31 +649,15 @@ READ_LOCK_CAP =3D TRUE > READ_LOCK_STATUS =3D TRUE > FvNameGuid =3D BE3DF86F-E464-44A3-83F7-0D27E6B88C27 >=20 > -[FV.FvAdvancedLate] > -FvAlignment =3D 16 > -ERASE_POLARITY =3D 1 > -MEMORY_MAPPED =3D TRUE > -STICKY_WRITE =3D TRUE > -LOCK_CAP =3D TRUE > -LOCK_STATUS =3D TRUE > -WRITE_DISABLED_CAP =3D TRUE > -WRITE_ENABLED_CAP =3D TRUE > -WRITE_STATUS =3D TRUE > -WRITE_LOCK_CAP =3D TRUE > -WRITE_LOCK_STATUS =3D TRUE > -READ_DISABLED_CAP =3D TRUE > -READ_ENABLED_CAP =3D TRUE > -READ_STATUS =3D TRUE > -READ_LOCK_CAP =3D TRUE > -READ_LOCK_STATUS =3D TRUE > -FvNameGuid =3D 11F6E304-43F9-4B2F-90AB-B8FFEAD6205D > - > !if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE > INF $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Dxe/TbtDxe.inf > INF $(PLATFORM_BOARD_PACKAGE)/Features/PciHotPlug/PciHotPlug.inf > INF > $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Smm/TbtSmm.inf > !endif >=20 > +# > +# Compressed FV with Post-Memory Advanced Features # > [FV.FvAdvanced] > BlockSize =3D $(FLASH_BLOCK_SIZE) > FvAlignment =3D 16 > @@ -684,17 +678,9 @@ READ_LOCK_CAP =3D TRUE > READ_LOCK_STATUS =3D TRUE > FvNameGuid =3D B23E7388-9953-45C7-9201-0473DDE5487A >=20 > -FILE FV_IMAGE =3D 35E7406A-5842-4F2B-BC62-19022C12AF74 { > - SECTION FV_IMAGE =3D FvAdvancedPreMem > - } > - > -FILE FV_IMAGE =3D F5DCB34F-27EA-48AC-9406-C894F6D587CA { > - SECTION FV_IMAGE =3D FvAdvancedPostMem > - } > - > FILE FV_IMAGE =3D 5248467B-B87B-4E74-AC02-398AF4BCB712 { > SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF > PROCESSING_REQUIRED =3D TRUE { > - SECTION FV_IMAGE =3D FvAdvancedLate > + SECTION FV_IMAGE =3D FvAdvancedUncompact > } > } >=20 > -- > 2.16.2.windows.1