From nobody Mon May 6 16:26:11 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+97254+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+97254+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1670835842; cv=none; d=zohomail.com; s=zohoarc; b=PUHXEUp+2tSuadJ6a+Owuj6kP4CoAcTdJB1bHCxXhbkt8TDQDcar96CHCtxV2VBaHIO0whiCk0DhebZM8HpiGEgRGZ9IlDokkwsamwsuGVQY++ZowcWF5zwzj2dDScHfSa3WDJAqp+KKRGFdWFtllI/kvpNUOk3+WuqgzwBcYYI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670835842; h=Content-Type: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=Ao0MC6Hni41C1Y0fiNzJnqqW2C39CIp0Cjq+uRi8qP8=; b=aHs5KwWG3OpAyhfiCPyCNSm4HUCus3pfuW1CwP4+c4V2xNE6qRqxftGRl3ri9RyklqfwEnw/3TADVqqa3sn+qSIbKmWqEB8TXf25++tWNPXKVzYbgOaMEY2zU15SIZY78qAtTjLJJOqfc/I6uPmCUToZt2ed9TZy0gqCf1lglDc= 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+97254+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 1670835842532381.7419767682986; Mon, 12 Dec 2022 01:04:02 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id JfhpYY1788612xO3DUtM05tK; Mon, 12 Dec 2022 01:04:02 -0800 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.38616.1670835841410151021 for ; Mon, 12 Dec 2022 01:04:01 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10558"; a="301225973" X-IronPort-AV: E=Sophos;i="5.96,237,1665471600"; d="scan'208";a="301225973" X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2022 01:04:01 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10558"; a="822414746" X-IronPort-AV: E=Sophos;i="5.96,237,1665471600"; d="scan'208";a="822414746" X-Received: from vdesserx-mobl1.ger.corp.intel.com (HELO sboeuf-mobl.home) ([10.252.58.223]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2022 01:03:59 -0800 From: "Boeuf, Sebastien" To: devel@edk2.groups.io Cc: jiewen.yao@intel.com, min.m.xu@intel.com, kraxel@redhat.com, sebastien.boeuf@intel.com Subject: [edk2-devel] [PATCH 1/3] OvmfPkg/PlatformInitLib: Differentiate TDX case for Cloud Hypervisor Date: Mon, 12 Dec 2022 10:03:41 +0100 Message-Id: <64b42b8bb9bbbafc6abb99c812baec57f1506990.1670835199.git.sebastien.boeuf@intel.com> In-Reply-To: References: 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,sebastien.boeuf@intel.com X-Gm-Message-State: T4Y2PQxu2CV1YR2CLIPISHZMx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1670835842; bh=SAkhViWqeTa+n1vOKcLTeBbDQ3L3147eR7SiCJvCmTA=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=dnK0gwTBEtEqST+/KwJ+aFF4wtmd+Brf9NwX3rwubEVPaF815flAwAy7DDyQsngGbOW PIzEagGRz3vGEYLT2lMa/4CBG3r7hVASC47zRwzVoD6AoQdTSVEh3qS9tNgGnRXYTUwJG cvFCNiOrOg8JCJKPncFwEvyWphe19pwdfjg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1670835842716100001 Content-Type: text/plain; charset="utf-8" From: Sebastien Boeuf Rely on the CcProbe() function to identify when running on TDX. This allows the firmware to follow a different codepath for Cloud Hypervisor, which means it doesn't rely on PVH to find out about memory below 4GiB. instead it falls back onto the CMOS to retrieve that information. Signed-off-by: Sebastien Boeuf Reviewed-by: Jiewen Yao Reviewed-by: Min Xu --- OvmfPkg/Library/PlatformInitLib/MemDetect.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/Library/PlatformInitLib/MemDetect.c b/OvmfPkg/Library/= PlatformInitLib/MemDetect.c index b8feae4309..afee4b1e72 100644 --- a/OvmfPkg/Library/PlatformInitLib/MemDetect.c +++ b/OvmfPkg/Library/PlatformInitLib/MemDetect.c @@ -26,6 +26,7 @@ Module Name: // #include #include +#include #include #include #include @@ -312,7 +313,8 @@ PlatformGetSystemMemorySizeBelow4gb ( UINT8 Cmos0x34; UINT8 Cmos0x35; =20 - if (PlatformInfoHob->HostBridgeDevId =3D=3D CLOUDHV_DEVICE_ID) { + if (PlatformInfoHob->HostBridgeDevId =3D=3D CLOUDHV_DEVICE_ID && + CcProbe () !=3D CcGuestTypeIntelTdx) { // Get the information from PVH memmap return (UINT32)GetHighestSystemMemoryAddressFromPvhMemmap (TRUE); } --=20 2.34.1 --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris,=20 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 5 208 026.16 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. -=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 (#97254): https://edk2.groups.io/g/devel/message/97254 Mute This Topic: https://groups.io/mt/95617496/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 Mon May 6 16:26:11 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+97255+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+97255+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1670835850; cv=none; d=zohomail.com; s=zohoarc; b=kCxZhsuXrOQkexHCT8lgkTsCHJFQsPOpbv92owCFdlm07Mz1Z33WVFYWUr01JNeCl4ZYw9kscvwZTIN1WFydP2tX1Ik7gHsTMisqDp7v28YUQdFWdKLoLQd8I+6DjVyoI2WStSCs2okUrhqWq049dHp4Wpx7Ikv7aGsTlEZIy2o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670835850; h=Content-Type: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=ZdaQHH/PJ16fGbJ6sWHdaufL1ZqSoYm9GJuH8somZy8=; b=PhtvUker4zDEz8Y6u4azf55ZkH5oBKuBCr0DMmGTWbxc5FqpOHjKpU/f3mesqcvh2r4UlZBoNRuRG4oeqgwNggTE2DVxeAzqAPDlfwncU3dQyiKA2kpLtg6t4/k4J7IAG4Drl1/SGnJHQu/qytZlq6ITOyA7y2K9URzazaFglvo= 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+97255+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 167083585080052.380703391857196; Mon, 12 Dec 2022 01:04:10 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id wIF5YY1788612xYISAwgLTm3; Mon, 12 Dec 2022 01:04:10 -0800 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.38636.1670835849395123448 for ; Mon, 12 Dec 2022 01:04:09 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10558"; a="301226004" X-IronPort-AV: E=Sophos;i="5.96,237,1665471600"; d="scan'208";a="301226004" X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2022 01:04:06 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10558"; a="822414771" X-IronPort-AV: E=Sophos;i="5.96,237,1665471600"; d="scan'208";a="822414771" X-Received: from vdesserx-mobl1.ger.corp.intel.com (HELO sboeuf-mobl.home) ([10.252.58.223]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2022 01:04:04 -0800 From: "Boeuf, Sebastien" To: devel@edk2.groups.io Cc: jiewen.yao@intel.com, min.m.xu@intel.com, kraxel@redhat.com, sebastien.boeuf@intel.com Subject: [edk2-devel] [PATCH 2/3] OvmfPkg/PlatformInitLib: Transfer GUID Extension HOB Date: Mon, 12 Dec 2022 10:03:42 +0100 Message-Id: <99e1a00aba90014dba0135ef249f4bd649ca26f3.1670835199.git.sebastien.boeuf@intel.com> In-Reply-To: References: 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,sebastien.boeuf@intel.com X-Gm-Message-State: aiPEbe36Iu4MN9c4hVZGZLXvx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1670835850; bh=ZCL3buC0yzJA2CZwqC6XQh01RoVqtPX/4gFnb6CDzBY=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=XGuxQdZbUA4Nypv0oKciYHv/i2e5wFPJMoxSBs1gasjSK3a4I/WOTYIDdfA5o50ia74 2hSbTHXHMP/ZirC/TSsR4qHT7eycnOIMN1FLuzyrQly+IgxZoyHIQmStZsXoR2+OVeJ/x 99Bc2G8PZK1GxMBcsTJKLpKxvZ//H96NcUY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1670835852977100002 Content-Type: text/plain; charset="utf-8" From: Sebastien Boeuf This is required for passing the ACPI tables from the VMM up to the guest OS. They are transferred through this GUID extension. Signed-off-by: Jiaqi Gao Signed-off-by: Sebastien Boeuf Reviewed-by: Jiewen Yao Reviewed-by: Min Xu --- OvmfPkg/Library/PlatformInitLib/IntelTdx.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OvmfPkg/Library/PlatformInitLib/IntelTdx.c b/OvmfPkg/Library/P= latformInitLib/IntelTdx.c index acd114e38e..468855a968 100644 --- a/OvmfPkg/Library/PlatformInitLib/IntelTdx.c +++ b/OvmfPkg/Library/PlatformInitLib/IntelTdx.c @@ -547,6 +547,7 @@ TransferTdxHobList ( EFI_PEI_HOB_POINTERS Hob; EFI_RESOURCE_TYPE ResourceType; EFI_RESOURCE_ATTRIBUTE_TYPE ResourceAttribute; + VOID *GuidedData; =20 // // PcdOvmfSecGhcbBase is used as the TD_HOB in Tdx guest. @@ -577,6 +578,10 @@ TransferTdxHobList ( Hob.MemoryAllocation->AllocDescriptor.MemoryType ); break; + case EFI_HOB_TYPE_GUID_EXTENSION: + GuidedData =3D (VOID *) (&Hob.Guid->Name + 1); + BuildGuidDataHob (&Hob.Guid->Name, GuidedData, Hob.Guid->Header.Ho= bLength - sizeof(EFI_HOB_GUID_TYPE)); + break; } =20 Hob.Raw =3D GET_NEXT_HOB (Hob); --=20 2.34.1 --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris,=20 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 5 208 026.16 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. -=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 (#97255): https://edk2.groups.io/g/devel/message/97255 Mute This Topic: https://groups.io/mt/95617497/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 Mon May 6 16:26:11 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+97256+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+97256+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1670835852; cv=none; d=zohomail.com; s=zohoarc; b=EcPfWUCZkAjWCUumrDN7edqH2o3uRvf+iSgPaAFoFZL7eDsXQHnEUdoW28LtldFgxPmq/A7Yqt/r+sWdfz7zYn+hn7uwjz6hfxXwDv/ZqkXxx/RpKf2J7+0rj+tocP0ODLk/xbaFk3BRsmuYSIksVkRDRzwBPy/vQ2dlBAbhZJc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670835852; h=Content-Type: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=yt68AsNA8WpbGglQr0uhmAbWlFwbyMdspIqb52M2luc=; b=QUHPVWLNW9Va7sx3alcQYtzqSOUapdaERm8qpwYf9Tz7U/Lch8W3ioE7TpqToXOLyKT0doksrVV1zvmNDFc9zYI3WCt4z2KVln8LmRYM1uvsnyFwH6S2XB6dpTLuSkPkU/9Z8iXZX8B8UxueVeWim2LWzql+d7I5Kvg0GNOhz44= 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+97256+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 1670835852390775.4681515195853; Mon, 12 Dec 2022 01:04:12 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id PC1SYY1788612xtl5BgxNhCD; Mon, 12 Dec 2022 01:04:12 -0800 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.38636.1670835849395123448 for ; Mon, 12 Dec 2022 01:04:11 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10558"; a="301226036" X-IronPort-AV: E=Sophos;i="5.96,237,1665471600"; d="scan'208";a="301226036" X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2022 01:04:10 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10558"; a="822414783" X-IronPort-AV: E=Sophos;i="5.96,237,1665471600"; d="scan'208";a="822414783" X-Received: from vdesserx-mobl1.ger.corp.intel.com (HELO sboeuf-mobl.home) ([10.252.58.223]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2022 01:04:08 -0800 From: "Boeuf, Sebastien" To: devel@edk2.groups.io Cc: jiewen.yao@intel.com, min.m.xu@intel.com, kraxel@redhat.com, sebastien.boeuf@intel.com Subject: [edk2-devel] [PATCH 3/3] OvmfPkg/AcpiPlatformDxe: Differentiate TDX case for Cloud Hypervisor Date: Mon, 12 Dec 2022 10:03:43 +0100 Message-Id: In-Reply-To: References: 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,sebastien.boeuf@intel.com X-Gm-Message-State: lW0497frw3kR31Ek7lauRJSQx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1670835852; bh=dCuzqQo7gsGmuSZ9Y8H+aZYz8pZNwlvBVZXp1QOfJdY=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=DfZK7xf3zjdx2zmBiQvTOQ0gT/62uJg4VPi5CAIDC1o2xCbZI2aAiE6vu2FSu6RKMaI +3gVTV6nBb4QFijZ4u2xMXcUBh8qrD5m6ng1eT67YSQQlcBFlo/TN365evyS7bhye1upr dvxy1GQRrkgDUtu/bfhKHPK+uQAZXQzeNK0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1670835853007100003 Content-Type: text/plain; charset="utf-8" From: Sebastien Boeuf Rely on CcProbe() to identify when running on TDX so that ACPI tables can be retrieved differently for Cloud Hypervisor. Instead of relying on the PVH structure to find the RSDP pointer, the tables are individually passed through the HOB. Signed-off-by: Jiaqi Gao Signed-off-by: Sebastien Boeuf Reviewed-by: Jiewen Yao Reviewed-by: Min Xu --- OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c | 8 +- OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h | 6 ++ OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf | 2 + OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c | 87 +++++++++++++++++++++ OvmfPkg/OvmfPkg.dec | 1 + 5 files changed, 103 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c b/OvmfPkg/AcpiPlatformD= xe/AcpiPlatform.c index fcfb9703bd..0cc3d958be 100644 --- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c +++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c @@ -9,6 +9,8 @@ =20 #include // CLOUDHV_DEVICE_ID =20 +#include // CcProbe(), CcGuestTypeIntelTdx + #include "AcpiPlatform.h" =20 /** @@ -33,7 +35,11 @@ InstallAcpiTables ( =20 HostBridgeDevId =3D PcdGet16 (PcdOvmfHostBridgePciDevId); if (HostBridgeDevId =3D=3D CLOUDHV_DEVICE_ID) { - Status =3D InstallCloudHvTables (AcpiTable); + if (CcProbe () =3D=3D CcGuestTypeIntelTdx) { + Status =3D InstallCloudHvTablesTdx (AcpiTable); + } else { + Status =3D InstallCloudHvTables (AcpiTable); + } } else { Status =3D InstallQemuFwCfgTables (AcpiTable); } diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h b/OvmfPkg/AcpiPlatformD= xe/AcpiPlatform.h index 342339750d..3ec5098658 100644 --- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h +++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h @@ -19,6 +19,12 @@ typedef struct { =20 typedef struct S3_CONTEXT S3_CONTEXT; =20 +EFI_STATUS +EFIAPI +InstallCloudHvTablesTdx ( + IN EFI_ACPI_TABLE_PROTOCOL *AcpiProtocol + ); + EFI_STATUS EFIAPI InstallCloudHvTables ( diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf b/OvmfPkg/AcpiPlat= formDxe/AcpiPlatformDxe.inf index 09daf30bcd..dd03eccd88 100644 --- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -45,6 +45,7 @@ QemuFwCfgS3Lib UefiBootServicesTableLib UefiDriverEntryPoint + HobLib =20 [Protocols] gEfiAcpiTableProtocolGuid # PROTOCOL ALWAYS_CONSUMED @@ -53,6 +54,7 @@ =20 [Guids] gRootBridgesConnectedEventGroupGuid + gUefiOvmfPkgTdxAcpiHobGuid =20 [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration diff --git a/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c b/OvmfPkg/AcpiPlatformDx= e/CloudHvAcpi.c index ff59600d3e..cbe8bb9b0c 100644 --- a/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c +++ b/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c @@ -7,14 +7,101 @@ =20 **/ =20 +#include // EFI_ACPI_DESC= RIPTION_HEADER #include // CLOUDHV_RSDP_= ADDRESS #include // hvm_start_info #include // CpuDeadLoop() #include // DEBUG() #include // PcdGet32() +#include // GetFirstGuidH= ob(), GetNextGuidHob() +#include // gBS + +#include +#include +#include // QEMU_ACPI_TAB= LE_NOTIFY_PROTOCOL =20 #include "AcpiPlatform.h" =20 +EFI_HANDLE mChAcpiHandle =3D NULL; +QEMU_ACPI_TABLE_NOTIFY_PROTOCOL mChAcpiNotifyProtocol; + +EFI_STATUS +EFIAPI +InstallCloudHvTablesTdx ( + IN EFI_ACPI_TABLE_PROTOCOL *AcpiProtocol + ) +{ + EFI_STATUS Status; + UINTN TableHandle; + + EFI_PEI_HOB_POINTERS Hob; + EFI_ACPI_DESCRIPTION_HEADER *CurrentTable; + EFI_ACPI_DESCRIPTION_HEADER *DsdtTable; + + DsdtTable =3D NULL; + TableHandle =3D 0; + + Hob.Guid =3D (EFI_HOB_GUID_TYPE *)GetFirstGuidHob (&gUefiOvmfPkgTdxAcpiH= obGuid); + + while (Hob.Guid !=3D NULL) { + CurrentTable =3D (EFI_ACPI_DESCRIPTION_HEADER *)(&Hob.Guid->Name + 1); + if (!AsciiStrnCmp ((CHAR8 *)&CurrentTable->Signature, "DSDT", 4)) { + DsdtTable =3D CurrentTable; + } else { + // + // Install the tables + // + Status =3D AcpiProtocol->InstallAcpiTable ( + AcpiProtocol, + CurrentTable, + CurrentTable->Length, + &TableHandle + ); + for (UINTN i =3D 0; i < CurrentTable->Length; i++) { + DEBUG ((DEBUG_INFO, " %x", *((UINT8 *)CurrentTable + i))); + } + + DEBUG ((DEBUG_INFO, "\n")); + } + + Hob.Raw =3D GET_NEXT_HOB (Hob.Raw); + Hob.Guid =3D (EFI_HOB_GUID_TYPE *)GetNextGuidHob (&gUefiOvmfPkgTdxAcpi= HobGuid, Hob.Raw); + } + + // + // Install DSDT table. If we reached this point without finding the DSDT, + // then we're out of sync with the hypervisor, and cannot continue. + // + if (DsdtTable =3D=3D NULL) { + DEBUG ((DEBUG_INFO, "%a: no DSDT found\n", __FUNCTION__)); + ASSERT (FALSE); + } + + Status =3D AcpiProtocol->InstallAcpiTable ( + AcpiProtocol, + DsdtTable, + DsdtTable->Length, + &TableHandle + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return Status; + } + + // + // Install a protocol to notify that the ACPI table provided by CH is + // ready. + // + gBS->InstallProtocolInterface ( + &mChAcpiHandle, + &gQemuAcpiTableNotifyProtocolGuid, + EFI_NATIVE_INTERFACE, + &mChAcpiNotifyProtocol + ); + + return EFI_SUCCESS; +} + // Get the ACPI tables from EBDA start EFI_STATUS EFIAPI diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index 5f5556c67c..a350bb8f84 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -151,6 +151,7 @@ gConfidentialComputingSevSnpBlobGuid =3D {0x067b1f5f, 0xcf26, 0x44c5, {= 0x85, 0x54, 0x93, 0xd7, 0x77, 0x91, 0x2d, 0x42}} gUefiOvmfPkgPlatformInfoGuid =3D {0xdec9b486, 0x1f16, 0x47c7, {= 0x8f, 0x68, 0xdf, 0x1a, 0x41, 0x88, 0x8b, 0xa5}} gVMMBootOrderGuid =3D {0x668f4529, 0x63d0, 0x4bb5, {= 0xb6, 0x5d, 0x6f, 0xbb, 0x9d, 0x36, 0xa4, 0x4a}} + gUefiOvmfPkgTdxAcpiHobGuid =3D {0x6a0c5870, 0xd4ed, 0x44f4, {= 0xa1, 0x35, 0xdd, 0x23, 0x8b, 0x6f, 0x0c, 0x8d}} =20 [Ppis] # PPI whose presence in the PPI database signals that the TPM base addre= ss --=20 2.34.1 --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris,=20 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 5 208 026.16 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. -=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 (#97256): https://edk2.groups.io/g/devel/message/97256 Mute This Topic: https://groups.io/mt/95617498/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-