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 9C010AC14DE for ; Fri, 2 Feb 2024 14:38:51 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=0TFdAHvDe+Mt9OwK5yfji2KOOFgdGN/iTSJrZyIzWvc=; 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:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1706884730; v=1; b=C8XxJ4G6OdgnDgYqe2wiTeGbrVqJ3LKQhsoWPaJLgg/Bx5ZQ+7tASIYSql+Iwzm7mlh/cWd0 AQwaQC4bJaYUTIpBP5HX5J3+YpY72PL8zXuvqcJME44qdrY3zqIFhGMNeXVWWsuLCRfbi2tQ3SD sfftV8UFutHn2onCqvqd1ck0= X-Received: by 127.0.0.2 with SMTP id 0kf3YY7687511xh75YeG24Ya; Fri, 02 Feb 2024 06:38:50 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by mx.groups.io with SMTP id smtpd.web11.19055.1706865102868233705 for ; Fri, 02 Feb 2024 01:11:42 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10971"; a="11481771" X-IronPort-AV: E=Sophos;i="6.05,237,1701158400"; d="scan'208";a="11481771" X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2024 01:11:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10971"; a="823164939" X-IronPort-AV: E=Sophos;i="6.05,237,1701158400"; d="scan'208";a="823164939" X-Received: from chsuehx-desk.gar.corp.intel.com ([10.225.77.6]) by orsmga001.jf.intel.com with ESMTP; 02 Feb 2024 01:11:40 -0800 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: Fri, 2 Feb 2024 17:11:34 +0800 Message-Id: <86f11c0468a61985547906fa0a27ceede244a226.1706858499.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 Reply-To: devel@edk2.groups.io,dorax.hsueh@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: gNqgMD7Z6TTYA8ekAnrInlnGx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=C8XxJ4G6; 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 Since installing windows does not meet the minimum system requirements, Added TPM related code to meet the requirements. Cc: Sai Chaganty Cc: Rosen Chuang Cc: Saloni Kasbekar Cc: Haoyu Tang Cc: Nate DeSimone Signed-off-by: DoraX Hsueh --- .../Include/Fdf/FlashMapInclude.fdf | 18 +++++++++--------- .../AlderlakePRvp/OpenBoardPkg.fdf | 6 ++++++ .../AlderlakePRvp/OpenBoardPkgPcd.dsc | 10 +++++++++- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf= /FlashMapInclude.fdf b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/I= nclude/Fdf/FlashMapInclude.fdf index 03c198c0..b57246ed 100644 --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashM= apInclude.fdf +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/Include/Fdf/FlashM= apInclude.fdf @@ -26,22 +26,22 @@ 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 = 0x002F0000 #=0D +SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalOffset =3D = 0x003D0000 # Flash addr (0xFF400000)=0D SET gBoardModuleTokenSpaceGuid.PcdFlashFvOptionalSize =3D = 0x00360000 #=0D -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset =3D = 0x00750000 # Flash addr (0xFF760000)=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..dd66a74d 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 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 (#115054): https://edk2.groups.io/g/devel/message/115054 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] -=-=-=-=-=-=-=-=-=-=-=-