From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web10.5388.1575009915657530909 for ; Thu, 28 Nov 2019 22:45:15 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: chasel.chiu@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Nov 2019 22:45:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,256,1571727600"; d="scan'208";a="384001999" Received: from kmsmsx155.gar.corp.intel.com ([172.21.73.106]) by orsmga005.jf.intel.com with ESMTP; 28 Nov 2019 22:45:13 -0800 Received: from pgsmsx106.gar.corp.intel.com (10.221.44.98) by KMSMSX155.gar.corp.intel.com (172.21.73.106) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 29 Nov 2019 14:45:12 +0800 Received: from pgsmsx111.gar.corp.intel.com ([169.254.2.24]) by PGSMSX106.gar.corp.intel.com ([10.221.44.98]) with mapi id 14.03.0439.000; Fri, 29 Nov 2019 14:45:12 +0800 From: "Chiu, Chasel" To: "Kubacki, Michael A" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" Subject: Re: [edk2-platforms][PATCH V2 30/47] KabylakeOpenBoardPkg/KabylakeRvp3: Add FvAdvancedPreMemory Thread-Topic: [edk2-platforms][PATCH V2 30/47] KabylakeOpenBoardPkg/KabylakeRvp3: Add FvAdvancedPreMemory Thread-Index: AQHVpYhTK2p5uqNZ0kqTqDwbs43ZD6ehtf/w Date: Fri, 29 Nov 2019 06:45:12 +0000 Message-ID: <3C3EFB470A303B4AB093197B6777CCEC505B1F1E@PGSMSX111.gar.corp.intel.com> References: <20191128010614.43628-1-michael.a.kubacki@intel.com> <20191128010614.43628-31-michael.a.kubacki@intel.com> In-Reply-To: <20191128010614.43628-31-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: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiY2ZlMmVhNzEtMGQyNC00ZTBiLWE5MzgtNzViMTE5MjI0ZTI2IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiN084OVdZSG1MNVZcL3lxZWltSVhnXC8zT2N6S0VEdktyU3JQZ0p5NVBQQ2N0SFc4YXdBaTdoUjRkQlM5WjltRWQrIn0= x-ctpclassification: CTP_NT x-originating-ip: [172.30.20.206] MIME-Version: 1.0 Return-Path: chasel.chiu@intel.com 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 30/47] > KabylakeOpenBoardPkg/KabylakeRvp3: 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/KabylakeOpenBoardPkg/KabylakeRvp3/Include/Fdf/FlashMapI > nclude.fdf | 30 +++++++------ > Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > | 46 +++++++------------- > 2 files changed, 32 insertions(+), 44 deletions(-) >=20 > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/Fdf/FlashMa > pInclude.fdf > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/Fdf/FlashMa > pInclude.fdf > index 6cb49c941c..b5e3f66cea 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/Fdf/FlashMa > pInclude.fdf > +++ > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/Fdf/Flash > +++ MapInclude.fdf > @@ -1,5 +1,5 @@ > ## @file > -# FDF file of Platform. > +# FDF file for the KabylakeRvp3 board. > # > # Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
= # > @@ -19,28 +19,30 @@ DEFINE FLASH_NUM_BLOCKS > =3D 0x00000080 > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageOffset > =3D 0x00000000 # Flash addr (0xFF800000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageSize > =3D 0x00040000 # > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageVariableOffset =3D > 0x00000000 # Flash addr (0xFF800000) > -SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize > =3D 0x0001E000 # > +SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize > =3D 0x0001E000 # > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingOffset > =3D 0x0001E000 # Flash addr (0xFF81E000) > -SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize > =3D 0x00002000 # > +SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize > =3D > +0x00002000 # > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareOffset > =3D 0x00020000 # Flash addr (0xFF820000) > -SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize > =3D 0x00020000 # > +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 0x001E0000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset > =3D 0x00380000 # Flash addr (0xFFB80000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset > =3D 0x00370000 # Flash addr (0xFFB70000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize > =3D 0x00180000 # > -SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset > =3D 0x00500000 # Flash addr (0xFFD00000) > -SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize > =3D 0x000A0000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset > =3D 0x005A0000 # Flash addr (0xFFDA0000) > +SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset > =3D 0x004F0000 # Flash addr (0xFFCF0000) > +SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize > =3D 0x000A0000 # > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset > =3D 0x00590000 # Flash addr (0xFFD90000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize > =3D 0x00060000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset > =3D 0x00600000 # Flash addr (0xFFE00000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset > =3D 0x005F0000 # Flash addr (0xFFDF0000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMSize > =3D 0x000BC000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTOffset > =3D 0x006BC000 # Flash addr (0xFFEBC000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTOffset > =3D 0x006AC000 # Flash addr (0xFFEAC000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTSize > =3D 0x00014000 # > +SET > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemoryOffset =3D > 0x006C0000 # Flash addr (0xFFEC0000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemorySize > =3D 0x00010000 # > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryOffset > =3D 0x006D0000 # Flash addr (0xFFED0000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemorySize > =3D 0x00130000 # > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > index 3b3b153b68..59f764f49c 100644 > --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > +++ > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > @@ -173,6 +173,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 > @@ -612,7 +616,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 > @@ -635,7 +642,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 > @@ -654,31 +664,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 gKabylakeOpenBoardPkgTokenSpaceGuid.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 > @@ -699,17 +693,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