[PATCH 0/5] ArmPkg et al: remove UncachedMemoryallocationLib

[PATCH 0/5] ArmPkg et al: remove UncachedMemoryallocationLib

[Ard Biesheuvel]

This series is a followup to 'ArmPkg/ArmDmaLib: remove dependency on
UncachedMemoryAllocationLib' sent out yesterday, and removes library
entirely.

There are two reasons for this:
- UncachedMemoryAllocationLib is often abused by drivers that should
  be using DMA abstractions instead. It is up to the platform to decide
  whether DMA is cache coherent or not, and the fact that non-cache
  coherent DMA may be implemented using uncached allocations should remain
  an implementation detail of the DmaLib instance.

- The code is poorly maintained, only frees its allocations in the destructor,
  and misleads by exposing pool allocate/free entry points that are actually
  backed by page based allocations.

Patches #1 and #2 add a DmaAllocateAlignedBuffer() to DmaLib and both
its implementations. This is required for current users of
UncachedMemoryAllocationLib that rely on minimum alignment to be able
to switch the DmaLib.

Patches #3 and #4 remove a couple of stale references.

Patch #5 actually removes the library and its single remaining implementation.

Ard Biesheuvel (5):
  EmbeddedPkg/DmaLib: add routine to allocate aligned buffers
  ArmPkg/ArmDmaLib: implement DmaAllocateAlignedBuffer()
  BeagleBoardPkg: remove UncachedMemoryAllocationLib resolutions
  Omap35xxPkg: remove bogus UncachedMemoryAllocationLib dependency
  ArmPkg: remove UncachedMemoryAllocationLib

 ArmPkg/ArmPkg.dec                                                          |   4 -
 ArmPkg/ArmPkg.dsc                                                          |   2 -
 ArmPkg/Include/Library/UncachedMemoryAllocationLib.h                       | 665 ------------------
 ArmPkg/Library/ArmDmaLib/ArmDmaLib.c                                       |  42 +-
 ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.c   | 719 --------------------
 ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf |  50 --
 BeagleBoardPkg/BeagleBoardPkg.dsc                                          |   2 -
 EmbeddedPkg/Include/Library/DmaLib.h                                       |  30 +-
 EmbeddedPkg/Library/NullDmaLib/NullDmaLib.c                                |  48 +-
 Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf              |   1 +
 Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf                              |   1 -
 Omap35xxPkg/Omap35xxPkg.dsc                                                |   2 -
 12 files changed, 112 insertions(+), 1454 deletions(-)
 delete mode 100644 ArmPkg/Include/Library/UncachedMemoryAllocationLib.h
 delete mode 100644 ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.c
 delete mode 100644 ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf

-- 
2.11.0

[PATCH 1/5] EmbeddedPkg/DmaLib: add routine to allocate aligned buffers

[Ard Biesheuvel]

DmaLib's purpose is to manage memory that is shared between the host
and DMA capable devices. In some cases, this requires a larger alignment
than page size, and we currently don't cater for that in DmaLib. So add
a variant of DmaAllocateBuffer () that takes an alignment parameter.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 EmbeddedPkg/Include/Library/DmaLib.h        | 30 +++++++++++-
 EmbeddedPkg/Library/NullDmaLib/NullDmaLib.c | 48 ++++++++++++++++++--
 2 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/EmbeddedPkg/Include/Library/DmaLib.h b/EmbeddedPkg/Include/Library/DmaLib.h
index 3814291c2875..1843814c65ca 100644
--- a/EmbeddedPkg/Include/Library/DmaLib.h
+++ b/EmbeddedPkg/Include/Library/DmaLib.h
@@ -155,5 +155,33 @@ DmaFreeBuffer (
   );
 
 
-#endif
+/**
+  Allocates pages that are suitable for an DmaMap() of type
+  MapOperationBusMasterCommonBuffer mapping, at the requested alignment.
+
+  @param  MemoryType            The type of memory to allocate, EfiBootServicesData or
+                                EfiRuntimeServicesData.
+  @param  Pages                 The number of pages to allocate.
+  @param  Alignment             Alignment in bytes of the base of the returned
+                                buffer (must be a power of 2)
+  @param  HostAddress           A pointer to store the base system memory address of the
+                                allocated range.
 
+  @retval EFI_SUCCESS           The requested memory pages were allocated.
+  @retval EFI_UNSUPPORTED       Attributes is unsupported. The only legal attribute bits are
+                                MEMORY_WRITE_COMBINE and MEMORY_CACHED.
+  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.
+  @retval EFI_OUT_OF_RESOURCES  The memory pages could not be allocated.
+
+**/
+EFI_STATUS
+EFIAPI
+DmaAllocateAlignedBuffer (
+  IN  EFI_MEMORY_TYPE              MemoryType,
+  IN  UINTN                        Pages,
+  IN  UINTN                        Alignment,
+  OUT VOID                         **HostAddress
+  );
+
+
+#endif
diff --git a/EmbeddedPkg/Library/NullDmaLib/NullDmaLib.c b/EmbeddedPkg/Library/NullDmaLib/NullDmaLib.c
index a0bb57541d60..4cbe349190a9 100644
--- a/EmbeddedPkg/Library/NullDmaLib/NullDmaLib.c
+++ b/EmbeddedPkg/Library/NullDmaLib/NullDmaLib.c
@@ -100,23 +100,61 @@ DmaAllocateBuffer (
   OUT VOID                         **HostAddress
   )
 {
-  if (HostAddress == NULL) {
+  return DmaAllocateAlignedBuffer (MemoryType, Pages, 0, HostAddress);
+}
+
+
+/**
+  Allocates pages that are suitable for an DmaMap() of type
+  MapOperationBusMasterCommonBuffer mapping, at the requested alignment.
+
+  @param  MemoryType            The type of memory to allocate, EfiBootServicesData or
+                                EfiRuntimeServicesData.
+  @param  Pages                 The number of pages to allocate.
+  @param  Alignment             Alignment in bytes of the base of the returned
+                                buffer (must be a power of 2)
+  @param  HostAddress           A pointer to store the base system memory address of the
+                                allocated range.
+
+  @retval EFI_SUCCESS           The requested memory pages were allocated.
+  @retval EFI_UNSUPPORTED       Attributes is unsupported. The only legal attribute bits are
+                                MEMORY_WRITE_COMBINE and MEMORY_CACHED.
+  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.
+  @retval EFI_OUT_OF_RESOURCES  The memory pages could not be allocated.
+
+**/
+EFI_STATUS
+EFIAPI
+DmaAllocateAlignedBuffer (
+  IN  EFI_MEMORY_TYPE              MemoryType,
+  IN  UINTN                        Pages,
+  IN  UINTN                        Alignment,
+  OUT VOID                         **HostAddress
+  )
+{
+  if (Alignment == 0) {
+    Alignment = EFI_PAGE_SIZE;
+  }
+
+  if (HostAddress == NULL ||
+      (Alignment & (Alignment - 1)) != 0) {
     return EFI_INVALID_PARAMETER;
   }
 
   //
   // The only valid memory types are EfiBootServicesData and EfiRuntimeServicesData
   //
-  // We used uncached memory to keep coherency
-  //
   if (MemoryType == EfiBootServicesData) {
-    *HostAddress = AllocatePages (Pages);
+    *HostAddress = AllocateAlignedPages (Pages, Alignment);
   } else if (MemoryType != EfiRuntimeServicesData) {
-    *HostAddress = AllocateRuntimePages (Pages);
+    *HostAddress = AllocateAlignedRuntimePages (Pages, Alignment);
   } else {
     return EFI_INVALID_PARAMETER;
   }
 
+  if (*HostAddress == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
   return EFI_SUCCESS;
 }
 
-- 
2.11.0

[PATCH 2/5] ArmPkg/ArmDmaLib: implement DmaAllocateAlignedBuffer()

[Ard Biesheuvel]

Implement the new DmaLib routine that returns DMA'able buffers
at a specified minimum alignment.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 ArmPkg/Library/ArmDmaLib/ArmDmaLib.c | 42 ++++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c
index e12bda4c2d33..2a8cf0fe21a4 100644
--- a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c
+++ b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c
@@ -285,20 +285,56 @@ DmaAllocateBuffer (
   OUT VOID                         **HostAddress
   )
 {
+  return DmaAllocateAlignedBuffer (MemoryType, Pages, 0, HostAddress);
+}
+
+/**
+  Allocates pages that are suitable for an DmaMap() of type
+  MapOperationBusMasterCommonBuffer mapping, at the requested alignment.
+
+  @param  MemoryType            The type of memory to allocate, EfiBootServicesData or
+                                EfiRuntimeServicesData.
+  @param  Pages                 The number of pages to allocate.
+  @param  Alignment             Alignment in bytes of the base of the returned
+                                buffer (must be a power of 2)
+  @param  HostAddress           A pointer to store the base system memory address of the
+                                allocated range.
+
+  @retval EFI_SUCCESS           The requested memory pages were allocated.
+  @retval EFI_UNSUPPORTED       Attributes is unsupported. The only legal attribute bits are
+                                MEMORY_WRITE_COMBINE and MEMORY_CACHED.
+  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.
+  @retval EFI_OUT_OF_RESOURCES  The memory pages could not be allocated.
+
+**/
+EFI_STATUS
+EFIAPI
+DmaAllocateAlignedBuffer (
+  IN  EFI_MEMORY_TYPE              MemoryType,
+  IN  UINTN                        Pages,
+  IN  UINTN                        Alignment,
+  OUT VOID                         **HostAddress
+  )
+{
   EFI_GCD_MEMORY_SPACE_DESCRIPTOR   GcdDescriptor;
   VOID                              *Allocation;
   UINT64                            MemType;
   UNCACHED_ALLOCATION               *Alloc;
   EFI_STATUS                        Status;
 
-  if (HostAddress == NULL) {
+  if (Alignment == 0) {
+    Alignment = EFI_PAGE_SIZE;
+  }
+
+  if (HostAddress == NULL ||
+      (Alignment & (Alignment - 1)) != 0) {
     return EFI_INVALID_PARAMETER;
   }
 
   if (MemoryType == EfiBootServicesData) {
-    Allocation = AllocatePages (Pages);
+    Allocation = AllocateAlignedPages (Pages, Alignment);
   } else if (MemoryType == EfiRuntimeServicesData) {
-    Allocation = AllocateRuntimePages (Pages);
+    Allocation = AllocateAlignedRuntimePages (Pages, Alignment);
   } else {
     return EFI_INVALID_PARAMETER;
   }
-- 
2.11.0

[PATCH 3/5] BeagleBoardPkg: remove UncachedMemoryAllocationLib resolutions

[Ard Biesheuvel]

ArmDmaLib no longer depends on UncachedMemoryAllocationLib, so we can
remove the library class resolutions for it.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 BeagleBoardPkg/BeagleBoardPkg.dsc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index b22f814a28a4..84aae84ff52d 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -44,10 +44,8 @@ [LibraryClasses.common]
 
 !if $(TARGET) == RELEASE
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
 !else
   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-  UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
 !endif
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
 
-- 
2.11.0

[PATCH 4/5] Omap35xxPkg: remove bogus UncachedMemoryAllocationLib dependency

[Ard Biesheuvel]

Remove a false dependency on UncachedMemoryAllocationLib, and fix the
broken build while we're at it.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf | 1 +
 Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf                 | 1 -
 Omap35xxPkg/Omap35xxPkg.dsc                                   | 2 --
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf b/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
index 07810d9afd63..5907745b14e2 100644
--- a/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
+++ b/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
@@ -44,3 +44,4 @@ [LibraryClasses]
 [Pcd]
   gOmap35xxTokenSpaceGuid.PcdOmap35xxDebugAgentTimer
   gOmap35xxTokenSpaceGuid.PcdDebugAgentTimerFreqNanoSeconds
+  gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress
diff --git a/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf b/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
index b569cfbdefca..1f6275d7460d 100644
--- a/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
+++ b/Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf
@@ -33,7 +33,6 @@ [LibraryClasses]
   DebugLib
   UefiBootServicesTableLib
   MemoryAllocationLib
-  UncachedMemoryAllocationLib
   IoLib
   BaseMemoryLib
   ArmLib
diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc
index fc94ca7ed129..941bc97060b9 100644
--- a/Omap35xxPkg/Omap35xxPkg.dsc
+++ b/Omap35xxPkg/Omap35xxPkg.dsc
@@ -72,8 +72,6 @@ [LibraryClasses.common]
 
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
 
-  UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
-
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
 
 
-- 
2.11.0

[PATCH 5/5] ArmPkg: remove UncachedMemoryAllocationLib

[Ard Biesheuvel]

Now that ArmDmaLib can take care of its own memory allocation needs,
let's get rid of UncachedMemoryAllocationLib entirely. This forces
platforms to declare the required semantics (non-cache coherent DMA,
whichever way it is implemented), rather than using uncached memory
allocations directly, which may not always be the right choice, and
prevents sharing of drivers between platforms if one is cache coherent
and the other is not.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 ArmPkg/ArmPkg.dec                                                          |   4 -
 ArmPkg/ArmPkg.dsc                                                          |   2 -
 ArmPkg/Include/Library/UncachedMemoryAllocationLib.h                       | 665 ------------------
 ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.c   | 719 --------------------
 ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf |  50 --
 5 files changed, 1440 deletions(-)

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index c4b4da2f95bb..084d7efb1d8b 100644
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -36,7 +36,6 @@ [LibraryClasses.common]
   ArmLib|Include/Library/ArmLib.h
   ArmMmuLib|Include/Library/ArmMmuLib.h
   SemihostLib|Include/Library/Semihosting.h
-  UncachedMemoryAllocationLib|Include/Library/UncachedMemoryAllocationLib.h
   DefaultExceptionHandlerLib|Include/Library/DefaultExceptionHandlerLib.h
   ArmDisassemblerLib|Include/Library/ArmDisassemblerLib.h
   ArmGicArchLib|Include/Library/ArmGicArchLib.h
@@ -84,9 +83,6 @@ [PcdsFixedAtBuild.common]
   # Using a FeaturePcd make a '(BOOLEAN) casting for its value which is not understood by the preprocessor.
   gArmTokenSpaceGuid.PcdVFPEnabled|0|UINT32|0x00000024
 
-  # This PCD will free the unallocated buffers if their size reach this threshold.
-  # We set the default value to 512MB.
-  gArmTokenSpaceGuid.PcdArmFreeUncachedMemorySizeThreshold|0x20000000|UINT64|0x00000003
   gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0xffff0000|UINT64|0x00000004
   gArmTokenSpaceGuid.PcdCpuResetAddress|0x00000000|UINT32|0x00000005
 
diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index 9144334cb821..ff2b0c074dc1 100644
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -62,7 +62,6 @@ [LibraryClasses.common]
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
 
   SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf
-  UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
   DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
   CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
@@ -117,7 +116,6 @@ [Components.common]
   ArmPkg/Library/SemiHostingDebugLib/SemiHostingDebugLib.inf
   ArmPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf
   ArmPkg/Library/SemihostLib/SemihostLib.inf
-  ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
   ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
   ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
   ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf
diff --git a/ArmPkg/Include/Library/UncachedMemoryAllocationLib.h b/ArmPkg/Include/Library/UncachedMemoryAllocationLib.h
deleted file mode 100644
index a49d8d3ac99f..000000000000
--- a/ArmPkg/Include/Library/UncachedMemoryAllocationLib.h
+++ /dev/null
@@ -1,665 +0,0 @@
-/** @file
-
-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#ifndef __UNCACHED_MEMORY_ALLOCATION_LIB_H__
-#define __UNCACHED_MEMORY_ALLOCATION_LIB_H__
-
-/**
-  Converts a cached or uncached address to a physical address suitable for use in SoC registers.
-
-  @param  VirtualAddress                 The pointer to convert.
-
-  @return The physical address of the supplied virtual pointer.
-
-**/
-EFI_PHYSICAL_ADDRESS
-ConvertToPhysicalAddress (
-  IN VOID *VirtualAddress
-  );
-
-/**
-  Converts a cached or uncached address to a cached address.
-
-  @param  Address                 The pointer to convert.
-
-  @return The address of the cached memory location corresponding to the input address.
-
-**/
-VOID *
-ConvertToCachedAddress (
-  IN VOID *Address
-  );
-
-/**
-  Converts a cached or uncached address to an uncached address.
-
-  @param  Address                 The pointer to convert.
-
-  @return The address of the uncached memory location corresponding to the input address.
-
-**/
-VOID *
-ConvertToUncachedAddress (
-  IN VOID *Address
-  );
-
-/**
-  Allocates one or more 4KB pages of type EfiBootServicesData.
-
-  Allocates the number of 4KB pages of type EfiBootServicesData and returns a pointer to the
-  allocated buffer.  The buffer returned is aligned on a 4KB boundary.  If Pages is 0, then NULL
-  is returned.  If there is not enough memory remaining to satisfy the request, then NULL is
-  returned.
-
-  @param  Pages                 The number of 4 KB pages to allocate.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocatePages (
-  IN UINTN  Pages
-  );
-
-/**
-  Allocates one or more 4KB pages of type EfiRuntimeServicesData.
-
-  Allocates the number of 4KB pages of type EfiRuntimeServicesData and returns a pointer to the
-  allocated buffer.  The buffer returned is aligned on a 4KB boundary.  If Pages is 0, then NULL
-  is returned.  If there is not enough memory remaining to satisfy the request, then NULL is
-  returned.
-
-  @param  Pages                 The number of 4 KB pages to allocate.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateRuntimePages (
-  IN UINTN  Pages
-  );
-
-/**
-  Allocates one or more 4KB pages of type EfiReservedMemoryType.
-
-  Allocates the number of 4KB pages of type EfiReservedMemoryType and returns a pointer to the
-  allocated buffer.  The buffer returned is aligned on a 4KB boundary.  If Pages is 0, then NULL
-  is returned.  If there is not enough memory remaining to satisfy the request, then NULL is
-  returned.
-
-  @param  Pages                 The number of 4 KB pages to allocate.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateReservedPages (
-  IN UINTN  Pages
-  );
-
-/**
-  Frees one or more 4KB pages that were previously allocated with one of the page allocation
-  functions in the Memory Allocation Library.
-
-  Frees the number of 4KB pages specified by Pages from the buffer specified by Buffer.  Buffer
-  must have been allocated on a previous call to the page allocation services of the Memory
-  Allocation Library.
-  If Buffer was not allocated with a page allocation function in the Memory Allocation Library,
-  then ASSERT().
-  If Pages is zero, then ASSERT().
-
-  @param  Buffer                Pointer to the buffer of pages to free.
-  @param  Pages                 The number of 4 KB pages to free.
-
-**/
-VOID
-EFIAPI
-UncachedFreePages (
-  IN VOID   *Buffer,
-  IN UINTN  Pages
-  );
-
-/**
-  Allocates one or more 4KB pages of type EfiBootServicesData at a specified alignment.
-
-  Allocates the number of 4KB pages specified by Pages of type EfiBootServicesData with an
-  alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is
-  returned.  If there is not enough memory at the specified alignment remaining to satisfy the
-  request, then NULL is returned.
-  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
-
-  @param  Pages                 The number of 4 KB pages to allocate.
-  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.
-                                If Alignment is zero, then byte alignment is used.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateAlignedPages (
-  IN UINTN  Pages,
-  IN UINTN  Alignment
-  );
-
-/**
-  Allocates one or more 4KB pages of type EfiRuntimeServicesData at a specified alignment.
-
-  Allocates the number of 4KB pages specified by Pages of type EfiRuntimeServicesData with an
-  alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is
-  returned.  If there is not enough memory at the specified alignment remaining to satisfy the
-  request, then NULL is returned.
-  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
-
-  @param  Pages                 The number of 4 KB pages to allocate.
-  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.
-                                If Alignment is zero, then byte alignment is used.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateAlignedRuntimePages (
-  IN UINTN  Pages,
-  IN UINTN  Alignment
-  );
-
-/**
-  Allocates one or more 4KB pages of type EfiReservedMemoryType at a specified alignment.
-
-  Allocates the number of 4KB pages specified by Pages of type EfiReservedMemoryType with an
-  alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is
-  returned.  If there is not enough memory at the specified alignment remaining to satisfy the
-  request, then NULL is returned.
-  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
-
-  @param  Pages                 The number of 4 KB pages to allocate.
-  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.
-                                If Alignment is zero, then byte alignment is used.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateAlignedReservedPages (
-  IN UINTN  Pages,
-  IN UINTN  Alignment
-  );
-
-/**
-  Frees one or more 4KB pages that were previously allocated with one of the aligned page
-  allocation functions in the Memory Allocation Library.
-
-  Frees the number of 4KB pages specified by Pages from the buffer specified by Buffer.  Buffer
-  must have been allocated on a previous call to the aligned page allocation services of the Memory
-  Allocation Library.
-  If Buffer was not allocated with an aligned page allocation function in the Memory Allocation
-  Library, then ASSERT().
-  If Pages is zero, then ASSERT().
-
-  @param  Buffer                Pointer to the buffer of pages to free.
-  @param  Pages                 The number of 4 KB pages to free.
-
-**/
-VOID
-EFIAPI
-UncachedFreeAlignedPages (
-  IN VOID   *Buffer,
-  IN UINTN  Pages
-  );
-
-/**
-  Allocates a buffer of type EfiBootServicesData.
-
-  Allocates the number bytes specified by AllocationSize of type EfiBootServicesData and returns a
-  pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is
-  returned.  If there is not enough memory remaining to satisfy the request, then NULL is returned.
-
-  @param  AllocationSize        The number of bytes to allocate.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocatePool (
-  IN UINTN  AllocationSize
-  );
-
-/**
-  Allocates a buffer of type EfiRuntimeServicesData.
-
-  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData and returns
-  a pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is
-  returned.  If there is not enough memory remaining to satisfy the request, then NULL is returned.
-
-  @param  AllocationSize        The number of bytes to allocate.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateRuntimePool (
-  IN UINTN  AllocationSize
-  );
-
-/**
-  Allocates a buffer of type EfieservedMemoryType.
-
-  Allocates the number bytes specified by AllocationSize of type EfieservedMemoryType and returns
-  a pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is
-  returned.  If there is not enough memory remaining to satisfy the request, then NULL is returned.
-
-  @param  AllocationSize        The number of bytes to allocate.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateReservedPool (
-  IN UINTN  AllocationSize
-  );
-
-/**
-  Allocates and zeros a buffer of type EfiBootServicesData.
-
-  Allocates the number bytes specified by AllocationSize of type EfiBootServicesData, clears the
-  buffer with zeros, and returns a pointer to the allocated buffer.  If AllocationSize is 0, then a
-  valid buffer of 0 size is returned.  If there is not enough memory remaining to satisfy the
-  request, then NULL is returned.
-
-  @param  AllocationSize        The number of bytes to allocate and zero.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateZeroPool (
-  IN UINTN  AllocationSize
-  );
-
-/**
-  Allocates and zeros a buffer of type EfiRuntimeServicesData.
-
-  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData, clears the
-  buffer with zeros, and returns a pointer to the allocated buffer.  If AllocationSize is 0, then a
-  valid buffer of 0 size is returned.  If there is not enough memory remaining to satisfy the
-  request, then NULL is returned.
-
-  @param  AllocationSize        The number of bytes to allocate and zero.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateRuntimeZeroPool (
-  IN UINTN  AllocationSize
-  );
-
-/**
-  Allocates and zeros a buffer of type EfiReservedMemoryType.
-
-  Allocates the number bytes specified by AllocationSize of type EfiReservedMemoryType, clears the
-  buffer with zeros, and returns a pointer to the allocated buffer.  If AllocationSize is 0, then a
-  valid buffer of 0 size is returned.  If there is not enough memory remaining to satisfy the
-  request, then NULL is returned.
-
-  @param  AllocationSize        The number of bytes to allocate and zero.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateReservedZeroPool (
-  IN UINTN  AllocationSize
-  );
-
-/**
-  Copies a buffer to an allocated buffer of type EfiBootServicesData.
-
-  Allocates the number bytes specified by AllocationSize of type EfiBootServicesData, copies
-  AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the
-  allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there
-  is not enough memory remaining to satisfy the request, then NULL is returned.
-  If Buffer is NULL, then ASSERT().
-  If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT().
-
-  @param  AllocationSize        The number of bytes to allocate and zero.
-  @param  Buffer                The buffer to copy to the allocated buffer.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateCopyPool (
-  IN UINTN       AllocationSize,
-  IN CONST VOID  *Buffer
-  );
-
-/**
-  Copies a buffer to an allocated buffer of type EfiRuntimeServicesData.
-
-  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData, copies
-  AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the
-  allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there
-  is not enough memory remaining to satisfy the request, then NULL is returned.
-  If Buffer is NULL, then ASSERT().
-  If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT().
-
-  @param  AllocationSize        The number of bytes to allocate and zero.
-  @param  Buffer                The buffer to copy to the allocated buffer.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateRuntimeCopyPool (
-  IN UINTN       AllocationSize,
-  IN CONST VOID  *Buffer
-  );
-
-/**
-  Copies a buffer to an allocated buffer of type EfiReservedMemoryType.
-
-  Allocates the number bytes specified by AllocationSize of type EfiReservedMemoryType, copies
-  AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the
-  allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there
-  is not enough memory remaining to satisfy the request, then NULL is returned.
-  If Buffer is NULL, then ASSERT().
-  If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT().
-
-  @param  AllocationSize        The number of bytes to allocate and zero.
-  @param  Buffer                The buffer to copy to the allocated buffer.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateReservedCopyPool (
-  IN UINTN       AllocationSize,
-  IN CONST VOID  *Buffer
-  );
-
-/**
-  Frees a buffer that was previously allocated with one of the pool allocation functions in the
-  Memory Allocation Library.
-
-  Frees the buffer specified by Buffer.  Buffer must have been allocated on a previous call to the
-  pool allocation services of the Memory Allocation Library.
-  If Buffer was not allocated with a pool allocation function in the Memory Allocation Library,
-  then ASSERT().
-
-  @param  Buffer                Pointer to the buffer to free.
-
-**/
-VOID
-EFIAPI
-UncachedFreePool (
-  IN VOID   *Buffer
-  );
-
-/**
-  Allocates a buffer of type EfiBootServicesData at a specified alignment.
-
-  Allocates the number bytes specified by AllocationSize of type EfiBootServicesData with an
-  alignment specified by Alignment.  The allocated buffer is returned.  If AllocationSize is 0,
-  then a valid buffer of 0 size is returned.  If there is not enough memory at the specified
-  alignment remaining to satisfy the request, then NULL is returned.
-  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
-
-  @param  AllocationSize        The number of bytes to allocate.
-  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.
-                                If Alignment is zero, then byte alignment is used.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateAlignedPool (
-  IN UINTN  AllocationSize,
-  IN UINTN  Alignment
-  );
-
-/**
-  Allocates a buffer of type EfiRuntimeServicesData at a specified alignment.
-
-  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData with an
-  alignment specified by Alignment.  The allocated buffer is returned.  If AllocationSize is 0,
-  then a valid buffer of 0 size is returned.  If there is not enough memory at the specified
-  alignment remaining to satisfy the request, then NULL is returned.
-  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
-
-  @param  AllocationSize        The number of bytes to allocate.
-  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.
-                                If Alignment is zero, then byte alignment is used.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateAlignedRuntimePool (
-  IN UINTN  AllocationSize,
-  IN UINTN  Alignment
-  );
-
-/**
-  Allocates a buffer of type EfieservedMemoryType at a specified alignment.
-
-  Allocates the number bytes specified by AllocationSize of type EfieservedMemoryType with an
-  alignment specified by Alignment.  The allocated buffer is returned.  If AllocationSize is 0,
-  then a valid buffer of 0 size is returned.  If there is not enough memory at the specified
-  alignment remaining to satisfy the request, then NULL is returned.
-  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
-
-  @param  AllocationSize        The number of bytes to allocate.
-  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.
-                                If Alignment is zero, then byte alignment is used.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateAlignedReservedPool (
-  IN UINTN  AllocationSize,
-  IN UINTN  Alignment
-  );
-
-/**
-  Allocates and zeros a buffer of type EfiBootServicesData at a specified alignment.
-
-  Allocates the number bytes specified by AllocationSize of type EfiBootServicesData with an
-  alignment specified by Alignment, clears the buffer with zeros, and returns a pointer to the
-  allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there
-  is not enough memory at the specified alignment remaining to satisfy the request, then NULL is
-  returned.
-  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
-
-  @param  AllocationSize        The number of bytes to allocate.
-  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.
-                                If Alignment is zero, then byte alignment is used.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateAlignedZeroPool (
-  IN UINTN  AllocationSize,
-  IN UINTN  Alignment
-  );
-
-/**
-  Allocates and zeros a buffer of type EfiRuntimeServicesData at a specified alignment.
-
-  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData with an
-  alignment specified by Alignment, clears the buffer with zeros, and returns a pointer to the
-  allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there
-  is not enough memory at the specified alignment remaining to satisfy the request, then NULL is
-  returned.
-  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
-
-  @param  AllocationSize        The number of bytes to allocate.
-  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.
-                                If Alignment is zero, then byte alignment is used.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateAlignedRuntimeZeroPool (
-  IN UINTN  AllocationSize,
-  IN UINTN  Alignment
-  );
-
-/**
-  Allocates and zeros a buffer of type EfieservedMemoryType at a specified alignment.
-
-  Allocates the number bytes specified by AllocationSize of type EfieservedMemoryType with an
-  alignment specified by Alignment, clears the buffer with zeros, and returns a pointer to the
-  allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there
-  is not enough memory at the specified alignment remaining to satisfy the request, then NULL is
-  returned.
-  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
-
-  @param  AllocationSize        The number of bytes to allocate.
-  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.
-                                If Alignment is zero, then byte alignment is used.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateAlignedReservedZeroPool (
-  IN UINTN  AllocationSize,
-  IN UINTN  Alignment
-  );
-
-/**
-  Copies a buffer to an allocated buffer of type EfiBootServicesData at a specified alignment.
-
-  Allocates the number bytes specified by AllocationSize of type EfiBootServicesData type with an
-  alignment specified by Alignment.  The allocated buffer is returned.  If AllocationSize is 0,
-  then a valid buffer of 0 size is returned.  If there is not enough memory at the specified
-  alignment remaining to satisfy the request, then NULL is returned.
-  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
-
-  @param  AllocationSize        The number of bytes to allocate.
-  @param  Buffer                The buffer to copy to the allocated buffer.
-  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.
-                                If Alignment is zero, then byte alignment is used.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateAlignedCopyPool (
-  IN UINTN       AllocationSize,
-  IN CONST VOID  *Buffer,
-  IN UINTN       Alignment
-  );
-
-/**
-  Copies a buffer to an allocated buffer of type EfiRuntimeServicesData at a specified alignment.
-
-  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData type with an
-  alignment specified by Alignment.  The allocated buffer is returned.  If AllocationSize is 0,
-  then a valid buffer of 0 size is returned.  If there is not enough memory at the specified
-  alignment remaining to satisfy the request, then NULL is returned.
-  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
-
-  @param  AllocationSize        The number of bytes to allocate.
-  @param  Buffer                The buffer to copy to the allocated buffer.
-  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.
-                                If Alignment is zero, then byte alignment is used.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateAlignedRuntimeCopyPool (
-  IN UINTN       AllocationSize,
-  IN CONST VOID  *Buffer,
-  IN UINTN       Alignment
-  );
-
-/**
-  Copies a buffer to an allocated buffer of type EfiReservedMemoryType at a specified alignment.
-
-  Allocates the number bytes specified by AllocationSize of type EfiReservedMemoryType type with an
-  alignment specified by Alignment.  The allocated buffer is returned.  If AllocationSize is 0,
-  then a valid buffer of 0 size is returned.  If there is not enough memory at the specified
-  alignment remaining to satisfy the request, then NULL is returned.
-  If Alignment is not a power of two and Alignment is not zero, then ASSERT().
-
-  @param  AllocationSize        The number of bytes to allocate.
-  @param  Buffer                The buffer to copy to the allocated buffer.
-  @param  Alignment             The requested alignment of the allocation.  Must be a power of two.
-                                If Alignment is zero, then byte alignment is used.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-UncachedAllocateAlignedReservedCopyPool (
-  IN UINTN       AllocationSize,
-  IN CONST VOID  *Buffer,
-  IN UINTN       Alignment
-  );
-
-/**
-  Frees a buffer that was previously allocated with one of the aligned pool allocation functions
-  in the Memory Allocation Library.
-
-  Frees the buffer specified by Buffer.  Buffer must have been allocated on a previous call to the
-  aligned pool allocation services of the Memory Allocation Library.
-  If Buffer was not allocated with an aligned pool allocation function in the Memory Allocation
-  Library, then ASSERT().
-
-  @param  Buffer                Pointer to the buffer to free.
-
-**/
-VOID
-EFIAPI
-UncachedFreeAlignedPool (
-  IN VOID   *Buffer
-  );
-
-VOID
-EFIAPI
-UncachedSafeFreePool (
-  IN VOID   *Buffer
-  );
-
-#endif // __UNCACHED_MEMORY_ALLOCATION_LIB_H__
diff --git a/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.c b/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.c
deleted file mode 100644
index fdaaf2d706ab..000000000000
--- a/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.c
+++ /dev/null
@@ -1,719 +0,0 @@
-/** @file
-  UncachedMemoryAllocation lib that uses DXE Service to change cachability for
-  a buffer.
-
-  Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
-  Copyright (c) 2014, AMR Ltd. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <Base.h>
-#include <Library/BaseLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/DebugLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/UncachedMemoryAllocationLib.h>
-#include <Library/PcdLib.h>
-#include <Library/ArmLib.h>
-#include <Library/DxeServicesTableLib.h>
-#include <Library/CacheMaintenanceLib.h>
-
-#include <Protocol/Cpu.h>
-
-STATIC EFI_CPU_ARCH_PROTOCOL    *mCpu;
-
-VOID *
-UncachedInternalAllocatePages (
-  IN EFI_MEMORY_TYPE  MemoryType,
-  IN UINTN            Pages
-  );
-
-VOID *
-UncachedInternalAllocateAlignedPages (
-  IN EFI_MEMORY_TYPE  MemoryType,
-  IN UINTN            Pages,
-  IN UINTN            Alignment
-  );
-
-
-
-typedef struct {
-  EFI_PHYSICAL_ADDRESS  Base;
-  VOID                  *Allocation;
-  UINTN                 Pages;
-  EFI_MEMORY_TYPE       MemoryType;
-  BOOLEAN               Allocated;
-  LIST_ENTRY            Link;
-  UINT64                Attributes;
-} FREE_PAGE_NODE;
-
-STATIC LIST_ENTRY  mPageList = INITIALIZE_LIST_HEAD_VARIABLE (mPageList);
-// Track the size of the non-allocated buffer in the linked-list
-STATIC UINTN   mFreedBufferSize = 0;
-
-/**
- * This function firstly checks if the requested allocation can fit into one
- * of the previously allocated buffer.
- * If the requested allocation does not fit in the existing pool then
- * the function makes a new allocation.
- *
- * @param MemoryType    Type of memory requested for the new allocation
- * @param Pages         Number of requested page
- * @param Alignment     Required alignment
- * @param Allocation    Address of the newly allocated buffer
- *
- * @return EFI_SUCCESS  If the function manage to allocate a buffer
- * @return !EFI_SUCCESS If the function did not manage to allocate a buffer
- */
-STATIC
-EFI_STATUS
-AllocatePagesFromList (
-  IN EFI_MEMORY_TYPE  MemoryType,
-  IN UINTN            Pages,
-  IN UINTN            Alignment,
-  OUT VOID            **Allocation
-  )
-{
-  EFI_STATUS       Status;
-  LIST_ENTRY      *Link;
-  FREE_PAGE_NODE  *Node;
-  FREE_PAGE_NODE  *NewNode;
-  UINTN            AlignmentMask;
-  EFI_PHYSICAL_ADDRESS Memory;
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR Descriptor;
-
-  // Alignment must be a power of two or zero.
-  ASSERT ((Alignment & (Alignment - 1)) == 0);
-
-  //
-  // Look in our list for the smallest page that could satisfy the new allocation
-  //
-  Node = NULL;
-  NewNode = NULL;
-  for (Link = mPageList.ForwardLink; Link != &mPageList; Link = Link->ForwardLink) {
-    Node = BASE_CR (Link, FREE_PAGE_NODE, Link);
-    if ((Node->Allocated == FALSE) && (Node->MemoryType == MemoryType)) {
-      // We have a node that fits our requirements
-      if (((UINTN)Node->Base & (Alignment - 1)) == 0) {
-        // We found a page that matches the page size
-        if (Node->Pages == Pages) {
-          Node->Allocated  = TRUE;
-          Node->Allocation = (VOID*)(UINTN)Node->Base;
-          *Allocation      = Node->Allocation;
-
-          // Update the size of the freed buffer
-          mFreedBufferSize  -= Pages * EFI_PAGE_SIZE;
-          return EFI_SUCCESS;
-        } else if (Node->Pages > Pages) {
-          if (NewNode == NULL) {
-            // It is the first node that could contain our new allocation
-            NewNode = Node;
-          } else if (NewNode->Pages > Node->Pages) {
-            // This node offers a smaller number of page.
-            NewNode = Node;
-          }
-        }
-      }
-    }
-  }
-  // Check if we have found a node that could contain our new allocation
-  if (NewNode != NULL) {
-    NewNode->Allocated  = TRUE;
-    NewNode->Allocation = (VOID*)(UINTN)NewNode->Base;
-    *Allocation         = NewNode->Allocation;
-    mFreedBufferSize    -= NewNode->Pages * EFI_PAGE_SIZE;
-    return EFI_SUCCESS;
-  }
-
-  //
-  // Otherwise, we need to allocate a new buffer
-  //
-
-  // We do not want to over-allocate in case the alignment requirement does not
-  // require extra pages
-  if (Alignment > EFI_PAGE_SIZE) {
-    AlignmentMask  = Alignment - 1;
-    Pages          += EFI_SIZE_TO_PAGES (Alignment);
-  } else {
-    AlignmentMask  = 0;
-  }
-
-  Status = gBS->AllocatePages (AllocateAnyPages, MemoryType, Pages, &Memory);
-  if (EFI_ERROR (Status)) {
-    return Status;
-  }
-
-  Status = gDS->GetMemorySpaceDescriptor (Memory, &Descriptor);
-  if (EFI_ERROR (Status)) {
-    goto FreePages;
-  }
-
-  Status = gDS->SetMemorySpaceAttributes (Memory, EFI_PAGES_TO_SIZE (Pages),
-                  EFI_MEMORY_WC);
-  if (EFI_ERROR (Status)) {
-    goto FreePages;
-  }
-
-  //
-  // EFI_CPU_ARCH_PROTOCOL::SetMemoryAttributes() will preserve the original
-  // memory type attribute if no memory type is passed. Permission attributes
-  // will be replaced, so EFI_MEMORY_RO will be removed if present (although
-  // it would be a bug if that were the case for an AllocatePages() allocation)
-  //
-  Status = mCpu->SetMemoryAttributes (mCpu, Memory, EFI_PAGES_TO_SIZE (Pages),
-                   EFI_MEMORY_XP);
-  if (EFI_ERROR (Status)) {
-    goto FreePages;
-  }
-
-  InvalidateDataCacheRange ((VOID *)(UINTN)Memory, EFI_PAGES_TO_SIZE (Pages));
-
-  NewNode = AllocatePool (sizeof (FREE_PAGE_NODE));
-  if (NewNode == NULL) {
-    ASSERT (FALSE);
-    Status = EFI_OUT_OF_RESOURCES;
-    goto FreePages;
-  }
-
-  NewNode->Base       = Memory;
-  NewNode->Allocation = (VOID*)(((UINTN)Memory + AlignmentMask) & ~AlignmentMask);
-  NewNode->Pages      = Pages;
-  NewNode->Allocated  = TRUE;
-  NewNode->MemoryType = MemoryType;
-  NewNode->Attributes = Descriptor.Attributes;
-
-  InsertTailList (&mPageList, &NewNode->Link);
-
-  *Allocation = NewNode->Allocation;
-  return EFI_SUCCESS;
-
-FreePages:
-  gBS->FreePages (Memory, Pages);
-  return Status;
-}
-
-/**
- * Free the memory allocation
- *
- * This function will actually try to find the allocation in the linked list.
- * And it will then mark the entry as freed.
- *
- * @param  Allocation  Base address of the buffer to free
- *
- * @return EFI_SUCCESS            The allocation has been freed
- * @return EFI_NOT_FOUND          The allocation was not found in the pool.
- * @return EFI_INVALID_PARAMETER  If Allocation is NULL
- *
- */
-STATIC
-EFI_STATUS
-FreePagesFromList (
-  IN  VOID  *Allocation
-  )
-{
-  LIST_ENTRY      *Link;
-  FREE_PAGE_NODE  *Node;
-
-  if (Allocation == NULL) {
-    return EFI_INVALID_PARAMETER;
-  }
-
-  for (Link = mPageList.ForwardLink; Link != &mPageList; Link = Link->ForwardLink) {
-    Node = BASE_CR (Link, FREE_PAGE_NODE, Link);
-    if ((UINTN)Node->Allocation == (UINTN)Allocation) {
-      Node->Allocated = FALSE;
-
-      // Update the size of the freed buffer
-      mFreedBufferSize  += Node->Pages * EFI_PAGE_SIZE;
-
-      // If the size of the non-allocated reaches the threshold we raise a warning.
-      // It might be an expected behaviour in some cases.
-      // We might device to free some of these buffers later on.
-      if (mFreedBufferSize > PcdGet64 (PcdArmFreeUncachedMemorySizeThreshold)) {
-        DEBUG ((EFI_D_WARN, "Warning: The list of non-allocated buffer has reach the threshold.\n"));
-      }
-      return EFI_SUCCESS;
-    }
-  }
-
-  return EFI_NOT_FOUND;
-}
-
-/**
- * This function is automatically invoked when the driver exits
- * It frees all the non-allocated memory buffer.
- * This function is not responsible to free allocated buffer (eg: case of memory leak,
- * runtime allocation).
- */
-EFI_STATUS
-EFIAPI
-UncachedMemoryAllocationLibConstructor (
-  IN EFI_HANDLE        ImageHandle,
-  IN EFI_SYSTEM_TABLE  *SystemTable
-  )
-{
-  return gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **)&mCpu);
-}
-
-EFI_STATUS
-EFIAPI
-UncachedMemoryAllocationLibDestructor (
-  IN EFI_HANDLE        ImageHandle,
-  IN EFI_SYSTEM_TABLE  *SystemTable
-  )
-{
-  LIST_ENTRY      *Link;
-  FREE_PAGE_NODE  *OldNode;
-
-  // Test if the list is empty
-  Link = mPageList.ForwardLink;
-  if (Link == &mPageList) {
-    return EFI_SUCCESS;
-  }
-
-  // Free all the pages and nodes
-  do {
-    OldNode = BASE_CR (Link, FREE_PAGE_NODE, Link);
-    // Point to the next entry
-    Link = Link->ForwardLink;
-
-    // We only free the non-allocated buffer
-    if (OldNode->Allocated == FALSE) {
-      gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)OldNode->Base, OldNode->Pages);
-
-      gDS->SetMemorySpaceAttributes ((EFI_PHYSICAL_ADDRESS)(UINTN)OldNode->Base,
-             EFI_PAGES_TO_SIZE (OldNode->Pages), OldNode->Attributes);
-
-      RemoveEntryList (&OldNode->Link);
-      FreePool (OldNode);
-    }
-  } while (Link != &mPageList);
-
-  return EFI_SUCCESS;
-}
-
-/**
-  Converts a cached or uncached address to a physical address suitable for use in SoC registers.
-
-  @param  VirtualAddress                 The pointer to convert.
-
-  @return The physical address of the supplied virtual pointer.
-
-**/
-EFI_PHYSICAL_ADDRESS
-ConvertToPhysicalAddress (
-  IN VOID *VirtualAddress
-  )
-{
-  return (EFI_PHYSICAL_ADDRESS)(UINTN)VirtualAddress;
-}
-
-
-VOID *
-UncachedInternalAllocatePages (
-  IN EFI_MEMORY_TYPE  MemoryType,
-  IN UINTN            Pages
-  )
-{
-  return UncachedInternalAllocateAlignedPages (MemoryType, Pages, EFI_PAGE_SIZE);
-}
-
-
-VOID *
-EFIAPI
-UncachedAllocatePages (
-  IN UINTN  Pages
-  )
-{
-  return UncachedInternalAllocatePages (EfiBootServicesData, Pages);
-}
-
-VOID *
-EFIAPI
-UncachedAllocateRuntimePages (
-  IN UINTN  Pages
-  )
-{
-  return UncachedInternalAllocatePages (EfiRuntimeServicesData, Pages);
-}
-
-VOID *
-EFIAPI
-UncachedAllocateReservedPages (
-  IN UINTN  Pages
-  )
-{
-  return UncachedInternalAllocatePages (EfiReservedMemoryType, Pages);
-}
-
-
-
-VOID
-EFIAPI
-UncachedFreePages (
-  IN VOID   *Buffer,
-  IN UINTN  Pages
-  )
-{
-  UncachedFreeAlignedPages (Buffer, Pages);
-  return;
-}
-
-
-VOID *
-UncachedInternalAllocateAlignedPages (
-  IN EFI_MEMORY_TYPE  MemoryType,
-  IN UINTN            Pages,
-  IN UINTN            Alignment
-  )
-{
-  EFI_STATUS Status;
-  VOID   *Allocation;
-
-  if (Pages == 0) {
-    return NULL;
-  }
-
-  Allocation = NULL;
-  Status = AllocatePagesFromList (MemoryType, Pages, Alignment, &Allocation);
-  if (EFI_ERROR (Status)) {
-    ASSERT_EFI_ERROR (Status);
-    return NULL;
-  } else {
-    return Allocation;
-  }
-}
-
-
-VOID
-EFIAPI
-UncachedFreeAlignedPages (
-  IN VOID   *Buffer,
-  IN UINTN  Pages
-  )
-{
-  FreePagesFromList (Buffer);
-}
-
-
-VOID *
-UncachedInternalAllocateAlignedPool (
-  IN EFI_MEMORY_TYPE  PoolType,
-  IN UINTN            AllocationSize,
-  IN UINTN            Alignment
-  )
-{
-  VOID      *AlignedAddress;
-
-  //
-  // Alignment must be a power of two or zero.
-  //
-  ASSERT ((Alignment & (Alignment - 1)) == 0);
-
-  if (Alignment < EFI_PAGE_SIZE) {
-    Alignment = EFI_PAGE_SIZE;
-  }
-
-  AlignedAddress = UncachedInternalAllocateAlignedPages (PoolType, EFI_SIZE_TO_PAGES (AllocationSize), Alignment);
-  if (AlignedAddress == NULL) {
-    return NULL;
-  }
-
-  return (VOID *) AlignedAddress;
-}
-
-VOID *
-EFIAPI
-UncachedAllocateAlignedPool (
-  IN UINTN  AllocationSize,
-  IN UINTN  Alignment
-  )
-{
-  return UncachedInternalAllocateAlignedPool (EfiBootServicesData, AllocationSize, Alignment);
-}
-
-VOID *
-EFIAPI
-UncachedAllocateAlignedRuntimePool (
-  IN UINTN  AllocationSize,
-  IN UINTN  Alignment
-  )
-{
-  return UncachedInternalAllocateAlignedPool (EfiRuntimeServicesData, AllocationSize, Alignment);
-}
-
-VOID *
-EFIAPI
-UncachedAllocateAlignedReservedPool (
-  IN UINTN  AllocationSize,
-  IN UINTN  Alignment
-  )
-{
-  return UncachedInternalAllocateAlignedPool (EfiReservedMemoryType, AllocationSize, Alignment);
-}
-
-VOID *
-UncachedInternalAllocateAlignedZeroPool (
-  IN EFI_MEMORY_TYPE  PoolType,
-  IN UINTN            AllocationSize,
-  IN UINTN            Alignment
-  )
-{
-  VOID    *Memory;
-  Memory = UncachedInternalAllocateAlignedPool (PoolType, AllocationSize, Alignment);
-  if (Memory != NULL) {
-    Memory = ZeroMem (Memory, AllocationSize);
-  }
-  return Memory;
-}
-
-VOID *
-EFIAPI
-UncachedAllocateAlignedZeroPool (
-  IN UINTN  AllocationSize,
-  IN UINTN  Alignment
-  )
-{
-  return UncachedInternalAllocateAlignedZeroPool (EfiBootServicesData, AllocationSize, Alignment);
-}
-
-VOID *
-EFIAPI
-UncachedAllocateAlignedRuntimeZeroPool (
-  IN UINTN  AllocationSize,
-  IN UINTN  Alignment
-  )
-{
-  return UncachedInternalAllocateAlignedZeroPool (EfiRuntimeServicesData, AllocationSize, Alignment);
-}
-
-VOID *
-EFIAPI
-UncachedAllocateAlignedReservedZeroPool (
-  IN UINTN  AllocationSize,
-  IN UINTN  Alignment
-  )
-{
-  return UncachedInternalAllocateAlignedZeroPool (EfiReservedMemoryType, AllocationSize, Alignment);
-}
-
-VOID *
-UncachedInternalAllocateAlignedCopyPool (
-  IN EFI_MEMORY_TYPE  PoolType,
-  IN UINTN            AllocationSize,
-  IN CONST VOID       *Buffer,
-  IN UINTN            Alignment
-  )
-{
-  VOID  *Memory;
-
-  ASSERT (Buffer != NULL);
-  ASSERT (AllocationSize <= (MAX_ADDRESS - (UINTN) Buffer + 1));
-
-  Memory = UncachedInternalAllocateAlignedPool (PoolType, AllocationSize, Alignment);
-  if (Memory != NULL) {
-    Memory = CopyMem (Memory, Buffer, AllocationSize);
-  }
-  return Memory;
-}
-
-VOID *
-EFIAPI
-UncachedAllocateAlignedCopyPool (
-  IN UINTN       AllocationSize,
-  IN CONST VOID  *Buffer,
-  IN UINTN       Alignment
-  )
-{
-  return UncachedInternalAllocateAlignedCopyPool (EfiBootServicesData, AllocationSize, Buffer, Alignment);
-}
-
-VOID *
-EFIAPI
-UncachedAllocateAlignedRuntimeCopyPool (
-  IN UINTN       AllocationSize,
-  IN CONST VOID  *Buffer,
-  IN UINTN       Alignment
-  )
-{
-  return UncachedInternalAllocateAlignedCopyPool (EfiRuntimeServicesData, AllocationSize, Buffer, Alignment);
-}
-
-VOID *
-EFIAPI
-UncachedAllocateAlignedReservedCopyPool (
-  IN UINTN       AllocationSize,
-  IN CONST VOID  *Buffer,
-  IN UINTN       Alignment
-  )
-{
-  return UncachedInternalAllocateAlignedCopyPool (EfiReservedMemoryType, AllocationSize, Buffer, Alignment);
-}
-
-VOID
-EFIAPI
-UncachedFreeAlignedPool (
-  IN VOID   *Allocation
-  )
-{
-  UncachedFreePages (Allocation, 0);
-}
-
-VOID *
-UncachedInternalAllocatePool (
-  IN EFI_MEMORY_TYPE  MemoryType,
-  IN UINTN            AllocationSize
-  )
-{
-  UINTN CacheLineLength = ArmCacheWritebackGranule ();
-  return UncachedInternalAllocateAlignedPool (MemoryType, AllocationSize, CacheLineLength);
-}
-
-VOID *
-EFIAPI
-UncachedAllocatePool (
-  IN UINTN  AllocationSize
-  )
-{
-  return UncachedInternalAllocatePool (EfiBootServicesData, AllocationSize);
-}
-
-VOID *
-EFIAPI
-UncachedAllocateRuntimePool (
-  IN UINTN  AllocationSize
-  )
-{
-  return UncachedInternalAllocatePool (EfiRuntimeServicesData, AllocationSize);
-}
-
-VOID *
-EFIAPI
-UncachedAllocateReservedPool (
-  IN UINTN  AllocationSize
-  )
-{
-  return UncachedInternalAllocatePool (EfiReservedMemoryType, AllocationSize);
-}
-
-VOID *
-UncachedInternalAllocateZeroPool (
-  IN EFI_MEMORY_TYPE  PoolType,
-  IN UINTN            AllocationSize
-  )
-{
-  VOID  *Memory;
-
-  Memory = UncachedInternalAllocatePool (PoolType, AllocationSize);
-  if (Memory != NULL) {
-    Memory = ZeroMem (Memory, AllocationSize);
-  }
-  return Memory;
-}
-
-VOID *
-EFIAPI
-UncachedAllocateZeroPool (
-  IN UINTN  AllocationSize
-  )
-{
-  return UncachedInternalAllocateZeroPool (EfiBootServicesData, AllocationSize);
-}
-
-VOID *
-EFIAPI
-UncachedAllocateRuntimeZeroPool (
-  IN UINTN  AllocationSize
-  )
-{
-  return UncachedInternalAllocateZeroPool (EfiRuntimeServicesData, AllocationSize);
-}
-
-VOID *
-EFIAPI
-UncachedAllocateReservedZeroPool (
-  IN UINTN  AllocationSize
-  )
-{
-  return UncachedInternalAllocateZeroPool (EfiReservedMemoryType, AllocationSize);
-}
-
-VOID *
-UncachedInternalAllocateCopyPool (
-  IN EFI_MEMORY_TYPE  PoolType,
-  IN UINTN            AllocationSize,
-  IN CONST VOID       *Buffer
-  )
-{
-  VOID  *Memory;
-
-  ASSERT (Buffer != NULL);
-  ASSERT (AllocationSize <= (MAX_ADDRESS - (UINTN) Buffer + 1));
-
-  Memory = UncachedInternalAllocatePool (PoolType, AllocationSize);
-  if (Memory != NULL) {
-     Memory = CopyMem (Memory, Buffer, AllocationSize);
-  }
-  return Memory;
-}
-
-VOID *
-EFIAPI
-UncachedAllocateCopyPool (
-  IN UINTN       AllocationSize,
-  IN CONST VOID  *Buffer
-  )
-{
-  return UncachedInternalAllocateCopyPool (EfiBootServicesData, AllocationSize, Buffer);
-}
-
-VOID *
-EFIAPI
-UncachedAllocateRuntimeCopyPool (
-  IN UINTN       AllocationSize,
-  IN CONST VOID  *Buffer
-  )
-{
-  return UncachedInternalAllocateCopyPool (EfiRuntimeServicesData, AllocationSize, Buffer);
-}
-
-VOID *
-EFIAPI
-UncachedAllocateReservedCopyPool (
-  IN UINTN       AllocationSize,
-  IN CONST VOID  *Buffer
-  )
-{
-  return UncachedInternalAllocateCopyPool (EfiReservedMemoryType, AllocationSize, Buffer);
-}
-
-VOID
-EFIAPI
-UncachedFreePool (
-  IN VOID   *Buffer
-  )
-{
-  UncachedFreeAlignedPool (Buffer);
-}
-
-VOID
-EFIAPI
-UncachedSafeFreePool (
-  IN VOID   *Buffer
-  )
-{
-  if (Buffer != NULL) {
-    UncachedFreePool (Buffer);
-    Buffer = NULL;
-  }
-}
-
diff --git a/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf b/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
deleted file mode 100644
index c637430c9020..000000000000
--- a/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
+++ /dev/null
@@ -1,50 +0,0 @@
-#/** @file
-#
-#  UncachedMemoryAllocation lib that uses DXE Service to change cachability for
-#  a buffer.
-#
-# Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
-#
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution. The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#
-#**/
-
-[Defines]
-  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = UncachedMemoryAllocationLib
-  FILE_GUID                      = DC101A1A-7525-429B-84AF-EEAA630E576C
-  MODULE_TYPE                    = DXE_DRIVER
-  VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = UncachedMemoryAllocationLib
-  CONSTRUCTOR                    = UncachedMemoryAllocationLibConstructor
-  DESTRUCTOR                     = UncachedMemoryAllocationLibDestructor
-
-[Sources.common]
-  UncachedMemoryAllocationLib.c
-
-[Packages]
-  ArmPkg/ArmPkg.dec
-  MdePkg/MdePkg.dec
-
-[LibraryClasses]
-  BaseLib
-  ArmLib
-  MemoryAllocationLib
-  PcdLib
-  DxeServicesTableLib
-  CacheMaintenanceLib
-
-[Pcd]
-  gArmTokenSpaceGuid.PcdArmFreeUncachedMemorySizeThreshold
-
-[Protocols]
-  gEfiCpuArchProtocolGuid
-
-[Depex]
-  gEfiCpuArchProtocolGuid
-- 
2.11.0

Re: [PATCH 0/5] ArmPkg et al: remove UncachedMemoryallocationLib

[Leif Lindholm]

On Fri, Aug 25, 2017 at 01:10:09PM +0100, Ard Biesheuvel wrote:
> This series is a followup to 'ArmPkg/ArmDmaLib: remove dependency on
> UncachedMemoryAllocationLib' sent out yesterday, and removes library
> entirely.
> 
> There are two reasons for this:
> - UncachedMemoryAllocationLib is often abused by drivers that should
>   be using DMA abstractions instead. It is up to the platform to decide
>   whether DMA is cache coherent or not, and the fact that non-cache
>   coherent DMA may be implemented using uncached allocations should remain
>   an implementation detail of the DmaLib instance.
> 
> - The code is poorly maintained, only frees its allocations in the destructor,
>   and misleads by exposing pool allocate/free entry points that are actually
>   backed by page based allocations.
> 
> Patches #1 and #2 add a DmaAllocateAlignedBuffer() to DmaLib and both
> its implementations. This is required for current users of
> UncachedMemoryAllocationLib that rely on minimum alignment to be able
> to switch the DmaLib.
> 
> Patches #3 and #4 remove a couple of stale references.
> 
> Patch #5 actually removes the library and its single remaining implementation.

For the series:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

However, this breaks a bunch of (edk2-)platforms: juno, fvp, tc2,
hikey and armada70x0. Is there a follow-on patch coming for those,
and could you hold off on pushing this series until that is ready?

Armada has the only non-bogus UncachedMemoryAllocationLib dependency,
the others are just trivial deletions.

/
    Leif

> Ard Biesheuvel (5):
>   EmbeddedPkg/DmaLib: add routine to allocate aligned buffers
>   ArmPkg/ArmDmaLib: implement DmaAllocateAlignedBuffer()
>   BeagleBoardPkg: remove UncachedMemoryAllocationLib resolutions
>   Omap35xxPkg: remove bogus UncachedMemoryAllocationLib dependency
>   ArmPkg: remove UncachedMemoryAllocationLib
> 
>  ArmPkg/ArmPkg.dec                                                          |   4 -
>  ArmPkg/ArmPkg.dsc                                                          |   2 -
>  ArmPkg/Include/Library/UncachedMemoryAllocationLib.h                       | 665 ------------------
>  ArmPkg/Library/ArmDmaLib/ArmDmaLib.c                                       |  42 +-
>  ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.c   | 719 --------------------
>  ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf |  50 --
>  BeagleBoardPkg/BeagleBoardPkg.dsc                                          |   2 -
>  EmbeddedPkg/Include/Library/DmaLib.h                                       |  30 +-
>  EmbeddedPkg/Library/NullDmaLib/NullDmaLib.c                                |  48 +-
>  Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf              |   1 +
>  Omap35xxPkg/Library/OmapDmaLib/OmapDmaLib.inf                              |   1 -
>  Omap35xxPkg/Omap35xxPkg.dsc                                                |   2 -
>  12 files changed, 112 insertions(+), 1454 deletions(-)
>  delete mode 100644 ArmPkg/Include/Library/UncachedMemoryAllocationLib.h
>  delete mode 100644 ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.c
>  delete mode 100644 ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
> 
> -- 
> 2.11.0
> 

