BaseTools/BinToPcd: Fix Python 2.7.x compatibility issue

[mirror_edk2.git] / EmbeddedPkg / Universal / MmcDxe / MmcIdentification.c

diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c
old mode 100644 (file)
new mode 100755 (executable)
index c28207e..f661a0c
--- a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c
+++ b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c
@@ -13,6 +13,7 @@
 **/\r
 \r
 #include <Library/BaseMemoryLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
 #include <Library/TimerLib.h>\r
 \r
 #include "Mmc.h"\r
@@ -210,15 +211,19 @@ EmmcIdentificationMode (
   }\r
 \r
   // Fetch ECSD\r
+  MmcHostInstance->CardInfo.ECSDData = AllocatePages (EFI_SIZE_TO_PAGES (sizeof (ECSD)));\r
+  if (MmcHostInstance->CardInfo.ECSDData == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
   Status = Host->SendCommand (Host, MMC_CMD8, 0);\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): ECSD fetch error, Status=%r.\n", Status));\r
   }\r
 \r
-  Status = Host->ReadBlockData (Host, 0, 512, (UINT32 *)&(MmcHostInstance->CardInfo.ECSDData));\r
+  Status = Host->ReadBlockData (Host, 0, 512, (UINT32 *)MmcHostInstance->CardInfo.ECSDData);\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): ECSD read error, Status=%r.\n", Status));\r
-    return Status;\r
+    goto FreePageExit;\r
   }\r
 \r
   // Make sure device exiting data mode\r
@@ -226,7 +231,7 @@ EmmcIdentificationMode (
     Status = EmmcGetDeviceState (MmcHostInstance, &State);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): Failed to get device state, Status=%r.\n", Status));\r
-      return Status;\r
+      goto FreePageExit;\r
     }\r
   } while (State == EMMC_DATA_STATE);\r
 \r
@@ -237,12 +242,16 @@ EmmcIdentificationMode (
   Media->LogicalBlocksPerPhysicalBlock = 1;\r
   Media->IoAlign = 4;\r
   // Compute last block using bits [215:212] of the ECSD\r
-  Media->LastBlock = MmcHostInstance->CardInfo.ECSDData.SECTOR_COUNT - 1; // eMMC isn't supposed to report this for\r
+  Media->LastBlock = MmcHostInstance->CardInfo.ECSDData->SECTOR_COUNT - 1; // eMMC isn't supposed to report this for\r
   // Cards <2GB in size, but the model does.\r
 \r
   // Setup card type\r
   MmcHostInstance->CardInfo.CardType = EMMC_CARD;\r
   return EFI_SUCCESS;\r
+\r
+FreePageExit:\r
+  FreePages (MmcHostInstance->CardInfo.ECSDData, EFI_SIZE_TO_PAGES (sizeof (ECSD)));\r
+  return Status;\r
 }\r
 \r
 STATIC\r
@@ -258,7 +267,7 @@ InitializeEmmcDevice (
   UINT32     TimingMode[4] = {EMMCHS52DDR1V2, EMMCHS52DDR1V8, EMMCHS52, EMMCHS26};\r
 \r
   Host  = MmcHostInstance->MmcHost;\r
-  ECSDData = &MmcHostInstance->CardInfo.ECSDData;\r
+  ECSDData = MmcHostInstance->CardInfo.ECSDData;\r
   if (ECSDData->DEVICE_TYPE == EMMCBACKWARD)\r
     return EFI_SUCCESS;\r
 \r
@@ -308,6 +317,23 @@ InitializeEmmcDevice (
   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
@@ -317,6 +343,7 @@ InitializeSdMmcDevice (
   UINT32        CmdArg;\r
   UINT32        Response[4];\r
   UINT32        Buffer[128];\r
+  UINT32        Speed;\r
   UINTN         BlockSize;\r
   UINTN         CardSize;\r
   UINTN         NumBlocks;\r
@@ -325,6 +352,7 @@ InitializeSdMmcDevice (
   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
@@ -379,12 +407,12 @@ InitializeSdMmcDevice (
 \r
   Status = MmcHost->SendCommand (MmcHost, MMC_CMD55, CmdArg);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "%a(MMC_CMD55): Error and Status = %r\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "%a (MMC_CMD55): Error and Status = %r\n", __FUNCTION__, Status));\r
     return Status;\r
   }\r
   Status = MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1, Response);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "%a(MMC_CMD55): Error and Status = %r\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "%a (MMC_CMD55): Error and Status = %r\n", __FUNCTION__, Status));\r
     return Status;\r
   }\r
   if ((Response[0] & MMC_STATUS_APP_CMD) == 0) {\r
@@ -430,18 +458,42 @@ InitializeSdMmcDevice (
     }\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
-    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 ((EFI_D_ERROR, "%a(MMC_CMD6): Error and Status = %r\n", 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 ((EFI_D_ERROR, "%a(MMC_CMD6): ReadBlockData Error and Status = %r\n", 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
@@ -450,20 +502,20 @@ InitializeSdMmcDevice (
     CmdArg = MmcHostInstance->CardInfo.RCA << 16;\r
     Status = MmcHost->SendCommand (MmcHost, MMC_CMD55, CmdArg);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "%a(MMC_CMD55): Error and Status = %r\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "%a (MMC_CMD55): Error and Status = %r\n", __FUNCTION__, Status));\r
       return Status;\r
     }\r
     /* Width: 4 */\r
     Status = MmcHost->SendCommand (MmcHost, MMC_CMD6, 2);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "%a(MMC_CMD6): Error and Status = %r\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status = %r\n", __FUNCTION__, Status));\r
       return Status;\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 ((EFI_D_ERROR, "%a(SetIos): Error and Status = %r\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "%a (SetIos): Error and Status = %r\n", __FUNCTION__, Status));\r
       return Status;\r
     }\r
   }\r