diff mbox

[V5,02/13] mmc: core: Add members to mmc_request and mmc_data for CQE's

Message ID 1502366898-23691-3-git-send-email-adrian.hunter@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Adrian Hunter Aug. 10, 2017, 12:08 p.m. UTC
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>
---
 include/linux/mmc/core.h   | 13 +++++++++++--
 include/trace/events/mmc.h | 36 +++++++++++++++++++++++-------------
 2 files changed, 34 insertions(+), 15 deletions(-)

Comments

Linus Walleij Aug. 20, 2017, 11:29 a.m. UTC | #1
On Thu, Aug 10, 2017 at 2:08 PM, Adrian Hunter <adrian.hunter@intel.com> wrote:

> 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>

> +       int                     tag;

Is this consistent with the block layer idea of "tag"?

I am asking because I get confused.

I thought the block layers idea of a "tag" was some metadata
associated with a request. Not that I am a block layer expert.
Why can't we just name this "task_id" if that is what it is in
Linux terms? Does the specification call it "tag"?

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Adrian Hunter Aug. 21, 2017, 9:26 a.m. UTC | #2
On 20/08/17 14:29, Linus Walleij wrote:
> On Thu, Aug 10, 2017 at 2:08 PM, Adrian Hunter <adrian.hunter@intel.com> wrote:
> 
>> 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>
> 
>> +       int                     tag;
> 
> Is this consistent with the block layer idea of "tag"?

It is named "tag" because it is the block layer tag.

> 
> I am asking because I get confused.
> 
> I thought the block layers idea of a "tag" was some metadata
> associated with a request. Not that I am a block layer expert.

The block layer tag is a unique number to identify the task to the hardware
queue.  It is typically a number from 0 up to queue depth - 1.

> Why can't we just name this "task_id" if that is what it is in
> Linux terms? Does the specification call it "tag"?

The eMMC specification calls it "task id" but the block layer calls it
"tag".  I went with "tag" to be easier for block layer people to understand.
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ulf Hansson Aug. 22, 2017, 11:12 a.m. UTC | #3
On 10 August 2017 at 14:08, Adrian Hunter <adrian.hunter@intel.com> wrote:
> 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>

Thanks, applied for next!

Kind regards
Uffe

