public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Sachin Ganesh via groups.io" <sachinganesh=ami.com@groups.io>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "gaoliming@byosoft.com.cn" <gaoliming@byosoft.com.cn>,
	"zhiguang.liu@intel.com" <zhiguang.liu@intel.com>,
	"michael.d.kinney@intel.com" <michael.d.kinney@intel.com>,
	"ardb+tianocore@kernel.org" <ardb+tianocore@kernel.org>,
	"kraxel@redhat.com" <kraxel@redhat.com>,
	"jiewen.yao@intel.com" <jiewen.yao@intel.com>,
	"erdemaktas@google.com" <erdemaktas@google.com>,
	"min.m.xu@intel.com" <min.m.xu@intel.com>,
	"thomas.lendacky@amd.com" <thomas.lendacky@amd.com>,
	Felix Polyudov <Felixp@ami.com>, Dhanaraj V <vdhanaraj@ami.com>,
	Sachin Ganesh <sachinganesh@ami.com>
Subject: [edk2-devel] [PATCH 7/7] OvmfPkg: Use newly defined Unaccepted Memory Type
Date: Fri, 19 Apr 2024 21:46:25 +0000	[thread overview]
Message-ID: <bb1c68f57fd9d914b23f4c437e83ea6251296289.1713559868.git.sachinganesh@ami.com> (raw)
In-Reply-To: <cover.1713559868.git.sachinganesh@ami.com>

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 <felixp@ami.com>
Cc: Dhanaraj V <vdhanaraj@ami.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Sachin Ganesh <sachinganesh@ami.com>
---
 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 <Library/UefiBootServicesTableLib.h>

 #include <Guid/ConfidentialComputingSevSnpBlob.h>

 #include <Library/PcdLib.h>

-#include <Pi/PrePiDxeCis.h>

+#include <Pi/PiDxeCis.h>

 #include <Protocol/SevMemoryAcceptance.h>

 #include <Protocol/MemoryAccept.h>

 #include <Uefi/UefiSpec.h>

@@ -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 <Library/TdxLib.h>

 #include <Library/TdxMailboxLib.h>

 #include <Library/SynchronizationLib.h>

-#include <Pi/PrePiHob.h>

+#include <Pi/PiHob.h>

 #include <WorkArea.h>

 #include <ConfidentialComputingGuestAttr.h>

 #include <Library/TdxHelperLib.h>

@@ -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 <IndustryStandard/UefiTcgPlatform.h>

 #include <Library/PlatformInitLib.h>

 #include <OvmfPlatforms.h>

-#include <Pi/PrePiHob.h>

+#include <Pi/PiHob.h>

 #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 <IndustryStandard/Tdx.h>

 #include <IndustryStandard/IntelTdx.h>

 #include <Library/PeiServicesLib.h>

-#include <Pi/PrePiHob.h>

+#include <Pi/PiHob.h>

 #include <WorkArea.h>

 #include <ConfidentialComputingGuestAttr.h>



@@ -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 <Library/MemEncryptSevLib.h>

 #include <Library/MemoryAllocationLib.h>

 #include <Library/PcdLib.h>

-#include <Pi/PrePiHob.h>

+#include <Pi/PiHob.h>

 #include <PiPei.h>

 #include <Register/Amd/Msr.h>

 #include <Register/Intel/SmramSaveStateMap.h>

@@ -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;

         }



--
2.24.1.windows.2
-The information contained in this message may be confidential and proprietary 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 designee. If the reader of this message is not the intended recipient, you are on notice that any distribution of this message, in any form, is strictly prohibited. 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.


-=-=-=-=-=-=-=-=-=-=-=-
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]
-=-=-=-=-=-=-=-=-=-=-=-



  parent reply	other threads:[~2024-04-20  2:32 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-19 21:46 [edk2-devel] [PATCH 0/7] General Updates based on UEFI 2.10 and PI 1.8 Specification Sachin Ganesh via groups.io
2024-04-19 21:46 ` [edk2-devel] [PATCH 1/7] MdePkg: Add definition for NVMe Over Fabric Device Path Sachin Ganesh via groups.io
2024-04-19 21:46 ` [edk2-devel] [PATCH 2/7] MdePkg: Add new Resource Attributes defined in PI 1.8 Spec Sachin Ganesh via groups.io
2024-04-19 21:46 ` [edk2-devel] [PATCH 3/7] MdePkg: Define Unaccepted Memory Type Sachin Ganesh via groups.io
2024-04-19 21:46 ` [edk2-devel] [PATCH 4/7] MdeModulePkg: Use newly defined " Sachin Ganesh via groups.io
2024-04-19 21:46 ` [edk2-devel] [PATCH 5/7] MdePkg: Update Delayed Dispatch PPI as per PI 1.8 Spec Sachin Ganesh via groups.io
2024-04-19 21:46 ` [edk2-devel] [PATCH 6/7] MdePkg: Update to PI 1.8 Revision Sachin Ganesh via groups.io
2024-04-19 21:46 ` Sachin Ganesh via groups.io [this message]
2024-04-22 19:54   ` [edk2-devel] [PATCH 7/7] OvmfPkg: Use newly defined Unaccepted Memory Type Lendacky, Thomas via groups.io
2024-04-21  2:28 ` [edk2-devel] [PATCH 0/7] General Updates based on UEFI 2.10 and PI 1.8 Specification Yao, Jiewen
2024-04-23 14:49 ` [edk2-devel] 回复: " gaoliming via groups.io
2024-04-23 17:27   ` Felix Polyudov via groups.io
2024-04-25  9:56     ` Sachin Ganesh via groups.io
2024-04-26  9:22       ` [edk2-devel] 回复: [EXTERNAL] " gaoliming via groups.io
2024-04-30 22:35         ` [edk2-devel] " Felix Polyudov via groups.io
2024-05-06  2:43           ` [edk2-devel] 回复: [EXTERNAL] " gaoliming via groups.io

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bb1c68f57fd9d914b23f4c437e83ea6251296289.1713559868.git.sachinganesh@ami.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox