EmbeddedPkg/Protocol/MmcHost: add new methods for I/O width and multiblock

Add new protocol methods to change the bus width, speed and check
for multiblock support.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Split off protocol changes from implementation changes.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

diff --git a/EmbeddedPkg/Include/Protocol/MmcHost.h b/EmbeddedPkg/Include/Protocol/MmcHost.h
index 89f2e80b5c55ea974d44d50178806476afcee869..4d11338e623097afafb08bd1e35bec4c3a7c8e08 100644 (file)
--- a/EmbeddedPkg/Include/Protocol/MmcHost.h
+++ b/EmbeddedPkg/Include/Protocol/MmcHost.h
@@ -49,6 +49,7 @@ typedef UINT32 MMC_CMD;
 #define MMC_CMD2              (MMC_INDX(2) | MMC_CMD_WAIT_RESPONSE | MMC_CMD_LONG_RESPONSE)\r
 #define MMC_CMD3              (MMC_INDX(3) | MMC_CMD_WAIT_RESPONSE)\r
 #define MMC_CMD5              (MMC_INDX(5) | MMC_CMD_WAIT_RESPONSE | MMC_CMD_NO_CRC_RESPONSE)\r
+#define MMC_CMD6              (MMC_INDX(6) | MMC_CMD_WAIT_RESPONSE)\r
 #define MMC_CMD7              (MMC_INDX(7) | MMC_CMD_WAIT_RESPONSE)\r
 #define MMC_CMD8              (MMC_INDX(8) | MMC_CMD_WAIT_RESPONSE)\r
 #define MMC_CMD9              (MMC_INDX(9) | MMC_CMD_WAIT_RESPONSE | MMC_CMD_LONG_RESPONSE)\r
@@ -61,13 +62,17 @@ typedef UINT32 MMC_CMD;
 #define MMC_CMD20             (MMC_INDX(20) | MMC_CMD_WAIT_RESPONSE)\r
 #define MMC_CMD23             (MMC_INDX(23) | MMC_CMD_WAIT_RESPONSE)\r
 #define MMC_CMD24             (MMC_INDX(24) | MMC_CMD_WAIT_RESPONSE)\r
+#define MMC_CMD25             (MMC_INDX(25) | MMC_CMD_WAIT_RESPONSE)\r
 #define MMC_CMD55             (MMC_INDX(55) | MMC_CMD_WAIT_RESPONSE)\r
 #define MMC_ACMD41            (MMC_INDX(41) | MMC_CMD_WAIT_RESPONSE | MMC_CMD_NO_CRC_RESPONSE)\r
+#define MMC_ACMD51            (MMC_INDX(51) | MMC_CMD_WAIT_RESPONSE)\r
 \r
 // Valid responses for CMD1 in eMMC\r
 #define EMMC_CMD1_CAPACITY_LESS_THAN_2GB 0x00FF8080 // Capacity <= 2GB, byte addressing used\r
 #define EMMC_CMD1_CAPACITY_GREATER_THAN_2GB 0x40FF8080 // Capacity > 2GB, 512-byte sector addressing used\r
 \r
+#define MMC_STATUS_APP_CMD    (1 << 5)\r
+\r
 typedef enum _MMC_STATE {\r
     MmcInvalidState = 0,\r
     MmcHwInitializationState,\r
@@ -82,6 +87,16 @@ typedef enum _MMC_STATE {
     MmcDisconnectState,\r
 } MMC_STATE;\r
 \r
+#define EMMCBACKWARD         (0)\r
+#define EMMCHS26             (1 << 0)      // High-Speed @26MHz at rated device voltages\r
+#define EMMCHS52             (1 << 1)      // High-Speed @52MHz at rated device voltages\r
+#define EMMCHS52DDR1V8       (1 << 2)      // High-Speed Dual Data Rate @52MHz 1.8V or 3V I/O\r
+#define EMMCHS52DDR1V2       (1 << 3)      // High-Speed Dual Data Rate @52MHz 1.2V I/O\r
+#define EMMCHS200SDR1V8      (1 << 4)      // HS200 Single Data Rate @200MHz 1.8V I/O\r
+#define EMMCHS200SDR1V2      (1 << 5)      // HS200 Single Data Rate @200MHz 1.2V I/O\r
+#define EMMCHS400DDR1V8      (1 << 6)      // HS400 Dual Data Rate @400MHz 1.8V I/O\r
+#define EMMCHS400DDR1V2      (1 << 7)      // HS400 Dual Data Rate @400MHz 1.2V I/O\r
+\r
 ///\r
 /// Forward declaration for EFI_MMC_HOST_PROTOCOL\r
 ///\r
@@ -131,6 +146,16 @@ typedef EFI_STATUS (EFIAPI *MMC_WRITEBLOCKDATA) (
   IN  UINT32                    *Buffer\r
   );\r
 \r
+typedef EFI_STATUS (EFIAPI *MMC_SETIOS) (\r
+  IN  EFI_MMC_HOST_PROTOCOL     *This,\r
+  IN  UINT32                    BusClockFreq,\r
+  IN  UINT32                    BusWidth,\r
+  IN  UINT32                    TimingMode\r
+  );\r
+\r
+typedef BOOLEAN (EFIAPI *MMC_ISMULTIBLOCK) (\r
+  IN  EFI_MMC_HOST_PROTOCOL     *This\r
+  );\r
 \r
 struct _EFI_MMC_HOST_PROTOCOL {\r
 \r
@@ -147,9 +172,17 @@ struct _EFI_MMC_HOST_PROTOCOL {
   MMC_READBLOCKDATA       ReadBlockData;\r
   MMC_WRITEBLOCKDATA      WriteBlockData;\r
 \r
+  MMC_SETIOS              SetIos;\r
+  MMC_ISMULTIBLOCK        IsMultiBlock;\r
+\r
 };\r
 \r
-#define MMC_HOST_PROTOCOL_REVISION    0x00010001    // 1.1\r
+#define MMC_HOST_PROTOCOL_REVISION    0x00010002    // 1.2\r
+\r
+#define MMC_HOST_HAS_SETIOS(Host)     (Host->Revision >= MMC_HOST_PROTOCOL_REVISION && \\r
+                                       Host->SetIos != NULL)\r
+#define MMC_HOST_HAS_ISMULTIBLOCK(Host) (Host->Revision >= MMC_HOST_PROTOCOL_REVISION && \\r
+                                         Host->IsMultiBlock != NULL)\r
 \r
 extern EFI_GUID gEfiMmcHostProtocolGuid;\r
 \r