Re: [PATCH 0/5] ArmPkg et al: remove UncachedMemoryallocationLib

[Ard Biesheuvel]

On 29 August 2017 at 16:44, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> On Fri, Aug 25, 2017 at 01:10:09PM +0100, Ard Biesheuvel wrote:
>> This series is a followup to 'ArmPkg/ArmDmaLib: remove dependency on
>> UncachedMemoryAllocationLib' sent out yesterday, and removes library
>> entirely.
>>
>> There are two reasons for this:
>> - UncachedMemoryAllocationLib is often abused by drivers that should
>>   be using DMA abstractions instead. It is up to the platform to decide
>>   whether DMA is cache coherent or not, and the fact that non-cache
>>   coherent DMA may be implemented using uncached allocations should remain
>>   an implementation detail of the DmaLib instance.
>>
>> - The code is poorly maintained, only frees its allocations in the destructor,
>>   and misleads by exposing pool allocate/free entry points that are actually
>>   backed by page based allocations.
>>
>> Patches #1 and #2 add a DmaAllocateAlignedBuffer() to DmaLib and both
>> its implementations. This is required for current users of
>> UncachedMemoryAllocationLib that rely on minimum alignment to be able
>> to switch the DmaLib.
>>
>> Patches #3 and #4 remove a couple of stale references.
>>
>> Patch #5 actually removes the library and its single remaining implementation.
>
> For the series:
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>
> However, this breaks a bunch of (edk2-)platforms: juno, fvp, tc2,
> hikey and armada70x0. Is there a follow-on patch coming for those,
> and could you hold off on pushing this series until that is ready?
>
> Armada has the only non-bogus UncachedMemoryAllocationLib dependency,
> the others are just trivial deletions.
>

