From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 73C18740046 for ; Tue, 9 Apr 2024 06:12:27 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=ZfMQ7lIgvqPEIvkxvSoxhkclpS9VNkDQxNy2Kekkp8w=; 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=1712643145; v=1; b=JMs4OFCkKklePwEa8JmneN2t5PwVvQdW8zMfDpqbL3fIVq0v2N+Hor1plTdRvRbZ1sRdQgXN iVQnbrFgY4EPMbE3lZZCGvnKXKxanKuXzFW/JsHiTYPFkPNJhGALkD53ZvIwO/RS1UKdkeFJSi3 mNsEAEo3kjC38ssXaap7ONRUhJLuYstG5bQGjlULyaaRWAVpeuevq6n8p/yKvljfdo/MDbrm1bv qTXsnkCWpS4KW6/6WgZ+1JPOv4x0UNpqJbcAhj3zLoYVmLwu18nKxKxcDaazCYWEbTsDAK/Pgvj 2726b6iYtyoFPzO17wES9jEznNujXsyZDXVNoboQxma3A== X-Received: by 127.0.0.2 with SMTP id twrzYY7687511xDHHkks6f3p; Mon, 08 Apr 2024 23:12:25 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by mx.groups.io with SMTP id smtpd.web10.129363.1712643145029194501 for ; Mon, 08 Apr 2024 23:12:25 -0700 X-CSE-ConnectionGUID: uLEapagATKmPOpOPsugPVg== X-CSE-MsgGUID: KPcwxYZsQJyOpwTPJ3SYcg== X-IronPort-AV: E=McAfee;i="6600,9927,11038"; a="7808800" X-IronPort-AV: E=Sophos;i="6.07,188,1708416000"; d="scan'208";a="7808800" X-Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2024 23:12:24 -0700 X-CSE-ConnectionGUID: tXdrk6THQ/+mrNqmznxOEA== X-CSE-MsgGUID: lT5RTCElQtSIoCBmWvkgLg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,188,1708416000"; d="scan'208";a="24904761" X-Received: from chsuehx-desk.gar.corp.intel.com ([10.225.77.6]) by orviesa005.jf.intel.com with ESMTP; 08 Apr 2024 23:12:22 -0700 From: dorax.hsueh@intel.com To: devel@edk2.groups.io Cc: DoraX Hsueh , Sai Chaganty , Rosen Chuang , Saloni Kasbekar , Haoyu Tang , Nate DeSimone Subject: [edk2-devel] [PATCH] AlderlakeOpenBoardPkg: Fix BootStage 5 can't install Windows11. Date: Tue, 9 Apr 2024 14:12:17 +0800 Message-Id: <8f89751632bc5121e17d8da57f5efc198cc2af34.1712568915.git.dorax.hsueh@intel.com> 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, 08 Apr 2024 23:12:25 -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: ecIDq4cCCn2dlP4KH4kbi1wtx7686176AA= 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=JMs4OFCk; 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 66.175.222.108 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. Remove FvAdvanced. Cc: Sai Chaganty Cc: Rosen Chuang Cc: Saloni Kasbekar Cc: Haoyu Tang Cc: Nate DeSimone Signed-off-by: DoraX Hsueh --- .../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/I= nclude/Fdf/FlashMapInclude.fdf index 03c198c0..9a4ae7e8 100644 --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashM= apInclude.fdf +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashM= apInclude.fdf @@ -25,23 +25,21 @@ SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtw= WorkingSize =3D 0x000020 SET gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareOffset =3D = 0x00030000 # Flash addr (0xFF030000)=0D 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 gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalSize =3D = 0x00360000 #=0D -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset =3D = 0x00750000 # Flash addr (0xFF760000)=0D +SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset =3D = 0x000E0000 # Flash addr (0xFF400000)=0D +SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalSize =3D = 0x00650000 #=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset =3D = 0x00730000 # Flash addr (0xFF760000)=0D SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecuritySize =3D = 0x00090000 #=0D -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset =3D = 0x007E0000 # Flash addr (0xFF7F0000)=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset =3D = 0x007C0000 # Flash addr (0xFF7F0000)=0D SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootSize =3D = 0x000A0000 #=0D -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset =3D = 0x00880000 # Flash addr (0xFF860000)=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset =3D = 0x00860000 # Flash addr (0xFF860000)=0D SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootSize =3D = 0x00180000 #=0D =0D -SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesOffset =3D = 0x00A00000 # Flash addr (0xFFA00000)=0D +SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesOffset =3D = 0x009E0000 # Flash addr (0xFFA00000)=0D SET gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesSize =3D = 0x00080000 # Keep 0x80000 or larger=0D -SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset =3D = 0x00A80000 # Flash addr (0xFFA80000)=0D +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset =3D = 0x00A60000 # Flash addr (0xFFA80000)=0D SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize =3D = 0x00230000 #=0D -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset =3D = 0x00CB0000 # Flash addr (0xFFCB0000)=0D -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize =3D = 0x00040000 #=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset =3D = 0x00C90000 # Flash addr (0xFFCB0000)=0D +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize =3D = 0x00060000 #=0D SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset =3D = 0x00CF0000 # Flash addr (0xFFCF0000)=0D SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize =3D = 0x000A0000=0D SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset =3D = 0x00D90000 # Flash addr (0xFFD90000)=0D diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPk= g.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 =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 @@ -141,11 +147,6 @@ gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwSpar= eOffset|gEfiMdeModulePkgTo gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModule= PkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize=0D #NV_FTW_SPARE=0D =0D -=0D -gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedOffset|gMinPlatformPkgToke= nSpaceGuid.PcdFlashFvAdvancedSize=0D -gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedBase|gMinPlatformPkgTokenS= paceGuid.PcdFlashFvAdvancedSize=0D -FV =3D FvAdvanced=0D -=0D gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset|gBoardModuleTokenSpace= Guid.PcdFlashFvOptionalSize=0D gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalBase|gBoardModuleTokenSpaceGu= id.PcdFlashFvOptionalSize=0D FV =3D FvOptional=0D @@ -646,28 +647,6 @@ INF $(PLATFORM_PACKAGE)/Tcg/Tcg2PlatformDxe/Tcg2Platf= ormDxe.inf =0D INF IntelSiliconPkg/Feature/SmmAccess/SmmAccessDxe/SmmAccess.inf=0D =0D -=0D -[FV.FvAdvanced]=0D -BlockSize =3D $(FLASH_BLOCK_SIZE)=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 B23E7388-9953-45C7-9201-0473DDE5487A=0D -=0D -=0D [FV.FvFwBinaries]=0D BlockSize =3D $(FLASH_BLOCK_SIZE)=0D FvAlignment =3D 16=0D @@ -688,10 +667,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 diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/BiosInfo/BiosInfo.c b/Pla= tform/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 =0D #include =0D =0D -#define BASE_FV_SIZE 10=0D +#define BASE_FV_SIZE 9=0D =0D #define FSP_WRAPPER_FV_SIZE 3=0D =0D @@ -65,13 +65,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED BIOS_INFO mBiosInfo =3D { FixedPcdGet32 (PcdFlashNvStorageVariableSize) + FixedPcdGet32 (PcdFl= ashNvStorageFtwWorkingSize) + FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize)= ,=0D FixedPcdGet32 (PcdFlashNvStorageVariableBase)=0D },=0D - {=0D - FIT_TYPE_07_BIOS_STARTUP_MODULE,=0D - BIOS_INFO_STRUCT_ATTRIBUTE_BIOS_POST_IBB,=0D - 0x0100,=0D - FixedPcdGet32 (PcdFlashFvAdvancedSize),=0D - FixedPcdGet32 (PcdFlashFvAdvancedBase)=0D - },=0D {=0D FIT_TYPE_07_BIOS_STARTUP_MODULE,=0D BIOS_INFO_STRUCT_ATTRIBUTE_BIOS_POST_IBB,=0D diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/BiosInfo/BiosInfo.inf b/P= latform/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 ## CONSU= MES=0D gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesBase ## CONSU= MES=0D gBoardModuleTokenSpaceGuid.PcdFlashFvFirmwareBinariesSize ## CONSU= MES=0D - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedBase ## CONSU= MES=0D - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize ## CONSU= MES=0D gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalBase ## CONSU= MES=0D gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalSize ## CONSU= MES=0D gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityBase ## CONSU= MES=0D diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/OpenBoardPkg.dec b/Platfo= rm/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 #=0D # FvImage File=0D #=0D - gFvAdvancedFileGuid =3D {0xAD198BA5, 0xC330, 0x41CD, {= 0xB0, 0x97, 0x16, 0x48, 0x83, 0x28, 0xB7, 0x98}}=0D gFvOsBootFileGuid =3D {0xB9020753, 0x84A8, 0x4BB6, {= 0x94, 0x7C, 0xCE, 0x7D, 0x41, 0xF5, 0xCE, 0x39}}=0D gFvUefiBootFileGuid =3D {0x9E21FD93, 0x9C72, 0x4c15, {= 0x8C, 0x4B, 0xE7, 0x7F, 0x1D, 0xB2, 0xD7, 0x92}}=0D gTianoLogoGuid =3D {0x7BB28B99, 0x61BB, 0x11D5, = {0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}}=0D --=20 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117534): https://edk2.groups.io/g/devel/message/117534 Mute This Topic: https://groups.io/mt/104120130/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-