From 50d4be4f4e3d5beb2c1aa58853b92e3cc1f4cb9a Mon Sep 17 00:00:00 2001
From: Daniil Egranov <daniil.egranov@arm.com>
Date: Thu, 22 Sep 2016 17:33:01 -0500
Subject: [PATCH] ArmPlatformPkg/ArmJunoPkg/Drivers/PciHostBridgeDxe: Fix for
 PCI Dual Address Cycle

The fix handles the PCI Dual Address Cycle Attribute case. It allows
drivers using PCI DAC run on Juno.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Daniil Egranov <daniil.egranov@arm.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
---
 .../ArmJunoPkg/Drivers/PciHostBridgeDxe/PciRootBridge.c  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/PciHostBridgeDxe/PciRootBridge.c b/ArmPlatformPkg/ArmJunoPkg/Drivers/PciHostBridgeDxe/PciRootBridge.c
index 10a4575c16..72d09156c0 100644
--- a/ArmPlatformPkg/ArmJunoPkg/Drivers/PciHostBridgeDxe/PciRootBridge.c
+++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/PciHostBridgeDxe/PciRootBridge.c
@@ -518,11 +518,14 @@ PciRbMap (
 
   PCI_TRACE ("PciRbMap()");
 
-  if (Operation == EfiPciOperationBusMasterRead) {
+  if (Operation == EfiPciOperationBusMasterRead ||
+      Operation == EfiPciOperationBusMasterRead64) {
     DmaOperation = MapOperationBusMasterRead;
-  } else if (Operation == EfiPciOperationBusMasterWrite) {
+  } else if (Operation == EfiPciOperationBusMasterWrite ||
+             Operation == EfiPciOperationBusMasterWrite64) {
     DmaOperation = MapOperationBusMasterWrite;
-  } else if (Operation == EfiPciOperationBusMasterCommonBuffer) {
+  } else if (Operation == EfiPciOperationBusMasterCommonBuffer ||
+             Operation == EfiPciOperationBusMasterCommonBuffer64) {
     DmaOperation = MapOperationBusMasterCommonBuffer;
   } else {
     return EFI_INVALID_PARAMETER;