> ---
>  include/linux/mmc/core.h   | 13 +++++++++++--
>  include/trace/events/mmc.h | 36 +++++++++++++++++++++++-------------
>  2 files changed, 34 insertions(+), 15 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;
> diff --git a/include/trace/events/mmc.h b/include/trace/events/mmc.h
> index a72f9b94c80b..f30a99ac65b6 100644
> --- a/include/trace/events/mmc.h
> +++ b/include/trace/events/mmc.h
> @@ -29,8 +29,10 @@
>                 __field(unsigned int,           sbc_flags)
>                 __field(unsigned int,           sbc_retries)
>                 __field(unsigned int,           blocks)
> +               __field(unsigned int,           blk_addr)
>                 __field(unsigned int,           blksz)
>                 __field(unsigned int,           data_flags)
> +               __field(int,                    tag)
>                 __field(unsigned int,           can_retune)
>                 __field(unsigned int,           doing_retune)
>                 __field(unsigned int,           retune_now)
> @@ -42,10 +44,10 @@
>         ),
>
>         TP_fast_assign(
> -               __entry->cmd_opcode = mrq->cmd->opcode;
> -               __entry->cmd_arg = mrq->cmd->arg;
> -               __entry->cmd_flags = mrq->cmd->flags;
> -               __entry->cmd_retries = mrq->cmd->retries;
> +               __entry->cmd_opcode = mrq->cmd ? mrq->cmd->opcode : 0;
> +               __entry->cmd_arg = mrq->cmd ? mrq->cmd->arg : 0;
> +               __entry->cmd_flags = mrq->cmd ? mrq->cmd->flags : 0;
> +               __entry->cmd_retries = mrq->cmd ? mrq->cmd->retries : 0;
>                 __entry->stop_opcode = mrq->stop ? mrq->stop->opcode : 0;
>                 __entry->stop_arg = mrq->stop ? mrq->stop->arg : 0;
>                 __entry->stop_flags = mrq->stop ? mrq->stop->flags : 0;
> @@ -56,7 +58,9 @@
>                 __entry->sbc_retries = mrq->sbc ? mrq->sbc->retries : 0;
>                 __entry->blksz = mrq->data ? mrq->data->blksz : 0;
>                 __entry->blocks = mrq->data ? mrq->data->blocks : 0;
> +               __entry->blk_addr = mrq->data ? mrq->data->blk_addr : 0;
>                 __entry->data_flags = mrq->data ? mrq->data->flags : 0;
> +               __entry->tag = mrq->tag;
>                 __entry->can_retune = host->can_retune;
>                 __entry->doing_retune = host->doing_retune;
>                 __entry->retune_now = host->retune_now;
> @@ -71,8 +75,8 @@
>                   "cmd_opcode=%u cmd_arg=0x%x cmd_flags=0x%x cmd_retries=%u "
>                   "stop_opcode=%u stop_arg=0x%x stop_flags=0x%x stop_retries=%u "
>                   "sbc_opcode=%u sbc_arg=0x%x sbc_flags=0x%x sbc_retires=%u "
> -                 "blocks=%u block_size=%u data_flags=0x%x "
> -                 "can_retune=%u doing_retune=%u retune_now=%u "
> +                 "blocks=%u block_size=%u blk_addr=%u data_flags=0x%x "
> +                 "tag=%d can_retune=%u doing_retune=%u retune_now=%u "
>                   "need_retune=%d hold_retune=%d retune_period=%u",
>                   __get_str(name), __entry->mrq,
>                   __entry->cmd_opcode, __entry->cmd_arg,
> @@ -81,7 +85,8 @@
>                   __entry->stop_flags, __entry->stop_retries,
>                   __entry->sbc_opcode, __entry->sbc_arg,
>                   __entry->sbc_flags, __entry->sbc_retries,
> -                 __entry->blocks, __entry->blksz, __entry->data_flags,
> +                 __entry->blocks, __entry->blk_addr,
> +                 __entry->blksz, __entry->data_flags, __entry->tag,
>                   __entry->can_retune, __entry->doing_retune,
>                   __entry->retune_now, __entry->need_retune,
>                   __entry->hold_retune, __entry->retune_period)
> @@ -108,6 +113,7 @@
>                 __field(unsigned int,           sbc_retries)
>                 __field(unsigned int,           bytes_xfered)
>                 __field(int,                    data_err)
> +               __field(int,                    tag)
>                 __field(unsigned int,           can_retune)
>                 __field(unsigned int,           doing_retune)
>                 __field(unsigned int,           retune_now)
> @@ -119,10 +125,13 @@
>         ),
>
>         TP_fast_assign(
> -               __entry->cmd_opcode = mrq->cmd->opcode;
> -               __entry->cmd_err = mrq->cmd->error;
> -               memcpy(__entry->cmd_resp, mrq->cmd->resp, 4);
> -               __entry->cmd_retries = mrq->cmd->retries;
> +               __entry->cmd_opcode = mrq->cmd ? mrq->cmd->opcode : 0;
> +               __entry->cmd_err = mrq->cmd ? mrq->cmd->error : 0;
> +               __entry->cmd_resp[0] = mrq->cmd ? mrq->cmd->resp[0] : 0;
> +               __entry->cmd_resp[1] = mrq->cmd ? mrq->cmd->resp[1] : 0;
> +               __entry->cmd_resp[2] = mrq->cmd ? mrq->cmd->resp[2] : 0;
> +               __entry->cmd_resp[3] = mrq->cmd ? mrq->cmd->resp[3] : 0;
> +               __entry->cmd_retries = mrq->cmd ? mrq->cmd->retries : 0;
>                 __entry->stop_opcode = mrq->stop ? mrq->stop->opcode : 0;
>                 __entry->stop_err = mrq->stop ? mrq->stop->error : 0;
>                 __entry->stop_resp[0] = mrq->stop ? mrq->stop->resp[0] : 0;
> @@ -139,6 +148,7 @@
>                 __entry->sbc_retries = mrq->sbc ? mrq->sbc->retries : 0;
>                 __entry->bytes_xfered = mrq->data ? mrq->data->bytes_xfered : 0;
>                 __entry->data_err = mrq->data ? mrq->data->error : 0;
> +               __entry->tag = mrq->tag;
>                 __entry->can_retune = host->can_retune;
>                 __entry->doing_retune = host->doing_retune;
>                 __entry->retune_now = host->retune_now;
> @@ -154,7 +164,7 @@
>                   "cmd_retries=%u stop_opcode=%u stop_err=%d "
>                   "stop_resp=0x%x 0x%x 0x%x 0x%x stop_retries=%u "
>                   "sbc_opcode=%u sbc_err=%d sbc_resp=0x%x 0x%x 0x%x 0x%x "
> -                 "sbc_retries=%u bytes_xfered=%u data_err=%d "
> +                 "sbc_retries=%u bytes_xfered=%u data_err=%d tag=%d "
>                   "can_retune=%u doing_retune=%u retune_now=%u need_retune=%d "
>                   "hold_retune=%d retune_period=%u",
>                   __get_str(name), __entry->mrq,
> @@ -170,7 +180,7 @@
>                   __entry->sbc_resp[0], __entry->sbc_resp[1],
>                   __entry->sbc_resp[2], __entry->sbc_resp[3],
>                   __entry->sbc_retries,
> -                 __entry->bytes_xfered, __entry->data_err,
> +                 __entry->bytes_xfered, __entry->data_err, __entry->tag,
>                   __entry->can_retune, __entry->doing_retune,
>                   __entry->retune_now, __entry->need_retune,
>                   __entry->hold_retune, __entry->retune_period)
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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;
diff --git a/include/trace/events/mmc.h b/include/trace/events/mmc.h
index a72f9b94c80b..f30a99ac65b6 100644
--- a/include/trace/events/mmc.h
+++ b/include/trace/events/mmc.h
@@ -29,8 +29,10 @@ 
 		__field(unsigned int,		sbc_flags)
 		__field(unsigned int,		sbc_retries)
 		__field(unsigned int,		blocks)
