MdeModulePkg/SdBlockIoPei: Support IoMmu

Update the SdBlockIoPei driver to consume IOMMU_PPI to allocate DMA
buffer.

If no IOMMU_PPI exists, this driver still calls PEI service
to allocate DMA buffer, with assumption that DRAM==DMA.

This is a compatible change.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

7 files changed, 483 insertions, 19 deletions

diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/DmaMem.c b/MdeModulePkg/Bus/Sd/SdBlockIoPei/DmaMem.c
new file mode 100644
index 0000000000..0dc2711ed1
--- /dev/null
+++ b/MdeModulePkg/Bus/Sd/SdBlockIoPei/DmaMem.c
@@ -0,0 +1,249 @@
+/** @file

+  The DMA memory help function.

+

+  Copyright (c) 2017, Intel Corporation. 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 "SdBlockIoPei.h"

+

+EDKII_IOMMU_PPI  *mIoMmu;

+

+/**

+  Provides the controller-specific addresses required to access system memory from a

+  DMA bus master.

+

+  @param  Operation             Indicates if the bus master is going to read or write to system memory.

+  @param  HostAddress           The system memory address to map to the PCI controller.

+  @param  NumberOfBytes         On input the number of bytes to map. On output the number of bytes

+                                that were mapped.

+  @param  DeviceAddress         The resulting map address for the bus master PCI controller to use to

+                                access the hosts HostAddress.

+  @param  Mapping               A resulting value to pass to Unmap().

+

+  @retval EFI_SUCCESS           The range was mapped for the returned NumberOfBytes.

+  @retval EFI_UNSUPPORTED       The HostAddress cannot be mapped as a common buffer.

+  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.

+  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.

+  @retval EFI_DEVICE_ERROR      The system hardware could not map the requested address.

+

+**/

+EFI_STATUS

+IoMmuMap (

+  IN  EDKII_IOMMU_OPERATION Operation,

+  IN VOID                   *HostAddress,

+  IN  OUT UINTN             *NumberOfBytes,

+  OUT EFI_PHYSICAL_ADDRESS  *DeviceAddress,

+  OUT VOID                  **Mapping

+  )

+{

+  EFI_STATUS  Status;

+  UINT64      Attribute;

+

+  if (mIoMmu != NULL) {

+    Status = mIoMmu->Map (

+                       mIoMmu,

+                       Operation,

+                       HostAddress,

+                       NumberOfBytes,

+                       DeviceAddress,

+                       Mapping

+                       );

+    if (EFI_ERROR (Status)) {

+      return EFI_OUT_OF_RESOURCES;

+    }

+    switch (Operation) {

+    case EdkiiIoMmuOperationBusMasterRead:

+    case EdkiiIoMmuOperationBusMasterRead64:

+      Attribute = EDKII_IOMMU_ACCESS_READ;

+      break;

+    case EdkiiIoMmuOperationBusMasterWrite:

+    case EdkiiIoMmuOperationBusMasterWrite64:

+      Attribute = EDKII_IOMMU_ACCESS_WRITE;

+      break;

+    case EdkiiIoMmuOperationBusMasterCommonBuffer:

+    case EdkiiIoMmuOperationBusMasterCommonBuffer64:

+      Attribute = EDKII_IOMMU_ACCESS_READ | EDKII_IOMMU_ACCESS_WRITE;

+      break;

+    default:

+      ASSERT(FALSE);

+      return EFI_INVALID_PARAMETER;

+    }

+    Status = mIoMmu->SetAttribute (

+                       mIoMmu,

+                       *Mapping,

+                       Attribute

+                       );

+    if (EFI_ERROR (Status)) {

+      return Status;

+    }

+  } else {

+    *DeviceAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)HostAddress;

+    *Mapping = NULL;

+    Status = EFI_SUCCESS;

+  }

+  return Status;

+}

+

