From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id 258EF780091 for ; Sat, 20 Apr 2024 02:32:04 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=lLxYFQ/TYsyRaQyZdtKwLbI1OpqyyK3aDnvDzXdrHpI=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language: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-Language:Content-Type:Content-Transfer-Encoding; s=20240206; t=1713580323; v=1; b=Bj8/toUiWrN935Bh4Jvm7acnsCnvMAxC11Wz854CcDqlap9YQbLAcKYg8RKvOTPEO2mDNIz9 9Z6k7ALAtombYoXO5cMng3wkVmBVmpy4rbLkOANBXmY1H7+AZRICpceWrD9sdCsrbJSjsk6i6/e QOPlt0sKuxf2R/nSKOg7Xviomsz353o8fky2dbYWTSLQZZUx6/kw0jSBKk7WVVI4cBhsIxfFqmd KrIOb4as+AyjCmVHPuwEGkxLSARFF7Vq0fpl+1C/JlXMzGM4R7vOShryKhjcT4bCAVyWSbJKJfs iBG2AVIpVh1qMvYPDRb3q40sM9ml+Ty0JRcQ0LE3nGoCw== X-Received: by 127.0.0.2 with SMTP id JcyIYY7687511xa6F8LQ0NEO; Fri, 19 Apr 2024 19:32:03 -0700 X-Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.126]) by mx.groups.io with SMTP id smtpd.web11.191.1713563186507325937 for ; Fri, 19 Apr 2024 14:46:26 -0700 X-Received: from BL3PR10MB6161.namprd10.prod.outlook.com (2603:10b6:208:3bc::16) by SJ1PR10MB5977.namprd10.prod.outlook.com (2603:10b6:a03:488::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.43; Fri, 19 Apr 2024 21:46:25 +0000 X-Received: from BL3PR10MB6161.namprd10.prod.outlook.com ([fe80::78e5:e1a1:9770:f20a]) by BL3PR10MB6161.namprd10.prod.outlook.com ([fe80::78e5:e1a1:9770:f20a%5]) with mapi id 15.20.7472.042; Fri, 19 Apr 2024 21:46:25 +0000 From: "Sachin Ganesh via groups.io" To: "devel@edk2.groups.io" CC: "gaoliming@byosoft.com.cn" , "zhiguang.liu@intel.com" , "michael.d.kinney@intel.com" , "ardb+tianocore@kernel.org" , "kraxel@redhat.com" , "jiewen.yao@intel.com" , "erdemaktas@google.com" , "min.m.xu@intel.com" , "thomas.lendacky@amd.com" , Felix Polyudov , Dhanaraj V , Sachin Ganesh Subject: [edk2-devel] [PATCH 7/7] OvmfPkg: Use newly defined Unaccepted Memory Type Thread-Topic: [PATCH 7/7] OvmfPkg: Use newly defined Unaccepted Memory Type Thread-Index: AQHakqMGmseqp8EZ0UW4xnHqGtmAqw== Date: Fri, 19 Apr 2024 21:46:25 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-GB, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BL3PR10MB6161:EE_|SJ1PR10MB5977:EE_ x-ms-office365-filtering-correlation-id: 12311c75-a4b8-4922-836e-08dc60ba294d x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: dRSNFsed/si0newBZblHOx1cHHT0ZbK1VQtYhrfYwVzREkN2ydfRjUwh85n0aLsA2GbI0hrxtOqmvGg3HhoVVoijOi+X2hYdxYLbKdtYgYCmZzfbgcNuCKVfcv20La9IUDKlDalmz+ZLRcc/LgLcG1UHquDUUQj+bvlB1J+sugleo33/h9CU4qal/R1h1ZxItSCWD2X50MkGNal8H7PcUz6j6aZ4gYDM6FbQaPCwm3CSUyyi7b1lBn64foHzUIrGSfQKJypxibLmKuVbcAD2+EoR0Mt0RjqSDCkhf9LTVOltir0vKclpjw7eXAOB9h2c1wtdfoKC4d7NGROlgfn124mn8lgehXeTYJjoL6Ubr0iIw01Gtf/50zW7wGHUwgH8dbu9HWL7G0P058PDu7XJBxuJYWnOiFDjBinNarvmiN+KCWqzrP26CFPEgxvabaWsCfTfkgTqJxEonIYT5KG2H6QnHIzejGpScGZdo/kBIIPZ5erW1Qp1iZ+DyrWJJ4CJf5EQ/Ca9ri6+4nIOH3MvPv47gih01GtjwWjp5MFISmVtWxvq8Vt8/CcoPjvszEDQzKUq6RsutxYG0dopINB7FM5FamZ+rpgJi29YCZRcxrQtcBIXXgD8JY3szzk5dxtEotWvydGRqp7Xon6CJyWuCXV/NZIJiIhcUEGGxyIvcWwYaPzKLRDEEHFdGuBwiTzq/0OKcU3bs1J5tfOSL1gk7wwJmWIOqRKg9ybMKfoN228= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?H5Z4i7VUy/Yf8L2Q4KDjtyLNJ/74az9TeWSqqfwlLqiQHMS4xM4ctFuK38?= =?iso-8859-1?Q?/pJ3t2iMmg6hsjmYJUPi00yEIwXGli57lgUyGqxiQaTAAzu3tqQVforjDC?= =?iso-8859-1?Q?szqylPJDN4kpVbU7y8Be1ftxA04XdUj2WkRFKK8ucDszXHOy0Tz4yE+Cbj?= =?iso-8859-1?Q?MNe1iY9tEen81NZd5b/YkAFE9Tpao1+9L+S8jRmFWZmjKHaPsO6FZJgVfV?= =?iso-8859-1?Q?STvLJ41YjSj0aX1c3nQJlvtjKkh+uNfAWxbaRiKhLn/nex7F9bHP3h+VOP?= =?iso-8859-1?Q?jAzxaXB5L62qzIPCbqCOivY4sWNCCH/RJmkPeK4gb4NkxcP4QXQOnOSLdH?= =?iso-8859-1?Q?j5zFhBN/1IeG4T8wdgG9cBDZ485esxxgY5kYAJ7VqMbVdXKpTyMps+K4+y?= =?iso-8859-1?Q?rKfyAgC1BEdpvdymf6G/ZdawcTBSEtJ7pnb5w0VdTqv3ramerfyFzwjQpm?= =?iso-8859-1?Q?45jSXSDE3mHNnFtyAihhrFUPabEiiUq7RxjGB0TkVrEziPfJtKMDa5Yqt3?= =?iso-8859-1?Q?hPKEg/IoClP6fMxsH5nSdHID9dVVyMnHSA4+23Mu3wSnQkRKj26b87FL1x?= =?iso-8859-1?Q?mUEgQzwlSWVtQoev8Vh46m8duR+KXBjRQbxFusqKi07hw8reZ63V79ytjN?= =?iso-8859-1?Q?uMc47UyU3cTwi/2l355LyKfm/gn4W9i0NFpGZURW7p4uZIAfL/BaFp03w4?= =?iso-8859-1?Q?v+x5j0lJ4pnV3uyjhKiZIM0lTj/tln9qYHr8YrTmnqT0o7hcYGSZeyQlbM?= =?iso-8859-1?Q?EVrLEmnpCQZEMHrKLcgKMc/BU+nssZSdHzbA/lLmW23ixWnSkDQEmUUADe?= =?iso-8859-1?Q?zd8kjBUWGZQL56wXnm/RzsExFF/S5MH0NzjToqgaaweLOvmtXMMqUsSyhj?= =?iso-8859-1?Q?YpoUwkFpqQblNKzx+lVv8etJpHnkIv7bdQN2lo8W3nnmhtTxYcKfnQGVev?= =?iso-8859-1?Q?wR8zQ6eDH2ud3tUxZlHCWPygJ41ojqp+SBhqc0MfOKgRfmRZdZ7Fgr3J8m?= =?iso-8859-1?Q?QuGwMjAd+/tnf/PSJJdOEY965Teerz8Is0j9goL4hS4etLfiI7WfuAW+ey?= =?iso-8859-1?Q?gISCATW89LzMKPCKhsKTO2m6l30QcVmUBN+MviK1/B/GdRcGvBQN5B5qyA?= =?iso-8859-1?Q?5gs7E9gZ1vkwPoCNlwXbwaYCjK579kfms1GKzIUgbVzdH1D5oVCsXVV8RK?= =?iso-8859-1?Q?qCJWPm48dZLTyY5rC7hiLYxqqdO7c+BIceZONSFodndrD3PoAkzvJYQPYX?= =?iso-8859-1?Q?X6hNoSDMtIpaN+w+nvge1l4Akv5WuGPGEYL09MMogU2WuSTI6R4yu8UpQb?= =?iso-8859-1?Q?D2yzZBwaT+Si0RYnAnv5qCqMDISCjM9ripkPXn/pkEOxugi36n/iKZAZQO?= =?iso-8859-1?Q?uWsxRMlhu7CwFnP/uzhh8Bt/jbdLtdcbJ/htdt4PpmtPt3+STBIs3n3O7t?= =?iso-8859-1?Q?N6K4GuKZw8D4b3QPgPbPl2u5lJ+R2rnEaRb/rIyTCasAWXF4Xx9WODL+GL?= =?iso-8859-1?Q?nwUpH1Q9Anq66zAg9+1kOQly6Ns2PzSaNkMcCmmbwX10CZ0LcLc1xi+CaC?= =?iso-8859-1?Q?+C8gpMh31328vvdog7Me6vikPUHTUC8Pwx/chfHilsUT3SUJ+eI5kITjeM?= =?iso-8859-1?Q?7+fBtp0aGklqKSoYrlT2j8+smW4tDHN5Bt?= MIME-Version: 1.0 X-OriginatorOrg: ami.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL3PR10MB6161.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 12311c75-a4b8-4922-836e-08dc60ba294d X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Apr 2024 21:46:25.2866 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 27e97857-e15f-486c-b58e-86c2b3040f93 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: mG0TdDM93R3TfigFD2YJUhEHoPX+cF0yyPkEJKXYH53d6qZY9CwKoVi1vtNz0i44xxmq9/qGnMJIe6Hp4/E6YQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR10MB5977 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: Fri, 19 Apr 2024 19:31:56 -0700 Resent-From: sachinganesh@ami.com Reply-To: devel@edk2.groups.io,sachinganesh@ami.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: vzlhhQ7axrZ64k2OBACNjZ21x7686176AA= Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" 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="Bj8/toUi"; dmarc=pass (policy=none) header.from=groups.io; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io EFI_RESOURCE_MEMORY_UNACCEPTED has been officially defined in the PI 1.8 specification. So all temporary solutions have been replaced with the actual definition. Cc: Felix Polyudov Cc: Dhanaraj V Cc: Jiewen Yao Cc: Liming Gao Signed-off-by: Sachin Ganesh --- OvmfPkg/AmdSevDxe/AmdSevDxe.c | 4 ++-- OvmfPkg/IntelTdx/TdxHelperLib/SecTdxHelper.c | 8 ++++---- OvmfPkg/Library/PeilessStartupLib/Hob.c | 4 ++-- OvmfPkg/Library/PlatformInitLib/IntelTdx.c | 8 ++++---- OvmfPkg/PlatformPei/AmdSev.c | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c index db3675ae86..d497a343d3 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -119,7 +119,7 @@ AcceptAllMemory ( CONST EFI_GCD_MEMORY_SPACE_DESCRIPTOR *Desc; Desc =3D &AllDescMap[Index]; - if (Desc->GcdMemoryType !=3D EFI_GCD_MEMORY_TYPE_UNACCEPTED) { + if (Desc->GcdMemoryType !=3D EfiGcdMemoryTypeUnaccepted) { continue; } diff --git a/OvmfPkg/IntelTdx/TdxHelperLib/SecTdxHelper.c b/OvmfPkg/IntelTd= x/TdxHelperLib/SecTdxHelper.c index 3372cee2f7..b6085eab44 100644 --- a/OvmfPkg/IntelTdx/TdxHelperLib/SecTdxHelper.c +++ b/OvmfPkg/IntelTdx/TdxHelperLib/SecTdxHelper.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -351,7 +351,7 @@ AcceptMemoryForAPsStack ( if (Hob.Header->HobType =3D=3D EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { DEBUG ((DEBUG_INFO, "\nResourceType: 0x%x\n", Hob.ResourceDescriptor= ->ResourceType)); - if (Hob.ResourceDescriptor->ResourceType =3D=3D BZ3937_EFI_RESOURCE_= MEMORY_UNACCEPTED) { + if (Hob.ResourceDescriptor->ResourceType =3D=3D EFI_RESOURCE_MEMORY_= UNACCEPTED) { ResourceLength =3D Hob.ResourceDescriptor->ResourceLength; PhysicalStart =3D Hob.ResourceDescriptor->PhysicalStart; PhysicalEnd =3D PhysicalStart + ResourceLength; @@ -427,7 +427,7 @@ AcceptMemory ( // while (!END_OF_HOB_LIST (Hob)) { if (Hob.Header->HobType =3D=3D EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { - if (Hob.ResourceDescriptor->ResourceType =3D=3D BZ3937_EFI_RESOURCE_= MEMORY_UNACCEPTED) { + if (Hob.ResourceDescriptor->ResourceType =3D=3D EFI_RESOURCE_MEMORY_= UNACCEPTED) { PhysicalStart =3D Hob.ResourceDescriptor->PhysicalStart; PhysicalEnd =3D PhysicalStart + Hob.ResourceDescriptor->Resource= Length; @@ -563,7 +563,7 @@ ValidateHobList ( EFI_RESOURCE_MEMORY_MAPPED_IO_PORT, EFI_RESOURCE_MEMORY_RESERVED, EFI_RESOURCE_IO_RESERVED, - BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED + EFI_RESOURCE_MEMORY_UNACCEPTED }; if (VmmHobList =3D=3D NULL) { diff --git a/OvmfPkg/Library/PeilessStartupLib/Hob.c b/OvmfPkg/Library/Peil= essStartupLib/Hob.c index 318b74c95d..725927da73 100644 --- a/OvmfPkg/Library/PeilessStartupLib/Hob.c +++ b/OvmfPkg/Library/PeilessStartupLib/Hob.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "PeilessStartupInternal.h" /** @@ -92,7 +92,7 @@ ConstructFwHobList ( // while (!END_OF_HOB_LIST (Hob)) { if (Hob.Header->HobType =3D=3D EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { - if (Hob.ResourceDescriptor->ResourceType =3D=3D BZ3937_EFI_RESOURCE_= MEMORY_UNACCEPTED) { + if (Hob.ResourceDescriptor->ResourceType =3D=3D EFI_RESOURCE_MEMORY_= UNACCEPTED) { PhysicalEnd =3D Hob.ResourceDescriptor->PhysicalStart + Hob.Res= ourceDescriptor->ResourceLength; ResourceLength =3D Hob.ResourceDescriptor->ResourceLength; diff --git a/OvmfPkg/Library/PlatformInitLib/IntelTdx.c b/OvmfPkg/Library/P= latformInitLib/IntelTdx.c index ada8592ddd..e561cee30b 100644 --- a/OvmfPkg/Library/PlatformInitLib/IntelTdx.c +++ b/OvmfPkg/Library/PlatformInitLib/IntelTdx.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include @@ -40,9 +40,9 @@ BuildResourceDescriptorHobForUnacceptedMemory ( EFI_RESOURCE_ATTRIBUTE_TYPE ResourceAttribute; UINT64 MaxAcceptedMemoryAddress; - ASSERT (Hob->ResourceType =3D=3D BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED); + ASSERT (Hob->ResourceType =3D=3D EFI_RESOURCE_MEMORY_UNACCEPTED); - ResourceType =3D BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED; + ResourceType =3D EFI_RESOURCE_MEMORY_UNACCEPTED; ResourceAttribute =3D Hob->ResourceAttribute; PhysicalStart =3D Hob->PhysicalStart; ResourceLength =3D Hob->ResourceLength; @@ -104,7 +104,7 @@ TransferTdxHobList ( ResourceType =3D Hob.ResourceDescriptor->ResourceType; ResourceAttribute =3D Hob.ResourceDescriptor->ResourceAttribute; - if (ResourceType =3D=3D BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED) { + if (ResourceType =3D=3D EFI_RESOURCE_MEMORY_UNACCEPTED) { BuildResourceDescriptorHobForUnacceptedMemory (Hob.ResourceDescr= iptor); } else { BuildResourceDescriptorHob ( diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/AmdSev.c index e6724cf493..88ca14507f 100644 --- a/OvmfPkg/PlatformPei/AmdSev.c +++ b/OvmfPkg/PlatformPei/AmdSev.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -149,7 +149,7 @@ AmdSevSnpInitialize ( if (ResourceHob->ResourceType =3D=3D EFI_RESOURCE_SYSTEM_MEMORY) { if (ResourceHob->PhysicalStart >=3D SIZE_4GB) { - ResourceHob->ResourceType =3D BZ3937_EFI_RESOURCE_MEMORY_UNACCEP= TED; + ResourceHob->ResourceType =3D EFI_RESOURCE_MEMORY_UNACCEPTED; continue; } -- 2.24.1.windows.2 -The information contained in this message may be confidential and propriet= ary to American Megatrends (AMI). This communication is intended to be read= only by the individual or entity to whom it is addressed or by their desig= nee. If the reader of this message is not the intended recipient, you are o= n notice that any distribution of this message, in any form, is strictly pr= ohibited. Please promptly notify the sender by reply e-mail or by telephone= at 770-246-8600, and then delete or destroy all copies of the transmission= . -=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 (#118047): https://edk2.groups.io/g/devel/message/118047 Mute This Topic: https://groups.io/mt/105630626/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-