Hi Dora, Removing FvAdvanced in a violation of the MinPlatform specification. The relevant section is here:
https://tianocore-docs.github.io/edk2-MinimumPlatformSpecification/draft/appendix_a_full_maps/a1_firmware_volume_layout.html#a1-firmware-volume-layout Please add FvAdvanced back into the ROM. In addition, PcdBootStage should be set to 6 by default (not 5). Thanks, Nate > -----Original Message----- > From: Hsueh, DoraX <dorax.hs...@intel.com> > Sent: Friday, February 2, 2024 1:12 AM > To: devel@edk2.groups.io > Cc: Hsueh, DoraX <dorax.hs...@intel.com>; Chaganty, Rangasai V > <rangasai.v.chaga...@intel.com>; Chuang, Rosen <rosen.chu...@intel.com>; > Kasbekar, Saloni <saloni.kasbe...@intel.com>; Tang, Haoyu > <haoyu.t...@intel.com>; Desimone, Nathaniel L > <nathaniel.l.desim...@intel.com> > Subject: [PATCH] AlderlakeOpenBoardPkg: Fix BootStage 5 can't install > Windows11. > > From: DoraX Hsueh <dorax.hs...@intel.com> > > https://bugzilla.tianocore.org/show_bug.cgi?id=4665 > > Since installing windows does not meet the minimum system requirements, > Added TPM related code to meet the requirements. > > Cc: Sai Chaganty <rangasai.v.chaga...@intel.com> > Cc: Rosen Chuang <rosen.chu...@intel.com> > Cc: Saloni Kasbekar <saloni.kasbe...@intel.com> > Cc: Haoyu Tang <haoyu.t...@intel.com> > Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> > Signed-off-by: DoraX Hsueh <dorax.hs...@intel.com> > --- > .../Include/Fdf/FlashMapInclude.fdf | 20 +++++----- > .../AlderlakePRvp/OpenBoardPkg.fdf | 37 +++---------------- > .../AlderlakePRvp/OpenBoardPkgPcd.dsc | 10 ++++- > .../AlderlakeOpenBoardPkg/BiosInfo/BiosInfo.c | 9 +---- > .../BiosInfo/BiosInfo.inf | 2 - > .../AlderlakeOpenBoardPkg/OpenBoardPkg.dec | 1 - > 6 files changed, 25 insertions(+), 54 deletions(-) > > diff --git > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > index 03c198c0..9a4ae7e8 100644 > --- > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > +++ > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashMapInclude.fdf > @@ -25,23 +25,21 @@ SET > gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize = 0x000020 > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareOffset = > 0x00030000 # Flash addr (0xFF030000) > SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize = > 0x00030000 # > > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedOffset = > 0x000E0000 # Flash addr (0xFF0E0000) > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize = > 0x00310000 # > -SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset = > 0x003F0000 # Flash addr (0xFF400000) > -SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalSize = > 0x00360000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset = > 0x00750000 # Flash addr (0xFF760000) > +SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset = > 0x000E0000 # Flash addr (0xFF400000) > +SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalSize = > 0x00650000 # > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset = > 0x00730000 # Flash addr (0xFF760000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecuritySize = > 0x00090000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset = > 0x007E0000 # Flash addr (0xFF7F0000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset = > 0x007C0000 # Flash addr (0xFF7F0000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootSize = > 0x000A0000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset = > 0x00880000 # Flash addr (0xFF860000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset = > 0x00860000 # Flash addr (0xFF860000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootSize = > 0x00180000 # > > -SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesOffset = > 0x00A00000 # Flash addr (0xFFA00000) > +SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesOffset = > 0x009E0000 # Flash addr (0xFFA00000) > SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesSize = > 0x00080000 # Keep 0x80000 or larger > -SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset = > 0x00A80000 # Flash addr (0xFFA80000) > +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset = > 0x00A60000 # Flash addr (0xFFA80000) > SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize = > 0x00230000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset = > 0x00CB0000 # Flash addr (0xFFCB0000) > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize = > 0x00040000 # > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset = > 0x00C90000 # Flash addr (0xFFCB0000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize = > 0x00060000 # > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset = > 0x00CF0000 # Flash addr (0xFFCF0000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize = > 0x000A0000 > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset = > 0x00D90000 # Flash addr (0xFFD90000) > diff --git > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf > index f1ce271b..7fb6198f 100644 > --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf > +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf > @@ -113,9 +113,15 @@ DATA = { > #Blockmap[1]: End > 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > ## This is the VARIABLE_STORE_HEADER > +!if gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable == TRUE > + # Signature: gEfiAuthenticatedVariableGuid = { 0xaaf32c78, 0x947b, > 0x439a, { 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92 }} > + 0x78, 0x2c, 0xf3, 0xaa, 0x7b, 0x94, 0x9a, 0x43, > + 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92, > +!else > # Signature: gEfiVariableGuid = { 0xddcf3616, 0x3275, 0x4164, { 0x98, > 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }} > 0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41, > 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d, > +!endif > #Size: 0x2E000 > (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) - 0x48 (size > of EFI_FIRMWARE_VOLUME_HEADER) = 0x2DFB8 > # This can speed up the Variable Dispatch a bit. > 0xB8, 0xDF, 0x02, 0x00, > @@ -141,11 +147,6 @@ > gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareOffset|gEfiMdeModulePkgTo > > gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize > #NV_FTW_SPARE > > - > -gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedOffset|gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize > -gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedBase|gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize > -FV = FvAdvanced > - > > gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset|gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalSize > > gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalBase|gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalSize > FV = FvOptional > @@ -646,28 +647,6 @@ INF > $(PLATFORM_PACKAGE)/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf > > INF IntelSiliconPkg/Feature/SmmAccess/SmmAccessDxe/SmmAccess.inf > > - > -[FV.FvAdvanced] > -BlockSize = $(FLASH_BLOCK_SIZE) > -FvAlignment = 16 > -ERASE_POLARITY = 1 > -MEMORY_MAPPED = TRUE > -STICKY_WRITE = TRUE > -LOCK_CAP = TRUE > -LOCK_STATUS = TRUE > -WRITE_DISABLED_CAP = TRUE > -WRITE_ENABLED_CAP = TRUE > -WRITE_STATUS = TRUE > -WRITE_LOCK_CAP = TRUE > -WRITE_LOCK_STATUS = TRUE > -READ_DISABLED_CAP = TRUE > -READ_ENABLED_CAP = TRUE > -READ_STATUS = TRUE > -READ_LOCK_CAP = TRUE > -READ_LOCK_STATUS = TRUE > -FvNameGuid = B23E7388-9953-45C7-9201-0473DDE5487A > - > - > [FV.FvFwBinaries] > BlockSize = $(FLASH_BLOCK_SIZE) > FvAlignment = 16 > @@ -688,10 +667,6 @@ READ_LOCK_CAP = TRUE > READ_LOCK_STATUS = TRUE > FvNameGuid = 8B98AB22-E354-42f0-88B9-049810F0FDAA > > - > - > - > - > [FV.FvOptional] > BlockSize = $(FLASH_BLOCK_SIZE) > FvAlignment = 16 > diff --git > a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkgPcd.dsc > b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkgPcd.dsc > index 3eb9a575..b52ed92c 100644 > --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkgPcd.dsc > +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkgPcd.dsc > @@ -25,7 +25,7 @@ > # Stage 5 - boot to OS with security boot enabled > # Stage 6 - boot with advanced features enabled > # > - gMinPlatformPkgTokenSpaceGuid.PcdBootStage|4 > + gMinPlatformPkgTokenSpaceGuid.PcdBootStage|5 > > # > # 0: FSP Wrapper is running in Dispatch mode. > @@ -313,6 +313,14 @@ > gIntelFsp2WrapperTokenSpaceGuid.PcdFspsUpdDataAddress|0x00000000 > gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|16 > gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE > > +!if gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable == TRUE > + gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy|1 > + gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x5a, 0xf2, 0x6b, 0x28, > 0xc3, 0xc2, 0x8c, 0x40, 0xb3, 0xb4, 0x25, 0xe6, 0x75, 0x8b, 0x73, 0x17} > +!endif > + > +[PcdsDynamicHii.common.DEFAULT] > + > gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|4|NV,BS > + > [PcdsDynamicHii.X64.DEFAULT] > > gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 > # Variable: L"Timeout" > > gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 > # Variable: L"HwErrRecSupport" > diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/BiosInfo/BiosInfo.c > b/Platform/Intel/AlderlakeOpenBoardPkg/BiosInfo/BiosInfo.c > index 64462900..306b42d9 100644 > --- a/Platform/Intel/AlderlakeOpenBoardPkg/BiosInfo/BiosInfo.c > +++ b/Platform/Intel/AlderlakeOpenBoardPkg/BiosInfo/BiosInfo.c > @@ -19,7 +19,7 @@ > #include <Ppi/FirmwareVolumeInfoMeasurementExcluded.h> > #include <Library/MemoryAllocationLib.h> > > -#define BASE_FV_SIZE 10 > +#define BASE_FV_SIZE 9 > > #define FSP_WRAPPER_FV_SIZE 3 > > @@ -65,13 +65,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED BIOS_INFO mBiosInfo = { > FixedPcdGet32 (PcdFlashNvStorageVariableSize) + FixedPcdGet32 > (PcdFlashNvStorageFtwWorkingSize) + FixedPcdGet32 > (PcdFlashNvStorageFtwSpareSize), > FixedPcdGet32 (PcdFlashNvStorageVariableBase) > }, > - { > - FIT_TYPE_07_BIOS_STARTUP_MODULE, > - BIOS_INFO_STRUCT_ATTRIBUTE_BIOS_POST_IBB, > - 0x0100, > - FixedPcdGet32 (PcdFlashFvAdvancedSize), > - FixedPcdGet32 (PcdFlashFvAdvancedBase) > - }, > { > FIT_TYPE_07_BIOS_STARTUP_MODULE, > BIOS_INFO_STRUCT_ATTRIBUTE_BIOS_POST_IBB, > diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/BiosInfo/BiosInfo.inf > b/Platform/Intel/AlderlakeOpenBoardPkg/BiosInfo/BiosInfo.inf > index b1145180..70b1f80b 100644 > --- a/Platform/Intel/AlderlakeOpenBoardPkg/BiosInfo/BiosInfo.inf > +++ b/Platform/Intel/AlderlakeOpenBoardPkg/BiosInfo/BiosInfo.inf > @@ -51,8 +51,6 @@ > gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize ## CONSUMES > gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesBase ## CONSUMES > gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesSize ## CONSUMES > - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedBase ## CONSUMES > - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize ## CONSUMES > gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalBase ## CONSUMES > gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalSize ## CONSUMES > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityBase ## CONSUMES > diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/OpenBoardPkg.dec > b/Platform/Intel/AlderlakeOpenBoardPkg/OpenBoardPkg.dec > index 0f0ed386..7f3295d8 100644 > --- a/Platform/Intel/AlderlakeOpenBoardPkg/OpenBoardPkg.dec > +++ b/Platform/Intel/AlderlakeOpenBoardPkg/OpenBoardPkg.dec > @@ -28,7 +28,6 @@ Include > # > # FvImage File > # > - gFvAdvancedFileGuid = {0xAD198BA5, 0xC330, 0x41CD, > {0xB0, 0x97, 0x16, 0x48, 0x83, 0x28, 0xB7, 0x98}} > gFvOsBootFileGuid = {0xB9020753, 0x84A8, 0x4BB6, > {0x94, 0x7C, 0xCE, 0x7D, 0x41, 0xF5, 0xCE, 0x39}} > gFvUefiBootFileGuid = {0x9E21FD93, 0x9C72, 0x4c15, > {0x8C, 0x4B, 0xE7, 0x7F, 0x1D, 0xB2, 0xD7, 0x92}} > gTianoLogoGuid = {0x7BB28B99, 0x61BB, 0x11D5, > {0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}} > -- > 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117506): https://edk2.groups.io/g/devel/message/117506 Mute This Topic: https://groups.io/mt/104120130/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
