EmbeddedPkg: Fix Command Argument for SD/eMMC R/W operation.

Issue : SD read failure for high capacity cards e.g. 64 GB

Reason : Command argument value exceeds 32 bit for block number 0x3787FFF
and cant be fit into 32 bit wide SD host controller register.

Fix :
AccessMode bits [29:30] of OCR is a valid definition to calculate
data address for eMMC cards.

For SD cards, data address is calculated on the basis of
card capacity status bit[30] of OCR.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/EmbeddedPkg/Universal/MmcDxe/Mmc.h b/EmbeddedPkg/Universal/MmcDxe/Mmc.h
index a77ba41575f101cd156a2f3fb58e1a71910b26fc..62de2c87440d8edd33a36b2b07f04bf5a6e411e8 100644 (file)
--- a/EmbeddedPkg/Universal/MmcDxe/Mmc.h
+++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.h
@@ -70,6 +70,8 @@
 #define SD_HIGH_SPEED                       50000000\r
 #define SWITCH_CMD_SUCCESS_MASK             0x0f000000\r
 \r
+#define SD_CARD_CAPACITY                    0x00000002\r
+\r
 #define BUSWIDTH_4                          4\r
 \r
 typedef enum {\r

diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
index a2b923270cc7cbb234eb0f2e15e24bdba36ed7e4..1dea7d35febbaad7f262225f9b5fd5a00e7d3026 100644 (file)
--- a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
+++ b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
@@ -148,12 +148,23 @@ MmcTransferBlock (
   MmcHostInstance = MMC_HOST_INSTANCE_FROM_BLOCK_IO_THIS (This);\r
   MmcHost = MmcHostInstance->MmcHost;\r
 \r
-  //Set command argument based on the card access mode (Byte mode or Block mode)\r
-  if ((MmcHostInstance->CardInfo.OCRData.AccessMode & MMC_OCR_ACCESS_MASK) ==\r
-      MMC_OCR_ACCESS_SECTOR) {\r
-    CmdArg = Lba;\r
+  if (MmcHostInstance->CardInfo.CardType != EMMC_CARD) {\r
+    //Set command argument based on the card capacity\r
+    //if 0 : SDSC card\r
+    //if 1 : SDXC/SDHC\r
+    if (MmcHostInstance->CardInfo.OCRData.AccessMode & SD_CARD_CAPACITY) {\r
+      CmdArg = Lba;\r
+    } else {\r
+      CmdArg = Lba * This->Media->BlockSize;\r
+    }\r
   } else {\r
-    CmdArg = Lba * This->Media->BlockSize;\r
+    //Set command argument based on the card access mode (Byte mode or Block mode)\r
+    if ((MmcHostInstance->CardInfo.OCRData.AccessMode & MMC_OCR_ACCESS_MASK) ==\r
+        MMC_OCR_ACCESS_SECTOR) {\r
+      CmdArg = Lba;\r
+    } else {\r
+      CmdArg = Lba * This->Media->BlockSize;\r
+    }\r
   }\r
 \r
   Status = MmcHost->SendCommand (MmcHost, Cmd, CmdArg);\r