From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail04.groups.io (mail04.groups.io [45.79.224.9]) by spool.mail.gandi.net (Postfix) with ESMTPS id 33D657803CD for ; Wed, 17 Apr 2024 20:22:55 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=sj53dCU4EJaIBzZo2ILtGfAxI813ASWTYpmOcIhcXI4=; 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=1713385374; v=1; b=gH4pezIV6IvCcKYjQs4ZQAbidGozKtfhRjnj96Zbbs0A1r6Ns9d4ekZmFmDHhfsxVdYBeWhR AhOI4Ecs47BfriXNPHG3BBvGVmObnbHm6LbyaIJhQiamwT9ro09lqQmQgOs0iXsAHRd5etx0YKO Um3qpjsYs3B9/g9lrkgVj4XmAryVQQNuRHXJgLOZ1vb/rdSW9MBxlOR8WAB73Gj6+9a9S12QlYB URMGEts0yY1IpIXBVSGGyFk1TAMtogrheRQF7PjOTb2jkCYWbB3SlDYFhbzebPgEL80syajdUSV UxZBOtdTNsDFJ9caB7yjuHAhuuWeVRaxDerFVHfVE1e+w== X-Received: by 127.0.0.2 with SMTP id Bo0KYY7687511xhDoR1L1XTd; Wed, 17 Apr 2024 13:22:54 -0700 X-Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.110]) by mx.groups.io with SMTP id smtpd.web10.23596.1713383092529919401 for ; Wed, 17 Apr 2024 12:44:52 -0700 X-Received: from BL3PR10MB6161.namprd10.prod.outlook.com (2603:10b6:208:3bc::16) by PH7PR10MB7718.namprd10.prod.outlook.com (2603:10b6:510:30d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Wed, 17 Apr 2024 19:44:48 +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.7452.049; Wed, 17 Apr 2024 19:44:48 +0000 From: "Sachin Ganesh via groups.io" To: "devel@edk2.groups.io" CC: "gaoliming@byosoft.com.cn" , "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 6/6] OvmfPkg: Use newly defined Unaccepted Memory Type Thread-Topic: [PATCH 6/6] OvmfPkg: Use newly defined Unaccepted Memory Type Thread-Index: AQHakP+0e2mzyT5r3ky5Cur0xyWcgA== Date: Wed, 17 Apr 2024 19:44:48 +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_|PH7PR10MB7718:EE_ x-ms-office365-filtering-correlation-id: e7d1bc7c-9b41-4815-6a0e-08dc5f16d723 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: SS0YBJ8d1ok7L6AsdrJCDO8xWG/vuUUdyLtg7Fhdkn+tDJAfMPbh4WFbzJc+uRvh1KVkNqKYl4uTrTq6vAymgFf4MVNxhf/r9LMaBeKUinTINrGfK06VaioDFiabbiC/frNmCSbOHmqch2WzmJo7gS2kT7H4AgMmNfvurwj5M+cdHjYwbU72UfHJFpEi2+YR2EyWp/0rJyIwPUd1TeTwNB4ZVg4Uw/xjc60+6dJQj28QEahOkY2ruyMAFDVnk1gzM2vbY2DPhx84wTdG9bPmakRdej3jfmi+YTS09WfUECuEScRQbgkbiR3AX16ijDBmuY29zQr/PPjPQOV+XVGJbLJrFNR3fQGJjwhdOVNeO4/H9zkJKm1U0cGotgxrTnF37WB7mwftRQLQM/Gk3sLpj3J//Qgrfq7K5RqZcHgJaPbtyBJUg09ZZmAj1XjFTG4GXQspQhjrNmKnp0xolT1GcCxUXoJXTfdQpTjV5x7eIjLqmkM1IMKo4vKCF0NpD1S2Dk1+LL6tMAin9mVkj6XERmVY0/muUdoYYtGA3AHeFxGowMYoNXhSeJ9CZuoZZxeGbojhGl1pGNCZUugWuj2kzwSDSTJoaD/NKpA4dIzWKbjLlkPHlOwaHCfaLTcqWYsZuccOdT8ulMKhAP7KjGYNo0O1geHE/IXfVNGhevGEN/Sckdwiyh3q5C//vwDW3OeXW1cMu9siNDAMmJNwEXeLbv7yj/ZANp35Tkn0EsYgQOA= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?xNPT8qR4l7GNQkWPb45C5IyH+ae1RwJvlZsadBRMNb6hHJjMPLQUFUILEr?= =?iso-8859-1?Q?G9s5Fu/49aZpfGxxCHbTTniJ4M2VYfBCdHN97GcKJTcSKYKVnCy1lYYUPJ?= =?iso-8859-1?Q?LL854g9kXCvOgz7n4HKofA70ySywjYV0Hgp/jsBH9qqZd+z/1T06IVgTDH?= =?iso-8859-1?Q?D3j+sQn3oueFcTGavP2DXobyGahtHgKkW3ZCl41JIaB1tNfzhBPxX4c0rc?= =?iso-8859-1?Q?Ahx+tkYJCmV18kKlI+IYOjQNOsyfhPw+gpVLJwIdR36qlMZFwFjMW22/4L?= =?iso-8859-1?Q?C8h39pCGJA7vNHZSpQVXgZV9baHbWVqh2gDI3WP3VbbS+qCD+jG1rd28sA?= =?iso-8859-1?Q?m3wn48sdsD2WuzA/VrQx8wMcJf7bsI+D3m/X65LWYlUzJdjIk0CPZMyqM5?= =?iso-8859-1?Q?GeV/Lqte1wOYYavgTEsiis+QoWmQ1hG6+ssnuJOOOtQ/mFSfS/Ms8EGpGM?= =?iso-8859-1?Q?Whvyh0oqAfj+XDsTnmRd1SFf6HFl9QpB+z0aE1dz2CXWFKegUXkbjsHUMU?= =?iso-8859-1?Q?CarWsrgSh2xthaXzoumBH9mYB8JBlVCCYKF+J3eKSfKNa/26u7CYl7Qe1Y?= =?iso-8859-1?Q?T5KVf/I8gNQm8nq5NBsW5XTsknc+bS40l4w7lbit7nLBmtCPBqbZgVpVQz?= =?iso-8859-1?Q?9rI2XCyCGi/LJo/9gsIr6eVesVKe9w+YYOI6WIe6FWgwixEiB510xFFaC4?= =?iso-8859-1?Q?BkLwMs7pI4AT45g4xelwDrqHDBrdNTAoAl6NtjdjlnbAVwQE/mw8XBu1FA?= =?iso-8859-1?Q?GHjQK0WRbKTq06Z5VccF4djSLWI95JWpeHzMXVU7SCeQIh27+hqHvy5MMu?= =?iso-8859-1?Q?FoR6PzHBIME806WxDRxDIaa0iX0D9QdHO2tYxG9ekNgdgAYTzjY2kBrqz+?= =?iso-8859-1?Q?93gtrKXkWunJxsk20sV4UqzQ2qfQ/K7KJF8Iwx1erx3logYULnmHGjUOfF?= =?iso-8859-1?Q?NAQuqr/H913jxZvm7y/E+QOlrz3tEamQj66ra7ZWBffox7GrYFXJ7gf2vw?= =?iso-8859-1?Q?VUrsOrXnwBf5eFtjwN+5DWzjHGrofitSouZkUJdDJcRTRf7ljIRgVUbQUs?= =?iso-8859-1?Q?Tu069S7xLSJLXEbL8bfyq0473yNhL93bMqGSa/3xWov0hoCD8HRGT3Q+kS?= =?iso-8859-1?Q?jRQwJ2V4u/PFcesPki58LorfdoRxbqiLKID/vuoKyqcupw+iqHrn9ZtCt+?= =?iso-8859-1?Q?j0lt/XektSwoLhtpZamOhqnMrXOyeYn5eKEb6yMeJIKRj2GY9L7GDVKeBu?= =?iso-8859-1?Q?GEy35pF2QvprxH4l9dQe9JFpwdTSkKpjK24kDiptehQJJJ/6w2Og2m4CEo?= =?iso-8859-1?Q?qCnykBQdXqc5wxrOjMNPAdH8TJd2tL93YC+H7uFH1FLUy4ZFVQtLvKK2hB?= =?iso-8859-1?Q?3YjfGywkg6w/XNrli/T3nZiEkPbtkQWpYDoILpQNSCqsAib66C78jcMW/6?= =?iso-8859-1?Q?FZF2ea1KwC/a5Xz0ZvqNimZ19Gofxhdzu6qIFq9CCp6uBCur5cJ1aoNaK+?= =?iso-8859-1?Q?PJZ6s1MK0alJl5jruHaeyeSsWuHJwyfL4bAdwtKhVdRxUPKjmTEkCDGmne?= =?iso-8859-1?Q?3jFbOtvT4H2fr7FZsmC1c6rzTtLDZYOm8MJCXziv8fy1QUhGGxRLztWuWq?= =?iso-8859-1?Q?6DJtcamkSHpGlHkylGWPhLTaqY9v9RdCbD?= 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: e7d1bc7c-9b41-4815-6a0e-08dc5f16d723 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Apr 2024 19:44:48.2795 (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: LYmd0kDovwkt0vCjKOnOLa8e1Zh74gOunhH/p8FJ+0Mx31Mru05Ktv3pUgbWtVkDlDd0AnTs0HcWGHyQLyNm7g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB7718 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: Wed, 17 Apr 2024 13:22:54 -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: KkY3miRkg6B6qlXDgWEbfV5Gx7686176AA= 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=gH4pezIV; dmarc=pass (policy=none) header.from=groups.io; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.9 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: Ard Biesheuvel Cc: Jiewen Yao Cc: Gerd Hoffmann Cc: Erdem Aktas Cc: Min Xu Cc: Tom Lendacky 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 e6b602d79a..52fb4a7202 100644 --- a/OvmfPkg/PlatformPei/AmdSev.c +++ b/OvmfPkg/PlatformPei/AmdSev.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include @@ -67,7 +67,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 (#117931): https://edk2.groups.io/g/devel/message/117931 Mute This Topic: https://groups.io/mt/105585462/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-