Yes. There are interdependencies between repos, so I will just merge
#1 and #2 and hold off with the rest until after all dependencies have
been removed.

Re: [PATCH 0/5] ArmPkg et al: remove UncachedMemoryallocationLib

[Ard Biesheuvel]

On 29 August 2017 at 16:47, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> On 29 August 2017 at 16:44, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>> On Fri, Aug 25, 2017 at 01:10:09PM +0100, Ard Biesheuvel wrote:
>>> This series is a followup to 'ArmPkg/ArmDmaLib: remove dependency on
>>> UncachedMemoryAllocationLib' sent out yesterday, and removes library
>>> entirely.
>>>
>>> There are two reasons for this:
>>> - UncachedMemoryAllocationLib is often abused by drivers that should
>>>   be using DMA abstractions instead. It is up to the platform to decide
>>>   whether DMA is cache coherent or not, and the fact that non-cache
>>>   coherent DMA may be implemented using uncached allocations should remain
>>>   an implementation detail of the DmaLib instance.
>>>
>>> - The code is poorly maintained, only frees its allocations in the destructor,
>>>   and misleads by exposing pool allocate/free entry points that are actually
>>>   backed by page based allocations.
>>>
>>> Patches #1 and #2 add a DmaAllocateAlignedBuffer() to DmaLib and both
>>> its implementations. This is required for current users of
>>> UncachedMemoryAllocationLib that rely on minimum alignment to be able
>>> to switch the DmaLib.
>>>
>>> Patches #3 and #4 remove a couple of stale references.
>>>
>>> Patch #5 actually removes the library and its single remaining implementation.
>>
>> For the series:
>> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>>
>> However, this breaks a bunch of (edk2-)platforms: juno, fvp, tc2,
>> hikey and armada70x0. Is there a follow-on patch coming for those,
>> and could you hold off on pushing this series until that is ready?
>>
>> Armada has the only non-bogus UncachedMemoryAllocationLib dependency,
>> the others are just trivial deletions.
>>
>
> Yes. There are interdependencies between repos, so I will just merge
> #1 and #2 and hold off with the rest until after all dependencies have
> been removed.


Patches #1 .. #4 pushed as

deef290f95e0 EmbeddedPkg/DmaLib: add routine to allocate aligned buffers
4b4104d87e28 ArmPkg/ArmDmaLib: implement DmaAllocateAlignedBuffer()
b56397ba9f67 BeagleBoardPkg: remove UncachedMemoryAllocationLib resolutions
c1d799b91509 Omap35xxPkg: remove bogus UncachedMemoryAllocationLib dependency

I will push the remaining patch that actually removes
UncachedMemoryAllocationLib once the dependencies are gone from
edk2-platforms.

Re: [PATCH 5/5] ArmPkg: remove UncachedMemoryAllocationLib

[Ard Biesheuvel]

On 25 August 2017 at 13:10, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> Now that ArmDmaLib can take care of its own memory allocation needs,
> let's get rid of UncachedMemoryAllocationLib entirely. This forces
> platforms to declare the required semantics (non-cache coherent DMA,
> whichever way it is implemented), rather than using uncached memory
> allocations directly, which may not always be the right choice, and
> prevents sharing of drivers between platforms if one is cache coherent
> and the other is not.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Pushed as dcd48d2db4eb2d3d93106ad788a0f67d2ca5495c (with Leif's R-b)