+/**

+  Completes the Map() operation and releases any corresponding resources.

+

+  @param  Mapping               The mapping value returned from Map().

+

+  @retval EFI_SUCCESS           The range was unmapped.

+  @retval EFI_INVALID_PARAMETER Mapping is not a value that was returned by Map().

+  @retval EFI_DEVICE_ERROR      The data was not committed to the target system memory.

+**/

+EFI_STATUS

+IoMmuUnmap (

+  IN VOID                  *Mapping

+  )

+{

+  EFI_STATUS  Status;

+

+  if (mIoMmu != NULL) {

+    Status = mIoMmu->SetAttribute (mIoMmu, Mapping, 0);

+    Status = mIoMmu->Unmap (mIoMmu, Mapping);

+  } else {

+    Status = EFI_SUCCESS;

+  }

+  return Status;

+}

+

+/**

+  Allocates pages that are suitable for an OperationBusMasterCommonBuffer or

+  OperationBusMasterCommonBuffer64 mapping.

+

+  @param  Pages                 The number of pages to allocate.

+  @param  HostAddress           A pointer to store the base system memory address of the

+                                allocated range.

+  @param  DeviceAddress         The resulting map address for the bus master PCI controller to use to

+                                access the hosts HostAddress.

+  @param  Mapping               A resulting value to pass to Unmap().

+

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

+IoMmuAllocateBuffer (

+  IN UINTN                  Pages,

+  OUT VOID                  **HostAddress,

+  OUT EFI_PHYSICAL_ADDRESS  *DeviceAddress,

+  OUT VOID                  **Mapping

+  )

+{

+  EFI_STATUS            Status;

+  UINTN                 NumberOfBytes;

+  EFI_PHYSICAL_ADDRESS  HostPhyAddress;

+

+  *HostAddress = NULL;

+  *DeviceAddress = 0;

+

+  if (mIoMmu != NULL) {

+    Status = mIoMmu->AllocateBuffer (

+                       mIoMmu,

+                       EfiBootServicesData,

+                       Pages,

+                       HostAddress,

+                       0

+                       );

+    if (EFI_ERROR (Status)) {

+      return EFI_OUT_OF_RESOURCES;

+    }

+

+    NumberOfBytes = EFI_PAGES_TO_SIZE(Pages);

+    Status = mIoMmu->Map (

+                       mIoMmu,

+                       EdkiiIoMmuOperationBusMasterCommonBuffer,

+                       *HostAddress,

+                       &NumberOfBytes,

+                       DeviceAddress,

+                       Mapping

+                       );

+    if (EFI_ERROR (Status)) {

+      return EFI_OUT_OF_RESOURCES;

+    }

+    Status = mIoMmu->SetAttribute (

+                       mIoMmu,

+                       *Mapping,

+                       EDKII_IOMMU_ACCESS_READ | EDKII_IOMMU_ACCESS_WRITE

+                       );

+    if (EFI_ERROR (Status)) {

+      return Status;

+    }

+  } else {

+    Status = PeiServicesAllocatePages (

+               EfiBootServicesData,

+               Pages,

+               &HostPhyAddress

+               );

+    if (EFI_ERROR (Status)) {

+      return EFI_OUT_OF_RESOURCES;

+    }

+    *HostAddress = (VOID *)(UINTN)HostPhyAddress;

+    *DeviceAddress = HostPhyAddress;

+    *Mapping = NULL;

+  }

+  return Status;

+}

+

+/**

+  Frees memory that was allocated with AllocateBuffer().

+

+  @param  Pages                 The number of pages to free.

+  @param  HostAddress           The base system memory address of the allocated range.

+  @param  Mapping               The mapping value returned from Map().

+

+  @retval EFI_SUCCESS           The requested memory pages were freed.

+  @retval EFI_INVALID_PARAMETER The memory range specified by HostAddress and Pages

+                                was not allocated with AllocateBuffer().

+

+**/

+EFI_STATUS

