From nobody Mon May 13 08:13:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+106764+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+106764+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1688983555; cv=none; d=zohomail.com; s=zohoarc; b=Q5Oe6qXcrE1MmJ3KjsXuoeNlk2KIxVADzUdWsQGIXfDssVZv70GS/rLLM28Zpd09XXy4mxU8ADxT0kEXhryd4TCkktAjkkbZ+nqVb2vQV2P+O8TskyoSB00MGVD/sPSy7iGHDXKebALlBOvjDtiKJT01Q55z0O1x4TwCC9Ea0rg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688983555; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=+g10sYQfBFZ8eJQa6elIsRJXDI3/N/xkxGy0HyYT/GQ=; b=UtAA9710c+/fF8fWwtWjlheLUwHxKNYhkC+v1YU4JAz1lmes2ZL5ndYNmEvOnSsonV2z0jv23aMEVBOspKpcl2WSEkzfJS4LhJ3DPlDrv/Jy++LGZlpZGZtherbvu52vYJ2634Ldu50lyrbGOQNqy2REc41ny1zw6xSYaDfmFfE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+106764+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1688983555087920.6235297230144; Mon, 10 Jul 2023 03:05:55 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id T6a1YY1788612xp16VjfDOM6; Mon, 10 Jul 2023 03:05:54 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.35943.1688983553015347582 for ; Mon, 10 Jul 2023 03:05:53 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10766"; a="349105767" X-IronPort-AV: E=Sophos;i="6.01,194,1684825200"; d="scan'208";a="349105767" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2023 03:05:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10766"; a="1051305386" X-IronPort-AV: E=Sophos;i="6.01,194,1684825200"; d="scan'208";a="1051305386" X-Received: from cepingsx-mobl1.ccr.corp.intel.com ([10.239.49.140]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2023 03:05:49 -0700 From: "sunceping" To: devel@edk2.groups.io Cc: sunceping , Erdem Aktas , James Bottomley , Jiewen Yao , Gerd Hoffmann , Min Xu , Tom Lendacky , Michael Roth Subject: [edk2-devel] [PATCH V1] OvmfPkg/PeilessStartupLib: Updated with PcdSecureBootSupported Date: Mon, 10 Jul 2023 18:05:39 +0800 Message-Id: <20230710100539.13518-1-cepingx.sun@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,cepingx.sun@intel.com X-Gm-Message-State: 5PCLnlKag12akucQEPE50I18x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1688983554; bh=uUPOz57i5gYveEN2fkhVP2XM2ZU6E+jTYZj0fb8p/AI=; h=Cc:Date:From:Reply-To:Subject:To; b=uN6GWsA72RCgzupkXX1OAeLeS2ZdtMQfBxsbb8fvew9IN7fBxtKN6cNJpDSwyL8MwQB EXiGF3KBQqI9jiUE8i0SYEI3wwQ3ZYYOBfAvu0/vAULtvCaFukJ/QGnejMu2O4f7Hsds7 xfbnYCNwTPw68DtlqtlhoOtf3KjZQ6+zsJ8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1688983557174100007 Content-Type: text/plain; charset="utf-8" SECURE_BOOT_FEATURE_ENABLED was dropped by the commit(92da8a154f), but the PeilessStartupLib was not updated with PcdSecureBootSupported, that made SecureBoot no longer work in IntelTdxX64. Fix this by replacing SECURE_BOOT_FEATURE_ENABLED with PcdSecureBootSupported in PeilessStartupLib. Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Gerd Hoffmann Cc: Min Xu Cc: Tom Lendacky Cc: Michael Roth Signed-off-by: Ceping Sun Acked-by: Gerd Hoffmann Reviewed-by: Erdem Aktas Reviewed-by: Jiewen Yao --- OvmfPkg/Library/PeilessStartupLib/PeilessStartup.c | 6 +++--- OvmfPkg/Library/PeilessStartupLib/PeilessStartupLib.inf | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/Library/PeilessStartupLib/PeilessStartup.c b/OvmfPkg/L= ibrary/PeilessStartupLib/PeilessStartup.c index 164aa2d619..1632a23177 100644 --- a/OvmfPkg/Library/PeilessStartupLib/PeilessStartup.c +++ b/OvmfPkg/Library/PeilessStartupLib/PeilessStartup.c @@ -82,9 +82,9 @@ InitializePlatform ( =20 VariableStore =3D PlatformReserveEmuVar= iableNvStore (); PlatformInfoHob->PcdEmuVariableNvStoreReserved =3D (UINT64)(UINTN)Variab= leStore; - #ifdef SECURE_BOOT_FEATURE_ENABLED - PlatformInitEmuVariableNvStore (VariableStore); - #endif + if (FeaturePcdGet (PcdSecureBootSupported)) { + PlatformInitEmuVariableNvStore (VariableStore); + } =20 if (TdIsEnabled ()) { PlatformTdxPublishRamRegions (); diff --git a/OvmfPkg/Library/PeilessStartupLib/PeilessStartupLib.inf b/Ovmf= Pkg/Library/PeilessStartupLib/PeilessStartupLib.inf index 7719b5031d..585d504637 100644 --- a/OvmfPkg/Library/PeilessStartupLib/PeilessStartupLib.inf +++ b/OvmfPkg/Library/PeilessStartupLib/PeilessStartupLib.inf @@ -83,3 +83,4 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdNullPointerDetectionPropertyMask ##= CONSUMES gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize + gUefiOvmfPkgTokenSpaceGuid.PcdSecureBootSupported --=20 2.34.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#106764): https://edk2.groups.io/g/devel/message/106764 Mute This Topic: https://groups.io/mt/100054785/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-