From nobody Sat May 11 22:02:54 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+97721+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+97721+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1671714741; cv=none; d=zohomail.com; s=zohoarc; b=aDxY9AjPM19bpGwxP7j6gDxBdA7a7h6V5CbKct45aqzxFdttYMLAStR44unZEYB4PeKGHdOJ8kZiHPLWWcsLw8hPxL/qodA911pMymR6ujJhfLzhNVjxrbtyGs8CVaYFMMGVf+KwltuwL5sa4VcAckJLM/RsfUWo+r5Iq9KTZ4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671714741; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=48KualtiMWVhHjhEUu1B13vMm62mvozgYS0Jkm9HKMs=; b=AgBDi0/wMNiAJtNFZA95lGqXElD3jubau9TiQAjihmHanlPRi7Gk6H46e1VEFZ0qZMXlfThsgG5piqz6XpdsLxT2rAFWgK0gKsw8hmRFjhKP30e0Wf9w3Eyfu89C5mwl+UVcEAHRDMzfViXNVQvFZJTUtC0XYy1/I/mB+A1EN38= 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+97721+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 1671714741287228.44502012090447; Thu, 22 Dec 2022 05:12:21 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id poe7YY1788612x2BtgOgGJ5j; Thu, 22 Dec 2022 05:12:21 -0800 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.45149.1671714738764023628 for ; Thu, 22 Dec 2022 05:12:20 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="384475580" X-IronPort-AV: E=Sophos;i="5.96,265,1665471600"; d="scan'208";a="384475580" X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2022 05:12:19 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="758941370" X-IronPort-AV: E=Sophos;i="5.96,265,1665471600"; d="scan'208";a="758941370" X-Received: from mxu9-mobl1.ccr.corp.intel.com ([10.249.172.37]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2022 05:12:17 -0800 From: "Min Xu" To: devel@edk2.groups.io Cc: Min M Xu , Ard Biesheuvel , Erdem Aktas , James Bottomley , Jiewen Yao , Gerd Hoffmann , Tom Lendacky Subject: [edk2-devel] [PATCH V1 1/2] OvmfPkg/AcpiPlatformDxe: Check PcdConfidentialComputingGuestAttr Date: Thu, 22 Dec 2022 21:11:55 +0800 Message-Id: <20221222131156.411-2-min.m.xu@intel.com> In-Reply-To: <20221222131156.411-1-min.m.xu@intel.com> References: <20221222131156.411-1-min.m.xu@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,min.m.xu@intel.com X-Gm-Message-State: ebqLKLZYqV15gjWczYoDM6Ptx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1671714741; bh=GZu1/HY3VO7k0dVeyMzgUgUB2YE02rDidhAUxDxXrKU=; h=Cc:Date:From:Reply-To:Subject:To; b=LHsWqK7uX9c4pYA0OJ2R79yUx0IxixasRs5n4D4izcQotX8AErAodKobE7Hhe/yUsf8 6/rSceo8Fw44hfCQob7cKMiasrKmqcOemcaZzFCouuIZCZR8KPMIdeqg9MhwNjR45uxBU INiIdYOXvgihbXeDGYjVGm/xB3gteim9MKo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1671714743151100005 Content-Type: text/plain; charset="utf-8" From: Min M Xu PcdConfidentialComputingGuestAttr can be used to check the cc guest type, including td-guest or sev-guest. CcProbe() can do the same thing but CcProbeLib should be included in the dsc which uses AcpiPlatformDxe. The difference between PcdConfidentialComputingGuestAttr and CcProbe() is that PcdConfidentialComputingGuestAttr cannot be used in multi-processor scenario but CcProbe() can. But there is no such issue in AcpiPlatformDxe. So we use PcdConfidentialComputingGuestAttr instead of CcProbeLib so that it is simpler. Cc: Ard Biesheuvel Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Gerd Hoffmann Cc: Tom Lendacky Signed-off-by: Min Xu --- OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c | 6 ++---- OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c b/OvmfPkg/AcpiPlatformD= xe/AcpiPlatform.c index 0cc3d958bed4..b446bb487234 100644 --- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c +++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c @@ -8,9 +8,7 @@ **/ =20 #include // CLOUDHV_DEVICE_ID - -#include // CcProbe(), CcGuestTypeIntelTdx - +#include #include "AcpiPlatform.h" =20 /** @@ -35,7 +33,7 @@ InstallAcpiTables ( =20 HostBridgeDevId =3D PcdGet16 (PcdOvmfHostBridgePciDevId); if (HostBridgeDevId =3D=3D CLOUDHV_DEVICE_ID) { - if (CcProbe () =3D=3D CcGuestTypeIntelTdx) { + if (CC_GUEST_IS_TDX (PcdGet64 (PcdConfidentialComputingGuestAttr))) { Status =3D InstallCloudHvTablesTdx (AcpiTable); } else { Status =3D InstallCloudHvTables (AcpiTable); diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf b/OvmfPkg/AcpiPlat= formDxe/AcpiPlatformDxe.inf index 1647a90add8b..8939dde42549 100644 --- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -46,7 +46,6 @@ UefiBootServicesTableLib UefiDriverEntryPoint HobLib - CcProbeLib =20 [Protocols] gEfiAcpiTableProtocolGuid # PROTOCOL ALWAYS_CONSUMED @@ -62,6 +61,7 @@ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId gUefiOvmfPkgTokenSpaceGuid.PcdXenPvhStartOfDayStructPtr gUefiOvmfPkgTokenSpaceGuid.PcdXenPvhStartOfDayStructPtrSize + gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr =20 [Depex] gEfiAcpiTableProtocolGuid --=20 2.29.2.windows.2 -=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 (#97721): https://edk2.groups.io/g/devel/message/97721 Mute This Topic: https://groups.io/mt/95825683/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- From nobody Sat May 11 22:02:54 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+97722+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+97722+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1671714742; cv=none; d=zohomail.com; s=zohoarc; b=Y6Y7dEaAORAB27A64KApCPfB7ftUJQHhFumZcDnKjFxv7CPbtvcIupxviChoibk807rY9bKtJQUe0gfrtjXg1u4I0i3ROM75nN1EWZeMZkrSLFwo/HWK88kXwKhyxiR3FIWw+E8zcI2r5kLs1XRQlpllDb6jUOc3qeiLUqsHFCE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671714742; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=2bnTCViOfSLwQImpvRNoQA/VvP6mB3d95JSdGS+AT+s=; b=eLmGiQaIwZHIZi7PTUkVYqmlWQi5GfvC38GkzRP6a8YCUIM/bCaxXlxi8D7e895vwweQiGULoOBOC3lclFBNSZ89Ctg8EWMWlc5Aerkax2jNdkn2F5oTQf4Ityo07r0p4N5CsTBjnR//IsEDk5j6w62U77ePQZykUpIi3oTETOU= 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+97722+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 1671714742970859.1467521344836; Thu, 22 Dec 2022 05:12:22 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id tqX1YY1788612xjc6R6IkF4T; Thu, 22 Dec 2022 05:12:22 -0800 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.45149.1671714738764023628 for ; Thu, 22 Dec 2022 05:12:22 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="384475600" X-IronPort-AV: E=Sophos;i="5.96,265,1665471600"; d="scan'208";a="384475600" X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2022 05:12:21 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="758941373" X-IronPort-AV: E=Sophos;i="5.96,265,1665471600"; d="scan'208";a="758941373" X-Received: from mxu9-mobl1.ccr.corp.intel.com ([10.249.172.37]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2022 05:12:19 -0800 From: "Min Xu" To: devel@edk2.groups.io Cc: Min M Xu , Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Gerd Hoffmann Subject: [edk2-devel] [PATCH V1 2/2] ArmVirtPkg: Remove CcProbeLib from ArmVirtQemu.dsc Date: Thu, 22 Dec 2022 21:11:56 +0800 Message-Id: <20221222131156.411-3-min.m.xu@intel.com> In-Reply-To: <20221222131156.411-1-min.m.xu@intel.com> References: <20221222131156.411-1-min.m.xu@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,min.m.xu@intel.com X-Gm-Message-State: k9vVy3occn1JNj67dsOqxHtsx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1671714742; bh=XHoNGmJN+4mvp5cXEw+L/BF8mf94l09r3h+ztFaTLgU=; h=Cc:Date:From:Reply-To:Subject:To; b=Ky2PFe+rk7D2Y+P40TBkiah2R/5k4ob4Hk2PbFd8ADe4XpePZW+z6YW5IJa9M+r/UwW nLDeb2vKO+1llOS8U8sRCvu0PRzBB/GYaeGgoCnx7IKL7jHkkY9UvAa5V4MMImxuJZ64Z 4Ic8p7ORJFwbiPVAGtm/WUaFmNnxfwmxU6A= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1671714745146100010 Content-Type: text/plain; charset="utf-8" From: Min M Xu Since CcProbeLib is not used in AcpiPlatformDxe, CcProbeLib can be removed from ArmVirtQemu.dsc. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Gerd Hoffmann Signed-off-by: Min Xu --- ArmVirtPkg/ArmVirtQemu.dsc | 1 - 1 file changed, 1 deletion(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 1dea715e9e4b..f77443229e8e 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -68,7 +68,6 @@ VirtNorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuL= ib.inf =20 CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf - CcProbeLib|MdePkg/Library/CcProbeLibNull/CcProbeLibNull.inf BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/Platfor= mBootManagerLib.inf PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrin= tScLib.inf --=20 2.29.2.windows.2 -=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 (#97722): https://edk2.groups.io/g/devel/message/97722 Mute This Topic: https://groups.io/mt/95825684/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-