+IoMmuFreeBuffer (

+  IN UINTN                  Pages,

+  IN VOID                   *HostAddress,

+  IN VOID                   *Mapping

+  )

+{

+  EFI_STATUS  Status;

+

+  if (mIoMmu != NULL) {

+    Status = mIoMmu->SetAttribute (mIoMmu, Mapping, 0);

+    Status = mIoMmu->Unmap (mIoMmu, Mapping);

+    Status = mIoMmu->FreeBuffer (mIoMmu, Pages, HostAddress);

+  } else {

+    Status = EFI_SUCCESS;

+  }

+  return Status;

+}

+

+/**

+  Initialize IOMMU.

+**/

+VOID

+IoMmuInit (

+  VOID

+  )

+{

+  PeiServicesLocatePpi (

+    &gEdkiiIoMmuPpiGuid,

+    0,

+    NULL,

+    (VOID **)&mIoMmu

+    );

+}

+

diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.c b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.c
index 6dc343edbd..2c3cf8cac6 100644
--- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.c
+++ b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.c
@@ -1,6 +1,6 @@
 /** @file

 

-  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2015 - 2017, Intel Corporation. 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

@@ -64,6 +64,11 @@ SD_PEIM_HC_PRIVATE_DATA gSdHcPrivateTemplate = {
     &gEfiPeiVirtualBlockIo2PpiGuid,

     NULL

   },

+  {

+    (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

+    &gEfiEndOfPeiSignalPpiGuid,

+    SdBlockIoPeimEndOfPei

+  },

   {                               // Slot

     {

       0,

@@ -466,6 +471,36 @@ SdBlockIoPeimReadBlocks2 (
 }

 

 /**

+  One notified function to cleanup the allocated DMA buffers at the end of PEI.

+

+  @param[in]  PeiServices        Pointer to PEI Services Table.

+  @param[in]  NotifyDescriptor   Pointer to the descriptor for the Notification

+                                 event that caused this function to execute.

+  @param[in]  Ppi                Pointer to the PPI data associated with this function.

+

+  @retval     EFI_SUCCESS  The function completes successfully

+

+**/

+EFI_STATUS

+EFIAPI

+SdBlockIoPeimEndOfPei (

+  IN EFI_PEI_SERVICES           **PeiServices,

+  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDescriptor,

+  IN VOID                       *Ppi

+  )

+{

+  SD_PEIM_HC_PRIVATE_DATA       *Private;

+

+  Private = GET_SD_PEIM_HC_PRIVATE_DATA_FROM_THIS_NOTIFY (NotifyDescriptor);

+

+  if ((Private->Pool != NULL) && (Private->Pool->Head != NULL)) {

+    SdPeimFreeMemPool (Private->Pool);

+  }

+

+  return EFI_SUCCESS;

+}

+

