mmc: core: Add members to mmc_request and mmc_data for CQE's

Most of the information needed to issue requests to a CQE is already in
struct mmc_request and struct mmc_data. Add data block address, some flags,
and the task id (tag), and allow for cmd being NULL which it is for CQE
tasks.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

1 files changed, 11 insertions, 2 deletions

diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index a0c63ea28796..bf1788a224e6 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -122,11 +122,18 @@ struct mmc_data {
         unsigned int            timeout_clks;   /* data timeout (in clocks) */
         unsigned int            blksz;          /* data block size */
         unsigned int            blocks;         /* number of blocks */
+        unsigned int            blk_addr;       /* block address */
         int                     error;          /* data error */
         unsigned int            flags;
 
-#define MMC_DATA_WRITE  (1 << 8)
-#define MMC_DATA_READ   (1 << 9)
+#define MMC_DATA_WRITE          BIT(8)
+#define MMC_DATA_READ           BIT(9)
+/* Extra flags used by CQE */
+#define MMC_DATA_QBR            BIT(10)         /* CQE queue barrier*/
+#define MMC_DATA_PRIO           BIT(11)         /* CQE high priority */
+#define MMC_DATA_REL_WR         BIT(12)         /* Reliable write */
+#define MMC_DATA_DAT_TAG        BIT(13)         /* Tag request */
+#define MMC_DATA_FORCED_PRG     BIT(14)         /* Forced programming */
 
         unsigned int            bytes_xfered;
 
@@ -153,6 +160,8 @@ struct mmc_request {
 
         /* Allow other commands during this ongoing data transfer or busy wait */
         bool                    cap_cmd_during_tfr;
+
+        int                     tag;
 };
 
 struct mmc_card;