From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id C0E68AC0F24 for ; Mon, 6 May 2024 09:49:53 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=LQfkUz37bW+DVXB1njrwW16XNI9zXOCocsueEJQ3E64=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240206; t=1714988992; v=1; b=MnPV5tbOsmjzGdEtOP6+pdJ7Fnm+DVv3MJvZTMyV8B6twgq+xr+BtvQQChlAsi3vnR17t4Qu VJI9mC7ByVOwZSQ/wHteQiJJuRk7CCSYZygDjcn2eChaSD1wtKqOKpztLgYjoQodazWac6ixwDA 98QwxY5gi9dQlssrXvNd/+3slOMitmyMhx31kmYvIR7bZO4na4Y8XeeXj0uKOlhKOKcGQReJbJ8 tqFEsA0xwpKbT5jtW2i/A2UmYuEu4x7EPeV4UlEzoHxXpAI9/hQSJcd4oFq09g1WvNCzpjjDQGl 23n0t/HVmYsMBYtTd9k4Rmhqt94i8DiqOND3tkMjM7r3w== X-Received: by 127.0.0.2 with SMTP id YmVNYY7687511xSlkXSAJ0xv; Mon, 06 May 2024 02:49:52 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by mx.groups.io with SMTP id smtpd.web10.16884.1714988991553528220 for ; Mon, 06 May 2024 02:49:51 -0700 X-CSE-ConnectionGUID: ucmw72gCSkyJ+l2B0F/6kQ== X-CSE-MsgGUID: rfT6RHBXTkuD1MmjuntTYA== X-IronPort-AV: E=McAfee;i="6600,9927,11064"; a="22131798" X-IronPort-AV: E=Sophos;i="6.07,258,1708416000"; d="scan'208";a="22131798" X-Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2024 02:49:51 -0700 X-CSE-ConnectionGUID: 4u9MGBVGR9mS6nkXF9wXgg== X-CSE-MsgGUID: AoWGP7tvQJKp0Rd6Y9KDaw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,258,1708416000"; d="scan'208";a="27999310" X-Received: from chsuehx-desk.gar.corp.intel.com ([10.225.77.6]) by orviesa010.jf.intel.com with ESMTP; 06 May 2024 02:49:48 -0700 From: dorax.hsueh@intel.com To: devel@edk2.groups.io Cc: DoraX Hsueh , Sai Chaganty , Rosen Chuang , Saloni Kasbekar , Haoyu Tang , Nate DeSimone , Chasel Chiu Subject: [edk2-devel] [PATCH] AlderlakeOpenBoardPkg: Fix BootStage 5 can't install Windows11. Date: Mon, 6 May 2024 17:49:41 +0800 Message-Id: MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Mon, 06 May 2024 02:49:51 -0700 Resent-From: dorax.hsueh@intel.com Reply-To: devel@edk2.groups.io,dorax.hsueh@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: EUyOvQtIhrjo7PzxUNRXC7xXx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=MnPV5tbO; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io From: DoraX Hsueh https://bugzilla.tianocore.org/show_bug.cgi?id=3D4665 1. Since installing windows does not meet the minimum system requirements, Added TPM related code to meet the requirements. 2. Support stage 6, add FvAdvancedPreMemory. Cc: Sai Chaganty Cc: Rosen Chuang Cc: Saloni Kasbekar Cc: Haoyu Tang Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: DoraX Hsueh --- .../Include/Fdf/FlashMapInclude.fdf | 26 ++++---- .../AlderlakePRvp/OpenBoardPkg.dsc | 1 + .../AlderlakePRvp/OpenBoardPkg.fdf | 66 +++++++++++++++++-- .../AlderlakePRvp/OpenBoardPkgPcd.dsc | 10 ++- 4 files changed, 86 insertions(+), 17 deletions(-) diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf= /FlashMapInclude.fdf b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/I= nclude/Fdf/FlashMapInclude.fdf index 03c198c0..3e515d4e 100644 --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashM= apInclude.fdf +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashM= apInclude.fdf @@ -26,27 +26,29 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwS= pareOffset =3D 0x000300 SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize =3D = 0x00030000 #=0D =0D SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedOffset =3D = 0x000E0000 # Flash addr (0xFF0E0000)=0D -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize =3D = 0x00310000 #=0D -SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset =3D = 0x003F0000 # Flash addr (0xFF400000)=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize =3D = 0x002E0000 #=0D +SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset =3D = 0x003C0000 # Flash addr (0xFF3C0000)=0D SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalSize =3D = 0x00360000 #=0D -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset =3D = 0x00750000 # Flash addr (0xFF760000)=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset =3D = 0x00720000 # Flash addr (0xFF720000)=0D SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecuritySize =3D = 0x00090000 #=0D -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset =3D = 0x007E0000 # Flash addr (0xFF7F0000)=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset =3D = 0x007B0000 # Flash addr (0xFF7B0000)=0D SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootSize =3D = 0x000A0000 #=0D -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset =3D = 0x00880000 # Flash addr (0xFF860000)=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset =3D = 0x00850000 # Flash addr (0xFF850000)=0D SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootSize =3D = 0x00180000 #=0D =0D -SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesOffset =3D = 0x00A00000 # Flash addr (0xFFA00000)=0D +SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesOffset =3D = 0x009D0000 # Flash addr (0xFF9D0000)=0D SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesSize =3D = 0x00080000 # Keep 0x80000 or larger=0D -SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset =3D = 0x00A80000 # Flash addr (0xFFA80000)=0D +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset =3D = 0x00A50000 # Flash addr (0xFFA50000)=0D SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize =3D = 0x00230000 #=0D -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset =3D = 0x00CB0000 # Flash addr (0xFFCB0000)=0D -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize =3D = 0x00040000 #=0D -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset =3D = 0x00CF0000 # Flash addr (0xFFCF0000)=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset =3D = 0x00C80000 # Flash addr (0xFFC80000)=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize =3D = 0x00060000 #=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset =3D = 0x00CE0000 # Flash addr (0xFFCE0000)=0D SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize =3D = 0x000A0000=0D -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset =3D = 0x00D90000 # Flash addr (0xFFD90000)=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset =3D = 0x00D80000 # Flash addr (0xFFD80000)=0D SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMSize =3D = 0x00150000=0D -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTOffset =3D = 0x00EE0000 # Flash addr (0xFFEE0000)=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTOffset =3D = 0x00ED0000 # Flash addr (0xFFED0000)=0D SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTSize =3D = 0x00010000=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemoryOffset =3D = 0x00EE0000 # Flash addr (0xFFEE0000)=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemorySize =3D = 0x00010000 #=0D SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryOffset =3D = 0x00EF0000 # Flash addr (0xFFEF0000)=0D SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemorySize =3D = 0x00110000=0D diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPk= g.dsc b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc index 4cdc9c01..8468410e 100644 --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc @@ -49,6 +49,7 @@ # Include PCD configuration for this board=0D #=0D !include OpenBoardPkgPcd.dsc=0D + !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc=0D =0D ##########################################################################= ######=0D #=0D diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPk= g.fdf b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf index f1ce271b..39afcf4c 100644 --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf @@ -113,9 +113,15 @@ DATA =3D { #Blockmap[1]: End=0D 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,=0D ## This is the VARIABLE_STORE_HEADER=0D +!if gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable =3D=3D TRUE=0D + # Signature: gEfiAuthenticatedVariableGuid =3D { 0xaaf32c78, 0x947b, 0x= 439a, { 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92 }}=0D + 0x78, 0x2c, 0xf3, 0xaa, 0x7b, 0x94, 0x9a, 0x43,=0D + 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92,=0D +!else=0D # Signature: gEfiVariableGuid =3D { 0xddcf3616, 0x3275, 0x4164, { 0x98,= 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}=0D 0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41,=0D 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d,=0D +!endif=0D #Size: 0x2E000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariable= Size) - 0x48 (size of EFI_FIRMWARE_VOLUME_HEADER) =3D 0x2DFB8=0D # This can speed up the Variable Dispatch a bit.=0D 0xB8, 0xDF, 0x02, 0x00,=0D @@ -189,6 +195,10 @@ gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTBase|gMinP= latformPkgTokenSpaceGuid.P # FSP_T Section=0D FILE =3D $(PLATFORM_FSP_BIN_PACKAGE)/Fsp_Rebased_T.fd=0D =0D +gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemoryOffset|gMinPlatfo= rmPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemorySize=0D +gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemoryBase|gMinPlatform= PkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemorySize=0D +FV =3D FvAdvancedPreMemory=0D +=0D gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryOffset|gMinPlatformPkgTok= enSpaceGuid.PcdFlashFvPreMemorySize=0D gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryBase|gMinPlatformPkgToken= SpaceGuid.PcdFlashFvPreMemorySize=0D FV =3D FvPreMemory=0D @@ -646,6 +656,53 @@ INF $(PLATFORM_PACKAGE)/Tcg/Tcg2PlatformDxe/Tcg2Platf= ormDxe.inf =0D INF IntelSiliconPkg/Feature/SmmAccess/SmmAccessDxe/SmmAccess.inf=0D =0D +#=0D +# Pre-memory Advanced Features=0D +#=0D +[FV.FvAdvancedPreMemory]=0D +FvAlignment =3D 16=0D +ERASE_POLARITY =3D 1=0D +MEMORY_MAPPED =3D TRUE=0D +STICKY_WRITE =3D TRUE=0D +LOCK_CAP =3D TRUE=0D +LOCK_STATUS =3D TRUE=0D +WRITE_DISABLED_CAP =3D TRUE=0D +WRITE_ENABLED_CAP =3D TRUE=0D +WRITE_STATUS =3D TRUE=0D +WRITE_LOCK_CAP =3D TRUE=0D +WRITE_LOCK_STATUS =3D TRUE=0D +READ_DISABLED_CAP =3D TRUE=0D +READ_ENABLED_CAP =3D TRUE=0D +READ_STATUS =3D TRUE=0D +READ_LOCK_CAP =3D TRUE=0D +READ_LOCK_STATUS =3D TRUE=0D +FvNameGuid =3D 6053D78A-457E-4490-A237-31D0FBE2F305=0D +=0D +!include AdvancedFeaturePkg/Include/PreMemory.fdf=0D +=0D +#=0D +# Post-Memory Advanced Features=0D +#=0D +[FV.FvAdvancedUncompact]=0D +FvAlignment =3D 16=0D +ERASE_POLARITY =3D 1=0D +MEMORY_MAPPED =3D TRUE=0D +STICKY_WRITE =3D TRUE=0D +LOCK_CAP =3D TRUE=0D +LOCK_STATUS =3D TRUE=0D +WRITE_DISABLED_CAP =3D TRUE=0D +WRITE_ENABLED_CAP =3D TRUE=0D +WRITE_STATUS =3D TRUE=0D +WRITE_LOCK_CAP =3D TRUE=0D +WRITE_LOCK_STATUS =3D TRUE=0D +READ_DISABLED_CAP =3D TRUE=0D +READ_ENABLED_CAP =3D TRUE=0D +READ_STATUS =3D TRUE=0D +READ_LOCK_CAP =3D TRUE=0D +READ_LOCK_STATUS =3D TRUE=0D +FvNameGuid =3D BE3DF86F-E464-44A3-83F7-0D27E6B88C27=0D +=0D +!include AdvancedFeaturePkg/Include/PostMemory.fdf=0D =0D [FV.FvAdvanced]=0D BlockSize =3D $(FLASH_BLOCK_SIZE)=0D @@ -667,6 +724,11 @@ READ_LOCK_CAP =3D TRUE READ_LOCK_STATUS =3D TRUE=0D FvNameGuid =3D B23E7388-9953-45C7-9201-0473DDE5487A=0D =0D +FILE FV_IMAGE =3D 5248467B-B87B-4E74-AC02-398AF4BCB712 {=0D + SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQU= IRED =3D TRUE {=0D + SECTION FV_IMAGE =3D FvAdvancedUncompact=0D + }=0D + }=0D =0D [FV.FvFwBinaries]=0D BlockSize =3D $(FLASH_BLOCK_SIZE)=0D @@ -688,10 +750,6 @@ READ_LOCK_CAP =3D TRUE READ_LOCK_STATUS =3D TRUE=0D FvNameGuid =3D 8B98AB22-E354-42f0-88B9-049810F0FDAA=0D =0D -=0D -=0D -=0D -=0D [FV.FvOptional]=0D BlockSize =3D $(FLASH_BLOCK_SIZE)=0D FvAlignment =3D 16=0D diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPk= gPcd.dsc b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkgP= cd.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=0D # Stage 6 - boot with advanced features enabled=0D #=0D - gMinPlatformPkgTokenSpaceGuid.PcdBootStage|4=0D + gMinPlatformPkgTokenSpaceGuid.PcdBootStage|5=0D =0D #=0D # 0: FSP Wrapper is running in Dispatch mode.=0D @@ -313,6 +313,14 @@ gIntelFsp2WrapperTokenSpaceGuid.PcdFspsUpdDataAddress|= 0x00000000 gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|16=0D gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FAL= SE=0D =0D +!if gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable =3D=3D TRUE=0D + gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy|1=0D + gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x5a, 0xf2, 0x6b, 0x28= , 0xc3, 0xc2, 0x8c, 0x40, 0xb3, 0xb4, 0x25, 0xe6, 0x75, 0x8b, 0x73, 0x17}=0D +!endif=0D +=0D +[PcdsDynamicHii.common.DEFAULT]=0D + gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2C= onfigFormSetGuid|0x8|4|NV,BS=0D +=0D [PcdsDynamicHii.X64.DEFAULT]=0D gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVar= iableGuid|0x0|5 # Variable: L"Timeout"=0D gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|= gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport"=0D --=20 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118592): https://edk2.groups.io/g/devel/message/118592 Mute This Topic: https://groups.io/mt/105936343/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-