SD : Updated CMD 6 implememtation.

For setting high speed in SD card,
First CMD 6 (Switch) is send to check if card supports High Speed and
Second command is send to switch card to high speed mode.

In current inplementation, CMD 6 was sent only once to switch the
card into HS mode without checking if card supports HS or not, which is
not as per specification and also we are not setting the HS i.e. 50000000
but directly asking the card to switch to 26000000 which is incorrect as
SD card supports either 25000000 or 50000000.

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

diff --git a/EmbeddedPkg/Universal/MmcDxe/Mmc.h b/EmbeddedPkg/Universal/MmcDxe/Mmc.h
index f3e56ff3a63f7e1c53c09a309965f5f9b80f5589..a77ba41575f101cd156a2f3fb58e1a71910b26fc 100644 (file)
--- a/EmbeddedPkg/Universal/MmcDxe/Mmc.h
+++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.h
@@ -64,6 +64,14 @@
 #define EMMC_CMD6_ARG_VALUE(x)              (((x) & 0xFF) << 8)\r
 #define EMMC_CMD6_ARG_CMD_SET(x)            (((x) & 0x7) << 0)\r
 \r
 #define EMMC_CMD6_ARG_VALUE(x)              (((x) & 0xFF) << 8)\r
 #define EMMC_CMD6_ARG_CMD_SET(x)            (((x) & 0x7) << 0)\r
 \r

+#define SWITCH_CMD_DATA_LENGTH              64\r
+#define SD_HIGH_SPEED_SUPPORTED             0x20000\r
+#define SD_DEFAULT_SPEED                    25000000\r
+#define SD_HIGH_SPEED                       50000000\r
+#define SWITCH_CMD_SUCCESS_MASK             0x0f000000\r
+\r
+#define BUSWIDTH_4                          4\r
+\r

 typedef enum {\r
   UNKNOWN_CARD,\r
   MMC_CARD,              //MMC card\r
 typedef enum {\r
   UNKNOWN_CARD,\r
   MMC_CARD,              //MMC card\r

diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c
old mode 100644 (file)
new mode 100755 (executable)
index 27e4444..f661a0c
--- a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c
+++ b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c
@@ -317,6 +317,23 @@ InitializeEmmcDevice (
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

+STATIC\r
+UINT32\r
+CreateSwitchCmdArgument (\r
+  IN  UINT32 Mode,\r
+  IN  UINT8  Group,\r
+  IN  UINT8  Value\r
+  )\r
+{\r
+  UINT32 Argument;\r
+\r
+  Argument = Mode << 31 | 0x00FFFFFF;\r
+  Argument &= ~(0xF << (Group * 4));\r
+  Argument |= Value << (Group * 4);\r
+\r
+  return Argument;\r
+}\r
+\r

 STATIC\r
 EFI_STATUS\r
 InitializeSdMmcDevice (\r
 STATIC\r
 EFI_STATUS\r
 InitializeSdMmcDevice (\r


@@ -326,6 +343,7 @@ InitializeSdMmcDevice (
   UINT32        CmdArg;\r
   UINT32        Response[4];\r
   UINT32        Buffer[128];\r
   UINT32        CmdArg;\r
   UINT32        Response[4];\r
   UINT32        Buffer[128];\r

+  UINT32        Speed;\r

   UINTN         BlockSize;\r
   UINTN         CardSize;\r
   UINTN         NumBlocks;\r
   UINTN         BlockSize;\r
   UINTN         CardSize;\r
   UINTN         NumBlocks;\r


@@ -334,6 +352,7 @@ InitializeSdMmcDevice (
   EFI_STATUS    Status;\r
   EFI_MMC_HOST_PROTOCOL     *MmcHost;\r
 \r
   EFI_STATUS    Status;\r
   EFI_MMC_HOST_PROTOCOL     *MmcHost;\r
 \r

+  Speed = SD_DEFAULT_SPEED;\r

   MmcHost = MmcHostInstance->MmcHost;\r
 \r
   // Send a command to get Card specific data\r
   MmcHost = MmcHostInstance->MmcHost;\r
 \r
   // Send a command to get Card specific data\r


@@ -439,20 +458,44 @@ InitializeSdMmcDevice (
     }\r
   }\r
   if (CccSwitch) {\r
     }\r
   }\r
   if (CccSwitch) {\r

+    /* SD Switch, Mode:0, Group:0, Value:0 */\r
+    CmdArg = CreateSwitchCmdArgument(0, 0, 0);\r
+    Status = MmcHost->SendCommand (MmcHost, MMC_CMD6, CmdArg);\r
+    if (EFI_ERROR (Status)) {\r
+      DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status = %r\n", __FUNCTION__, Status));\r
+       return Status;\r
+    } else {\r
+      Status = MmcHost->ReadBlockData (MmcHost, 0, SWITCH_CMD_DATA_LENGTH, Buffer);\r
+      if (EFI_ERROR (Status)) {\r
+        DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): ReadBlockData Error and Status = %r\n", __FUNCTION__, Status));\r
+        return Status;\r
+      }\r
+    }\r
+\r
+    if (!(Buffer[3] & SD_HIGH_SPEED_SUPPORTED)) {\r
+      DEBUG ((DEBUG_ERROR, "%a : High Speed not supported by Card %r\n", __FUNCTION__, Status));\r
+      return Status;\r
+    }\r
+\r
+    Speed = SD_HIGH_SPEED;\r
+\r

     /* SD Switch, Mode:1, Group:0, Value:1 */\r
     /* SD Switch, Mode:1, Group:0, Value:1 */\r

-    CmdArg = 1 << 31 | 0x00FFFFFF;\r
-    CmdArg &= ~(0xF << (0 * 4));\r
-    CmdArg |= 1 << (0 * 4);\r
+    CmdArg = CreateSwitchCmdArgument(1, 0, 1);\r

     Status = MmcHost->SendCommand (MmcHost, MMC_CMD6, CmdArg);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status = %r\n", __FUNCTION__, Status));\r
        return Status;\r
     } else {\r
     Status = MmcHost->SendCommand (MmcHost, MMC_CMD6, CmdArg);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status = %r\n", __FUNCTION__, Status));\r
        return Status;\r
     } else {\r

-      Status = MmcHost->ReadBlockData (MmcHost, 0, 64, Buffer);\r
+      Status = MmcHost->ReadBlockData (MmcHost, 0, SWITCH_CMD_DATA_LENGTH, Buffer);\r

       if (EFI_ERROR (Status)) {\r
         DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): ReadBlockData Error and Status = %r\n", __FUNCTION__, Status));\r
         return Status;\r
       }\r
       if (EFI_ERROR (Status)) {\r
         DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): ReadBlockData Error and Status = %r\n", __FUNCTION__, Status));\r
         return Status;\r
       }\r

+\r
+      if ((Buffer[4] & SWITCH_CMD_SUCCESS_MASK) != 0x01000000) {\r
+        DEBUG((DEBUG_ERROR, "Problem switching SD card into high-speed mode\n"));\r
+        return Status;\r
+      }\r

     }\r
   }\r
   if (Scr.SD_BUS_WIDTHS & SD_BUS_WIDTH_4BIT) {\r
     }\r
   }\r
   if (Scr.SD_BUS_WIDTHS & SD_BUS_WIDTH_4BIT) {\r


@@ -470,7 +513,7 @@ InitializeSdMmcDevice (
     }\r
   }\r
   if (MMC_HOST_HAS_SETIOS(MmcHost)) {\r
     }\r
   }\r
   if (MMC_HOST_HAS_SETIOS(MmcHost)) {\r

-    Status = MmcHost->SetIos (MmcHost, 26 * 1000 * 1000, 4, EMMCBACKWARD);\r
+    Status = MmcHost->SetIos (MmcHost, Speed, BUSWIDTH_4, EMMCBACKWARD);\r

     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "%a (SetIos): Error and Status = %r\n", __FUNCTION__, Status));\r
       return Status;\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "%a (SetIos): Error and Status = %r\n", __FUNCTION__, Status));\r
       return Status;\r