From b82c9631da39ca5a1f0702185a46fea60446dd0a Mon Sep 17 00:00:00 2001 From: Sachin Ganesh Date: Wed, 17 Apr 2024 17:59:33 +0530 Subject: [PATCH] OvmfPkg: Use newly defined Unaccepted Memory Type 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 Reviewed-by: Jiewen Yao Reviewed-by: Tom Lendacky --- 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 = &AllDescMap[Index]; - if (Desc->GcdMemoryType != EFI_GCD_MEMORY_TYPE_UNACCEPTED) { + if (Desc->GcdMemoryType != EfiGcdMemoryTypeUnaccepted) { continue; } diff --git a/OvmfPkg/IntelTdx/TdxHelperLib/SecTdxHelper.c b/OvmfPkg/IntelTdx/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 == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { DEBUG ((DEBUG_INFO, "\nResourceType: 0x%x\n", Hob.ResourceDescriptor->ResourceType)); - if (Hob.ResourceDescriptor->ResourceType == BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED) { + if (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_UNACCEPTED) { ResourceLength = Hob.ResourceDescriptor->ResourceLength; PhysicalStart = Hob.ResourceDescriptor->PhysicalStart; PhysicalEnd = PhysicalStart + ResourceLength; @@ -427,7 +427,7 @@ AcceptMemory ( // while (!END_OF_HOB_LIST (Hob)) { if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { - if (Hob.ResourceDescriptor->ResourceType == BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED) { + if (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_UNACCEPTED) { PhysicalStart = Hob.ResourceDescriptor->PhysicalStart; PhysicalEnd = PhysicalStart + Hob.ResourceDescriptor->ResourceLength; @@ -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 == NULL) { diff --git a/OvmfPkg/Library/PeilessStartupLib/Hob.c b/OvmfPkg/Library/PeilessStartupLib/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 == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { - if (Hob.ResourceDescriptor->ResourceType == BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED) { + if (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_UNACCEPTED) { PhysicalEnd = Hob.ResourceDescriptor->PhysicalStart + Hob.ResourceDescriptor->ResourceLength; ResourceLength = Hob.ResourceDescriptor->ResourceLength; diff --git a/OvmfPkg/Library/PlatformInitLib/IntelTdx.c b/OvmfPkg/Library/PlatformInitLib/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 == BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED); + ASSERT (Hob->ResourceType == EFI_RESOURCE_MEMORY_UNACCEPTED); - ResourceType = BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED; + ResourceType = EFI_RESOURCE_MEMORY_UNACCEPTED; ResourceAttribute = Hob->ResourceAttribute; PhysicalStart = Hob->PhysicalStart; ResourceLength = Hob->ResourceLength; @@ -104,7 +104,7 @@ TransferTdxHobList ( ResourceType = Hob.ResourceDescriptor->ResourceType; ResourceAttribute = Hob.ResourceDescriptor->ResourceAttribute; - if (ResourceType == BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED) { + if (ResourceType == EFI_RESOURCE_MEMORY_UNACCEPTED) { BuildResourceDescriptorHobForUnacceptedMemory (Hob.ResourceDescriptor); } 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 == EFI_RESOURCE_SYSTEM_MEMORY) { if (ResourceHob->PhysicalStart >= SIZE_4GB) { - ResourceHob->ResourceType = BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED; + ResourceHob->ResourceType = EFI_RESOURCE_MEMORY_UNACCEPTED; continue; }