Extract the SetIoPadding() and SetMmioPadding() functions, so that we can
set EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR fields using parameter names and
values that are more friendly than the original field names and their
expected values.

Introduce the HighBitSetRoundUp32() and HighBitSetRoundUp64() functions
for calculating the last parameter ("SizeExponent") of SetIoPadding() and
SetMmioPadding().

Put the new functions to use when requesting the default reservations. (In
order to be consistent with a later patch, "SizeExponent" is calculated
for SetIoPadding() with HighBitSetRoundUp64().)

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Marcel Apfelbaum <marcel@redhat.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf |   1 +
 OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c   | 165 ++++++++++++++++++--
 2 files changed, 156 insertions(+), 10 deletions(-)

diff --git a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
index 91729ae1ed04..e0ec9baae1c2 100644
--- a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
+++ b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
@@ -28,8 +28,9 @@ [Packages]
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
+  BaseLib
   BaseMemoryLib
   DebugLib
   DevicePathLib
   MemoryAllocationLib
diff --git a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c
index b1b2c5cd8ddc..39646973794b 100644
--- a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c
+++ b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c
@@ -14,8 +14,9 @@
 **/
 
 #include <IndustryStandard/Acpi10.h>
 
+#include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
 #include <Library/DevicePathLib.h>
 #include <Library/MemoryAllocationLib.h>
@@ -97,8 +98,155 @@ InitializeResourcePadding (
   ResourcePadding->EndDesc.Desc = ACPI_END_TAG_DESCRIPTOR;
 }
 
 