+/**

   The user code starts with this function.

 

   @param  FileHandle             Handle of the file being invoked.

@@ -519,6 +554,8 @@ InitializeSdBlockIoPeim (
     return EFI_DEVICE_ERROR;

   }

 

+  IoMmuInit ();

+

   Controller = 0;

   MmioBase   = NULL;

   while (TRUE) {

@@ -610,6 +647,11 @@ InitializeSdBlockIoPeim (
     Controller++;

     if (!EFI_ERROR (Status)) {

       PeiServicesInstallPpi (&Private->BlkIoPpiList);

+      PeiServicesNotifyPpi (&Private->EndOfPeiNotifyList);

+    } else {

+      if (Private->Pool->Head != NULL) {

+        SdPeimFreeMemPool (Private->Pool);

+      }

     }

   }

 

diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.h b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.h
index b2491bb3cb..87b2f00923 100644
--- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.h
+++ b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.h
@@ -1,6 +1,6 @@
 /** @file

 

-  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2015 - 2017, Intel Corporation. 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

@@ -19,6 +19,8 @@
 #include <Ppi/SdMmcHostController.h>

 #include <Ppi/BlockIo.h>

 #include <Ppi/BlockIo2.h>

+#include <Ppi/IoMmu.h>

+#include <Ppi/EndOfPeiPhase.h>

 

 #include <Library/DebugLib.h>

 #include <Library/BaseLib.h>

@@ -60,6 +62,12 @@ struct _SD_PEIM_HC_PRIVATE_DATA {
   EFI_PEI_RECOVERY_BLOCK_IO2_PPI    BlkIo2Ppi;

   EFI_PEI_PPI_DESCRIPTOR            BlkIoPpiList;

   EFI_PEI_PPI_DESCRIPTOR            BlkIo2PpiList;

+

+  //

+  // EndOfPei callback is used to do the cleanups before exit of PEI phase.

+  //

+  EFI_PEI_NOTIFY_DESCRIPTOR         EndOfPeiNotifyList;

+

   SD_PEIM_HC_SLOT                   Slot[SD_PEIM_MAX_SLOTS];

   UINT8                             SlotNum;

   UINT8                             TotalBlkIoDevices;

@@ -68,6 +76,7 @@ struct _SD_PEIM_HC_PRIVATE_DATA {
 #define SD_TIMEOUT                  MultU64x32((UINT64)(3), 1000000)

 #define GET_SD_PEIM_HC_PRIVATE_DATA_FROM_THIS(a) CR (a, SD_PEIM_HC_PRIVATE_DATA, BlkIoPpi, SD_PEIM_SIG)

 #define GET_SD_PEIM_HC_PRIVATE_DATA_FROM_THIS2(a) CR (a, SD_PEIM_HC_PRIVATE_DATA, BlkIo2Ppi, SD_PEIM_SIG)

+#define GET_SD_PEIM_HC_PRIVATE_DATA_FROM_THIS_NOTIFY(a) CR (a, SD_PEIM_HC_PRIVATE_DATA, EndOfPeiNotifyList, SD_PEIM_SIG)

 

 struct _SD_TRB {

   SD_PEIM_HC_SLOT                   *Slot;

@@ -77,6 +86,8 @@ struct _SD_TRB {
   VOID                              *Data;

   UINT32                            DataLen;

   BOOLEAN                           Read;

+  EFI_PHYSICAL_ADDRESS              DataPhy;

+  VOID                              *DataMap;

   SD_HC_TRANSFER_MODE               Mode;

 

   UINT64                            Timeout;

@@ -344,6 +355,20 @@ SdPeimInitMemPool (
   );

 

 /**

+  Release the memory management pool.

+

+  @param  Pool                  The memory pool to free.

+

+  @retval EFI_DEVICE_ERROR      Fail to free the memory pool.

+  @retval EFI_SUCCESS           The memory pool is freed.

+

+**/

+EFI_STATUS

+SdPeimFreeMemPool (

+  IN SD_PEIM_MEM_POOL       *Pool

+  );

+

+/**

   Allocate some memory from the host controller's memory pool

   which can be used to communicate with host controller.

 

@@ -374,4 +399,118 @@ SdPeimFreeMem (
   IN UINTN                Size

   );

 

+/**

+  Initialize IOMMU.

+**/

+VOID

+IoMmuInit (

+  VOID

+  );

+

+/**

+  Provides the controller-specific addresses required to access system memory from a

+  DMA bus master.

+

+  @param  Operation             Indicates if the bus master is going to read or write to system memory.

+  @param  HostAddress           The system memory address to map to the PCI controller.

+  @param  NumberOfBytes         On input the number of bytes to map. On output the number of bytes

+                                that were mapped.

+  @param  DeviceAddress         The resulting map address for the bus master PCI controller to use to

+                                access the hosts HostAddress.

+  @param  Mapping               A resulting value to pass to Unmap().

+

+  @retval EFI_SUCCESS           The range was mapped for the returned NumberOfBytes.

+  @retval EFI_UNSUPPORTED       The HostAddress cannot be mapped as a common buffer.

+  @retval EFI_INVALID_PARAMETER One or more parameters are invalid.

+  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.

+  @retval EFI_DEVICE_ERROR      The system hardware could not map the requested address.

+

+**/

+EFI_STATUS

+IoMmuMap (

+  IN  EDKII_IOMMU_OPERATION Operation,

+  IN  VOID                  *HostAddress,

+  IN  OUT UINTN             *NumberOfBytes,

+  OUT EFI_PHYSICAL_ADDRESS  *DeviceAddress,

+  OUT VOID                  **Mapping

+  );

+

+/**

+  Completes the Map() operation and releases any corresponding resources.

+

+  @param  Mapping               The mapping value returned from Map().

+

+  @retval EFI_SUCCESS           The range was unmapped.

+  @retval EFI_INVALID_PARAMETER Mapping is not a value that was returned by Map().

+  @retval EFI_DEVICE_ERROR      The data was not committed to the target system memory.

+**/

+EFI_STATUS

+IoMmuUnmap (

+  IN VOID                  *Mapping

+  );

+

+/**

+  Allocates pages that are suitable for an OperationBusMasterCommonBuffer or

+  OperationBusMasterCommonBuffer64 mapping.

+

+  @param  Pages                 The number of pages to allocate.

+  @param  HostAddress           A pointer to store the base system memory address of the

+                                allocated range.

+  @param  DeviceAddress         The resulting map address for the bus master PCI controller to use to

+                                access the hosts HostAddress.

+  @param  Mapping               A resulting value to pass to Unmap().

+

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

+IoMmuAllocateBuffer (

+  IN UINTN                  Pages,

+  OUT VOID                  **HostAddress,

+  OUT EFI_PHYSICAL_ADDRESS  *DeviceAddress,

+  OUT VOID                  **Mapping

+  );

+

+/**

+  Frees memory that was allocated with AllocateBuffer().

+

+  @param  Pages                 The number of pages to free.

+  @param  HostAddress           The base system memory address of the allocated range.

+  @param  Mapping               The mapping value returned from Map().

+

+  @retval EFI_SUCCESS           The requested memory pages were freed.

+  @retval EFI_INVALID_PARAMETER The memory range specified by HostAddress and Pages

+                                was not allocated with AllocateBuffer().

+

+**/

+EFI_STATUS

+IoMmuFreeBuffer (

+  IN UINTN                  Pages,

+  IN VOID                   *HostAddress,

+  IN VOID                   *Mapping

+  );

+

+/**

+  One notified function to cleanup the allocated DMA buffers at the end of PEI.

+

+  @param[in]  PeiServices        Pointer to PEI Services Table.

+  @param[in]  NotifyDescriptor   Pointer to the descriptor for the Notification

+                                 event that caused this function to execute.

+  @param[in]  Ppi                Pointer to the PPI data associated with this function.

+

+  @retval     EFI_SUCCESS  The function completes successfully

+

+**/

+EFI_STATUS

+EFIAPI

+SdBlockIoPeimEndOfPei (

+  IN EFI_PEI_SERVICES           **PeiServices,

+  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDescriptor,

+  IN VOID                       *Ppi

+  );

+

 #endif

diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.inf b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.inf
index ca4c39b65f..1530f1efdb 100644
--- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.inf
+++ b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.inf
@@ -1,7 +1,7 @@
 ## @file

 # Description file for the SD memory card Peim driver.

 #

-# Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -36,6 +36,7 @@
   SdHci.h

   SdHcMem.c

   SdHcMem.h

+  DmaMem.c

 

 [Packages]

   MdePkg/MdePkg.dec

@@ -53,6 +54,8 @@
   gEfiPeiVirtualBlockIoPpiGuid                  ## PRODUCES

   gEfiPeiVirtualBlockIo2PpiGuid                 ## PRODUCES

   gEdkiiPeiSdMmcHostControllerPpiGuid           ## CONSUMES

+  gEdkiiIoMmuPpiGuid                            ## CONSUMES

+  gEfiEndOfPeiSignalPpiGuid                     ## CONSUMES

 

 [Depex]

   gEfiPeiMemoryDiscoveredPpiGuid AND gEdkiiPeiSdMmcHostControllerPpiGuid

diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.c b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.c
index f390a636dc..24ad3dc6c2 100644
--- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.c
+++ b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.c
@@ -1,6 +1,6 @@
 /** @file

 

-Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>

 

 This program and the accompanying materials

 are licensed and made available under the terms and conditions

@@ -29,9 +29,11 @@ SdPeimAllocMemBlock (
   )

 {

   SD_PEIM_MEM_BLOCK            *Block;

+  VOID                         *BufHost;

+  VOID                         *Mapping;

+  EFI_PHYSICAL_ADDRESS         MappedAddr;

   EFI_STATUS                   Status;

   VOID                         *TempPtr;

-  EFI_PHYSICAL_ADDRESS         Address;

 

   TempPtr = NULL;

   Block   = NULL;

@@ -62,19 +64,22 @@ SdPeimAllocMemBlock (
 

   Block->Bits = (UINT8*)(UINTN)TempPtr;

 

-  Status = PeiServicesAllocatePages (

-             EfiBootServicesCode,

+  Status = IoMmuAllocateBuffer (

              Pages,

-             &Address

+             &BufHost,

+             &MappedAddr,

+             &Mapping

              );

   if (EFI_ERROR (Status)) {

     return NULL;

   }

 

-  ZeroMem ((VOID*)(UINTN)Address, EFI_PAGES_TO_SIZE (Pages));

+  ZeroMem ((VOID*)(UINTN)BufHost, EFI_PAGES_TO_SIZE (Pages));

 

-  Block->Buf  = (UINT8*)((UINTN)Address);

-  Block->Next = NULL;

+  Block->BufHost = (UINT8 *) (UINTN) BufHost;

+  Block->Buf     = (UINT8 *) (UINTN) MappedAddr;

+  Block->Mapping = Mapping;

+  Block->Next    = NULL;

 

   return Block;

 }

@@ -93,6 +98,8 @@ SdPeimFreeMemBlock (
   )

 {

   ASSERT ((Pool != NULL) && (Block != NULL));

+

+  IoMmuFreeBuffer (EFI_SIZE_TO_PAGES (Block->BufLen), Block->BufHost, Block->Mapping);

 }

 

 /**

diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.h b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.h
index 096b625f98..e293631680 100644
--- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.h
+++ b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.h
@@ -1,6 +1,6 @@
 /** @file

 

-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>

 

 This program and the accompanying materials

 are licensed and made available under the terms and conditions

@@ -27,7 +27,9 @@ struct _SD_PEIM_MEM_BLOCK {
   UINT8                   *Bits;    // Bit array to record which unit is allocated

   UINTN                   BitsLen;

   UINT8                   *Buf;

+  UINT8                   *BufHost;

   UINTN                   BufLen;   // Memory size in bytes

+  VOID                    *Mapping;

   SD_PEIM_MEM_BLOCK       *Next;

 };

 

diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c
index eebadd79bc..228c343f9d 100644
--- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c
+++ b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c
@@ -929,7 +929,7 @@ BuildAdmaDescTable (
   UINT64                    Remaining;

   UINT32                    Address;

 

-  Data    = (EFI_PHYSICAL_ADDRESS)(UINTN)Trb->Data;

+  Data    = Trb->DataPhy;

   DataLen = Trb->DataLen;

   //

   // Only support 32bit ADMA Descriptor Table

@@ -998,6 +998,8 @@ SdPeimCreateTrb (
   SD_TRB                      *Trb;

   EFI_STATUS                  Status;

   SD_HC_SLOT_CAP              Capability;

+  EDKII_IOMMU_OPERATION       MapOp;

+  UINTN                       MapLength;

 

   //

   // Calculate a divisor for SD clock frequency

@@ -1007,7 +1009,7 @@ SdPeimCreateTrb (
     return NULL;

   }

 

-  Trb = SdPeimAllocateMem (Slot->Private->Pool, sizeof (SD_TRB));

+  Trb = AllocateZeroPool (sizeof (SD_TRB));

   if (Trb == NULL) {

     return NULL;

   }

@@ -1039,6 +1041,22 @@ SdPeimCreateTrb (
   if (Packet->SdCmdBlk->CommandIndex == SD_SEND_TUNING_BLOCK) {

     Trb->Mode = SdPioMode;

   } else {

+    if (Trb->Read) {

+      MapOp = EdkiiIoMmuOperationBusMasterWrite;

+    } else {

+      MapOp = EdkiiIoMmuOperationBusMasterRead;

+    }

+

+    if (Trb->DataLen != 0) {

+      MapLength = Trb->DataLen;

+      Status = IoMmuMap (MapOp, Trb->Data, &MapLength, &Trb->DataPhy, &Trb->DataMap);

+

+      if (EFI_ERROR (Status) || (MapLength != Trb->DataLen)) {

+        DEBUG ((DEBUG_ERROR, "SdPeimCreateTrb: Fail to map data buffer.\n"));

+        goto Error;

+      }

+    }

+

     if (Trb->DataLen == 0) {

       Trb->Mode = SdNoData;

     } else if (Capability.Adma2 != 0) {

@@ -1071,12 +1089,16 @@ SdPeimFreeTrb (
   IN SD_TRB           *Trb

   )

 {

+  if ((Trb != NULL) && (Trb->DataMap != NULL)) {

+    IoMmuUnmap (Trb->DataMap);

+  }

+

   if ((Trb != NULL) && (Trb->AdmaDesc != NULL)) {

     SdPeimFreeMem (Trb->Slot->Private->Pool, Trb->AdmaDesc, Trb->AdmaDescSize);

   }

 

   if (Trb != NULL) {

-    SdPeimFreeMem (Trb->Slot->Private->Pool, Trb, sizeof (SD_TRB));

+    FreePool (Trb);

   }

   return;

 }

@@ -1241,11 +1263,11 @@ SdPeimExecTrb (
   SdPeimHcLedOnOff (Bar, TRUE);

 

   if (Trb->Mode == SdSdmaMode) {

-    if ((UINT64)(UINTN)Trb->Data >= 0x100000000ul) {

+    if ((UINT64)(UINTN)Trb->DataPhy >= 0x100000000ul) {

       return EFI_INVALID_PARAMETER;

     }

 

-    SdmaAddr = (UINT32)(UINTN)Trb->Data;

+    SdmaAddr = (UINT32)(UINTN)Trb->DataPhy;

     Status   = SdPeimHcRwMmio (Bar + SD_HC_SDMA_ADDR, FALSE, sizeof (SdmaAddr), &SdmaAddr);

     if (EFI_ERROR (Status)) {

       return Status;

@@ -1485,7 +1507,7 @@ SdPeimCheckTrbResult (
     //

     // Update SDMA Address register.

     //

-    SdmaAddr = SD_SDMA_ROUND_UP ((UINT32)(UINTN)Trb->Data, SD_SDMA_BOUNDARY);

+    SdmaAddr = SD_SDMA_ROUND_UP ((UINT32)(UINTN)Trb->DataPhy, SD_SDMA_BOUNDARY);

     Status   = SdPeimHcRwMmio (

                  Bar + SD_HC_SDMA_ADDR,

                  FALSE,

@@ -1495,7 +1517,7 @@ SdPeimCheckTrbResult (
     if (EFI_ERROR (Status)) {

       goto Done;

     }

-    Trb->Data = (VOID*)(UINTN)SdmaAddr;

+    Trb->DataPhy = (UINT32)(UINTN)SdmaAddr;

   }

 

   if ((Packet->SdCmdBlk->CommandType != SdCommandTypeAdtc) &&