+		__field(unsigned int,		blk_addr)
 		__field(unsigned int,		blksz)
 		__field(unsigned int,		data_flags)
+		__field(int,			tag)
 		__field(unsigned int,		can_retune)
 		__field(unsigned int,		doing_retune)
 		__field(unsigned int,		retune_now)
@@ -42,10 +44,10 @@ 
 	),
 
 	TP_fast_assign(
-		__entry->cmd_opcode = mrq->cmd->opcode;
-		__entry->cmd_arg = mrq->cmd->arg;
-		__entry->cmd_flags = mrq->cmd->flags;
-		__entry->cmd_retries = mrq->cmd->retries;
+		__entry->cmd_opcode = mrq->cmd ? mrq->cmd->opcode : 0;
+		__entry->cmd_arg = mrq->cmd ? mrq->cmd->arg : 0;
+		__entry->cmd_flags = mrq->cmd ? mrq->cmd->flags : 0;
+		__entry->cmd_retries = mrq->cmd ? mrq->cmd->retries : 0;
 		__entry->stop_opcode = mrq->stop ? mrq->stop->opcode : 0;
 		__entry->stop_arg = mrq->stop ? mrq->stop->arg : 0;
 		__entry->stop_flags = mrq->stop ? mrq->stop->flags : 0;
@@ -56,7 +58,9 @@ 
 		__entry->sbc_retries = mrq->sbc ? mrq->sbc->retries : 0;
 		__entry->blksz = mrq->data ? mrq->data->blksz : 0;
 		__entry->blocks = mrq->data ? mrq->data->blocks : 0;
+		__entry->blk_addr = mrq->data ? mrq->data->blk_addr : 0;
 		__entry->data_flags = mrq->data ? mrq->data->flags : 0;
+		__entry->tag = mrq->tag;
 		__entry->can_retune = host->can_retune;
 		__entry->doing_retune = host->doing_retune;
 		__entry->retune_now = host->retune_now;
@@ -71,8 +75,8 @@ 
 		  "cmd_opcode=%u cmd_arg=0x%x cmd_flags=0x%x cmd_retries=%u "
 		  "stop_opcode=%u stop_arg=0x%x stop_flags=0x%x stop_retries=%u "
 		  "sbc_opcode=%u sbc_arg=0x%x sbc_flags=0x%x sbc_retires=%u "
-		  "blocks=%u block_size=%u data_flags=0x%x "
-		  "can_retune=%u doing_retune=%u retune_now=%u "
+		  "blocks=%u block_size=%u blk_addr=%u data_flags=0x%x "
+		  "tag=%d can_retune=%u doing_retune=%u retune_now=%u "
 		  "need_retune=%d hold_retune=%d retune_period=%u",
 		  __get_str(name), __entry->mrq,
 		  __entry->cmd_opcode, __entry->cmd_arg,
@@ -81,7 +85,8 @@ 
 		  __entry->stop_flags, __entry->stop_retries,
 		  __entry->sbc_opcode, __entry->sbc_arg,
 		  __entry->sbc_flags, __entry->sbc_retries,
-		  __entry->blocks, __entry->blksz, __entry->data_flags,
+		  __entry->blocks, __entry->blk_addr,
+		  __entry->blksz, __entry->data_flags, __entry->tag,
 		  __entry->can_retune, __entry->doing_retune,
 		  __entry->retune_now, __entry->need_retune,
 		  __entry->hold_retune, __entry->retune_period)