+/**
+  Set up a descriptor entry for reserving IO space.
+
+  @param[in,out] Descriptor  The descriptor to configure. The caller shall have
+                             initialized Descriptor earlier, with
+                             InitializeResourcePadding().
+
+  @param[in] SizeExponent    The size and natural alignment of the reservation
+                             are determined by raising two to this power.
+**/
+STATIC
+VOID
+SetIoPadding (
+  IN OUT EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor,
+  IN     UINTN                             SizeExponent
+  )
+{
+  Descriptor->ResType = ACPI_ADDRESS_SPACE_TYPE_IO;
+  Descriptor->AddrLen = LShiftU64 (1, SizeExponent);
+  Descriptor->AddrRangeMax = Descriptor->AddrLen - 1;
+}
+
+
+/**
+  Set up a descriptor entry for reserving MMIO space.
+
+  @param[in,out] Descriptor    The descriptor to configure. The caller shall
+                               have initialized Descriptor earlier, with
+                               InitializeResourcePadding().
+
+  @param[in] Prefetchable      TRUE if the descriptor should reserve
+                               prefetchable MMIO space. Pass FALSE for
+                               reserving non-prefetchable MMIO space.
+
+  @param[in] ThirtyTwoBitOnly  TRUE if the reservation should be limited to
+                               32-bit address space. FALSE if the reservation
+                               can be satisfied from 64-bit address space.
+                               ThirtyTwoBitOnly is ignored if Prefetchable is
+                               FALSE; in that case ThirtyTwoBitOnly is always
+                               considered TRUE.
+
+  @param[in] SizeExponent      The size and natural alignment of the
+                               reservation are determined by raising two to
+                               this power.
+**/
+STATIC
+VOID
+SetMmioPadding (
+  IN OUT EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor,
+  IN     BOOLEAN                           Prefetchable,
+  IN     BOOLEAN                           ThirtyTwoBitOnly,
+  IN     UINTN                             SizeExponent
+  )
+{
+  Descriptor->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM;
+  if (Prefetchable) {
+    Descriptor->SpecificFlag =
+      EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETCHABLE;
+    Descriptor->AddrSpaceGranularity = ThirtyTwoBitOnly ? 32 : 64;
+  } else {
+    Descriptor->SpecificFlag =
+      EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_NON_CACHEABLE;
+    Descriptor->AddrSpaceGranularity = 32;
+  }
+  Descriptor->AddrLen = LShiftU64 (1, SizeExponent);
+  Descriptor->AddrRangeMax = Descriptor->AddrLen - 1;
+}
+
+
+/**
+  Round up a positive 32-bit value to the next whole power of two, and return
+  the bit position of the highest bit set in the result. Equivalent to
+  ceil(log2(x)).
+
+  @param[in] Operand  The 32-bit operand to evaluate.
+
+  @retval -1     Operand is zero.
+
+  @retval -1     Operand is positive, not a whole power of two, and rounding it
+                 up to the next power of two does not fit into 32 bits.
+
+  @retval 0..31  Otherwise, return ceil(log2(Value)).
+**/
+STATIC
+INTN
+HighBitSetRoundUp32 (
+  IN UINT32 Operand
+  )
+{
+  INTN HighBit;
+
+  HighBit = HighBitSet32 (Operand);
+  if (HighBit == -1) {
+    //
+    // Operand is zero.
+    //
+    return HighBit;
+  }
+  if ((Operand & (Operand - 1)) != 0) {
+    //
+    // Operand is not a whole power of two.
+    //
+    ++HighBit;
+  }
+  return (HighBit < 32) ? HighBit : -1;
+}
+
+
+/**
+  Round up a positive 64-bit value to the next whole power of two, and return
+  the bit position of the highest bit set in the result. Equivalent to
+  ceil(log2(x)).
+
+  @param[in] Operand  The 64-bit operand to evaluate.
+
+  @retval -1     Operand is zero.
+
+  @retval -1     Operand is positive, not a whole power of two, and rounding it
+                 up to the next power of two does not fit into 64 bits.
+
+  @retval 0..63  Otherwise, return ceil(log2(Value)).
+**/
+STATIC
+INTN
+HighBitSetRoundUp64 (
+  IN UINT64 Operand
+  )
+{
+  INTN HighBit;
+
+  HighBit = HighBitSet64 (Operand);
+  if (HighBit == -1) {
+    //
+    // Operand is zero.
+    //
+    return HighBit;
+  }
+  if ((Operand & (Operand - 1)) != 0) {
+    //
+    // Operand is not a whole power of two.
+    //
+    ++HighBit;
+  }
+  return (HighBit < 64) ? HighBit : -1;
+}
+
+
 /**
   Returns a list of root Hot Plug Controllers (HPCs) that require
   initialization during the boot process.
 
@@ -297,12 +445,9 @@ GetResourcePadding (
   if (DefaultIo) {
     //
     // Request defaults.
     //
-    --FirstResource;
-    FirstResource->ResType      = ACPI_ADDRESS_SPACE_TYPE_IO;
-    FirstResource->AddrRangeMax = 512 - 1; // align at 512 IO ports
-    FirstResource->AddrLen      = 512;     // 512 IO ports
+    SetIoPadding (--FirstResource, (UINTN)HighBitSetRoundUp64 (512));
   }
 
   //
   // (c) Reserve non-prefetchable MMIO space (32-bit only).
@@ -310,14 +455,14 @@ GetResourcePadding (
   if (DefaultMmio) {
     //
     // Request defaults.
     //
-    --FirstResource;
-    FirstResource->ResType              = ACPI_ADDRESS_SPACE_TYPE_MEM;
-    FirstResource->SpecificFlag         = 0;            // non-prefetchable
-    FirstResource->AddrSpaceGranularity = 32;           // 32-bit aperture
-    FirstResource->AddrRangeMax         = SIZE_2MB - 1; // align at 2MB
-    FirstResource->AddrLen              = SIZE_2MB;     // 2MB padding
+    SetMmioPadding (
+      --FirstResource,
+      FALSE,
+      TRUE,
+      (UINTN)HighBitSetRoundUp32 (SIZE_2MB)
+      );
   }
 
   //
   // Output a copy of ReservationRequest from the lowest-address populated
-- 
2.14.1.3.gb7cf6e02401b


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel