Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Library/SmmIoLib/SmmIoLib.c

Timestamp:

Apr 14, 2023 3:17:44 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156854

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• MdePkg/Library/SmmIoLib/SmmIoLib.c (modified) (13 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Library/SmmIoLib/SmmIoLib.c

@@ -10 +10 @@
 
 **/
-
 
 #include <PiSmm.h>
@@ -25 +24 @@
 #include <Protocol/SmmEndOfDxe.h>
 
-EFI_GCD_MEMORY_SPACE_DESCRIPTOR   *mSmmIoLibGcdMemSpace       = NULL;
-UINTN                             mSmmIoLibGcdMemNumberOfDesc = 0;
+EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *mSmmIoLibGcdMemSpace       = NULL;
+UINTN                            mSmmIoLibGcdMemNumberOfDesc = 0;
 
 EFI_PHYSICAL_ADDRESS  mSmmIoLibInternalMaximumSupportMemAddress = 0;
 
-VOID                  *mSmmIoLibRegistrationEndOfDxe;
-VOID                  *mSmmIoLibRegistrationReadyToLock;
-
-BOOLEAN               mSmmIoLibReadyToLock = FALSE;
+VOID  *mSmmIoLibRegistrationEndOfDxe;
+VOID  *mSmmIoLibRegistrationReadyToLock;
+
+BOOLEAN  mSmmIoLibReadyToLock = FALSE;
 
 /**
@@ -44 +43 @@
   )
 {
-  VOID         *Hob;
-  UINT32       RegEax;
-  UINT8        MemPhysicalAddressBits;
+  VOID    *Hob;
+  UINT32  RegEax;
+  UINT8   MemPhysicalAddressBits;
 
   //
@@ -53 +52 @@
   Hob = GetFirstHob (EFI_HOB_TYPE_CPU);
   if (Hob != NULL) {
-    MemPhysicalAddressBits = ((EFI_HOB_CPU *) Hob)->SizeOfMemorySpace;
+    MemPhysicalAddressBits = ((EFI_HOB_CPU *)Hob)->SizeOfMemorySpace;
   } else {
     AsmCpuid (0x80000000, &RegEax, NULL, NULL, NULL);
     if (RegEax >= 0x80000008) {
       AsmCpuid (0x80000008, &RegEax, NULL, NULL, NULL);
-      MemPhysicalAddressBits = (UINT8) RegEax;
+      MemPhysicalAddressBits = (UINT8)RegEax;
     } else {
       MemPhysicalAddressBits = 36;
     }
   }
+
   //
   // IA-32e paging translates 48-bit linear addresses to 52-bit physical addresses.
@@ -99 +99 @@
   )
 {
-  UINTN                           Index;
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR *Desc;
-  BOOLEAN                         InValidRegion;
+  UINTN                            Index;
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *Desc;
+  BOOLEAN                          InValidRegion;
 
   //
@@ -109 +109 @@
   if ((Length > mSmmIoLibInternalMaximumSupportMemAddress) ||
       (BaseAddress > mSmmIoLibInternalMaximumSupportMemAddress) ||
-      ((Length != 0) && (BaseAddress > (mSmmIoLibInternalMaximumSupportMemAddress - (Length - 1)))) ) {
+      ((Length != 0) && (BaseAddress > (mSmmIoLibInternalMaximumSupportMemAddress - (Length - 1)))))
+  {
     //
     // Overflow happen
@@ -128 +129 @@
   if (mSmmIoLibReadyToLock) {
     InValidRegion = FALSE;
-    for (Index = 0; Index < mSmmIoLibGcdMemNumberOfDesc; Index ++) {
+    for (Index = 0; Index < mSmmIoLibGcdMemNumberOfDesc; Index++) {
       Desc = &mSmmIoLibGcdMemSpace[Index];
       if ((Desc->GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo) &&
           (BaseAddress >= Desc->BaseAddress) &&
-          ((BaseAddress + Length) <= (Desc->BaseAddress + Desc->Length))) {
+          ((BaseAddress + Length) <= (Desc->BaseAddress + Desc->Length)))
+      {
         InValidRegion = TRUE;
       }
@@ -147 +149 @@
     }
   }
+
   return TRUE;
 }
@@ -167 +170 @@
   )
 {
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR       *GcdMemoryMapEntry;
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR       *GcdMemoryMapEnd;
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR       *NewGcdMemoryMapEntry;
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR       *NextGcdMemoryMapEntry;
-
-  GcdMemoryMapEntry = GcdMemoryMap;
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *GcdMemoryMapEntry;
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *GcdMemoryMapEnd;
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *NewGcdMemoryMapEntry;
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *NextGcdMemoryMapEntry;
+
+  GcdMemoryMapEntry    = GcdMemoryMap;
   NewGcdMemoryMapEntry = GcdMemoryMap;
-  GcdMemoryMapEnd = (EFI_GCD_MEMORY_SPACE_DESCRIPTOR *) ((UINT8 *) GcdMemoryMap + (*NumberOfDescriptors) * sizeof(EFI_GCD_MEMORY_SPACE_DESCRIPTOR));
+  GcdMemoryMapEnd      = (EFI_GCD_MEMORY_SPACE_DESCRIPTOR *)((UINT8 *)GcdMemoryMap + (*NumberOfDescriptors) * sizeof (EFI_GCD_MEMORY_SPACE_DESCRIPTOR));
   while ((UINTN)GcdMemoryMapEntry < (UINTN)GcdMemoryMapEnd) {
-    CopyMem (NewGcdMemoryMapEntry, GcdMemoryMapEntry, sizeof(EFI_GCD_MEMORY_SPACE_DESCRIPTOR));
+    CopyMem (NewGcdMemoryMapEntry, GcdMemoryMapEntry, sizeof (EFI_GCD_MEMORY_SPACE_DESCRIPTOR));
     NextGcdMemoryMapEntry = GcdMemoryMapEntry + 1;
 
@@ -182 +185 @@
       if (((UINTN)NextGcdMemoryMapEntry < (UINTN)GcdMemoryMapEnd) &&
           (GcdMemoryMapEntry->GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo) && (NextGcdMemoryMapEntry->GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo) &&
-          ((GcdMemoryMapEntry->BaseAddress + GcdMemoryMapEntry->Length) == NextGcdMemoryMapEntry->BaseAddress)) {
+          ((GcdMemoryMapEntry->BaseAddress + GcdMemoryMapEntry->Length) == NextGcdMemoryMapEntry->BaseAddress))
+      {
         GcdMemoryMapEntry->Length += NextGcdMemoryMapEntry->Length;
         if (NewGcdMemoryMapEntry != GcdMemoryMapEntry) {
@@ -196 +200 @@
     } while (TRUE);
 
-    GcdMemoryMapEntry = GcdMemoryMapEntry + 1;
+    GcdMemoryMapEntry    = GcdMemoryMapEntry + 1;
     NewGcdMemoryMapEntry = NewGcdMemoryMapEntry + 1;
   }
 
-  *NumberOfDescriptors = ((UINTN)NewGcdMemoryMapEntry - (UINTN)GcdMemoryMap) / sizeof(EFI_GCD_MEMORY_SPACE_DESCRIPTOR);
-
-  return ;
+  *NumberOfDescriptors = ((UINTN)NewGcdMemoryMapEntry - (UINTN)GcdMemoryMap) / sizeof (EFI_GCD_MEMORY_SPACE_DESCRIPTOR);
+
+  return;
 }
 
@@ -229 +233 @@
   Status = gDS->GetMemorySpaceMap (&NumberOfDescriptors, &MemSpaceMap);
   if (!EFI_ERROR (Status)) {
-
     MergeGcdMmioEntry (MemSpaceMap, &NumberOfDescriptors);
 
@@ -283 +286 @@
   )
 {
-  EFI_STATUS                    Status;
+  EFI_STATUS  Status;
 
   //