@@ -108,6 +113,7 @@ 
 		__field(unsigned int,		sbc_retries)
 		__field(unsigned int,		bytes_xfered)
 		__field(int,			data_err)
+		__field(int,			tag)
 		__field(unsigned int,		can_retune)
 		__field(unsigned int,		doing_retune)
 		__field(unsigned int,		retune_now)
@@ -119,10 +125,13 @@ 
 	),
 
 	TP_fast_assign(
-		__entry->cmd_opcode = mrq->cmd->opcode;
-		__entry->cmd_err = mrq->cmd->error;
-		memcpy(__entry->cmd_resp, mrq->cmd->resp, 4);
-		__entry->cmd_retries = mrq->cmd->retries;
+		__entry->cmd_opcode = mrq->cmd ? mrq->cmd->opcode : 0;
+		__entry->cmd_err = mrq->cmd ? mrq->cmd->error : 0;
+		__entry->cmd_resp[0] = mrq->cmd ? mrq->cmd->resp[0] : 0;
+		__entry->cmd_resp[1] = mrq->cmd ? mrq->cmd->resp[1] : 0;
+		__entry->cmd_resp[2] = mrq->cmd ? mrq->cmd->resp[2] : 0;
+		__entry->cmd_resp[3] = mrq->cmd ? mrq->cmd->resp[3] : 0;
+		__entry->cmd_retries = mrq->cmd ? mrq->cmd->retries : 0;
 		__entry->stop_opcode = mrq->stop ? mrq->stop->opcode : 0;
 		__entry->stop_err = mrq->stop ? mrq->stop->error : 0;
 		__entry->stop_resp[0] = mrq->stop ? mrq->stop->resp[0] : 0;
@@ -139,6 +148,7 @@ 
 		__entry->sbc_retries = mrq->sbc ? mrq->sbc->retries : 0;
 		__entry->bytes_xfered = mrq->data ? mrq->data->bytes_xfered : 0;
 		__entry->data_err = mrq->data ? mrq->data->error : 0;
+		__entry->tag = mrq->tag;
 		__entry->can_retune = host->can_retune;
 		__entry->doing_retune = host->doing_retune;
 		__entry->retune_now = host->retune_now;
@@ -154,7 +164,7 @@ 
 		  "cmd_retries=%u stop_opcode=%u stop_err=%d "
 		  "stop_resp=0x%x 0x%x 0x%x 0x%x stop_retries=%u "
 		  "sbc_opcode=%u sbc_err=%d sbc_resp=0x%x 0x%x 0x%x 0x%x "
-		  "sbc_retries=%u bytes_xfered=%u data_err=%d "
+		  "sbc_retries=%u bytes_xfered=%u data_err=%d tag=%d "
 		  "can_retune=%u doing_retune=%u retune_now=%u need_retune=%d "
 		  "hold_retune=%d retune_period=%u",
 		  __get_str(name), __entry->mrq,
@@ -170,7 +180,7 @@ 
 		  __entry->sbc_resp[0], __entry->sbc_resp[1],
 		  __entry->sbc_resp[2], __entry->sbc_resp[3],
 		  __entry->sbc_retries,
-		  __entry->bytes_xfered, __entry->data_err,
+		  __entry->bytes_xfered, __entry->data_err, __entry->tag,
 		  __entry->can_retune, __entry->doing_retune,
 		  __entry->retune_now, __entry->need_retune,
 		  __entry->hold_retune, __entry->retune_period)