EmbeddedPkg/Universal/MmcDxe: Mmc errors for multi-block operations

[mariam-elshakfy-linaro]

Hello,

While working on a new EDK2 port, I came across a problem with using EmbeddedPkg/Universal/MmcDxe
in which CMD13 fails during multi-block operations (read/write).

The issue was resolved by moving this StopTransmission scenario before issuing CMD13

I don't know much about the specs, but have checked "SD Host Controller Simplified Specification Version 4.20 - Section 3.8.1 Abort Command Sequence", and CMD13 seems to follow CMD12 in that sequence.

So, would it make sense to submit this change or is there a reason for the current order?

diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
index d695e25571..95d0ddfcc9 100644
--- a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
+++ b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
@@ -195,6 +195,10 @@ MmcTransferBlock (
     }
   }
 
+  if (BufferSize > This->Media->BlockSize) {
+    Status = MmcStopTransmission (MmcHost);
+  }
+
   // Command 13 - Read status and wait for programming to complete (return to tran)
   Timeout     = MMCI0_TIMEOUT;
   CmdArg      = MmcHostInstance->CardInfo.RCA << 16;
@@ -212,15 +216,6 @@ MmcTransferBlock (
     }
   }
 
-  if (BufferSize > This->Media->BlockSize) {
-    Status = MmcHost->SendCommand (MmcHost, MMC_CMD12, 0);
-    if (EFI_ERROR (Status)) {
-      DEBUG ((DEBUG_BLKIO, "%a(): Error and Status:%r\n", __func__, Status));
-    }
-
-    MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1b, Response);
-  }
-
   Status = MmcNotifyState (MmcHostInstance, MmcTransferState);
   if (EFI_ERROR (Status)) {
     DEBUG ((DEBUG_ERROR, "MmcIoBlocks() : Error MmcTransferState\n"));

Thanks!