Skip to contentSkip to conversation

make UFS dev_cmd more readable

PATCH Superseded Bean Huo 2 participants 5 messages Jul 6, 2020 – Jul 7, 2020 SCSI

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Bean Huo

author
#0 lore raw

cover make UFS dev_cmd more readable

From: Bean Huo <[email protected]>

Bean Huo (2):
scsi: ufs: differentiate dev_cmd trace message
scsi: ufs: change ufshcd_comp_devman_upiu() to
ufshcd_compose_devman_upiu()

 drivers/scsi/ufs/ufshcd.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/2 scsi: ufs: differentiate dev_cmd trace message

From: Bean Huo <[email protected]>

fshcd_exec_dev_cmd() can send query request and NOP request, and it is confusing that ufshcd_add_query_upiu_trace() prints us the "query_send" string in the trace log. Change it and add NOP key message in the trace print according to the dev_cmd type.

---
 drivers/scsi/ufs/ufshcd.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/scsi/ufs/ufshcd.c +4 -2
index 59358bb75014..173deee37e26 100644
@@ -2727,7 +2727,9 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba,
 
 	hba->dev_cmd.complete = &wait;
 
-	ufshcd_add_query_upiu_trace(hba, tag, "query_send");
+	ufshcd_add_query_upiu_trace(hba, tag,
+				    cmd_type == DEV_CMD_TYPE_QUERY ?
+				    "send QUERY" : "send NOP");
 	/* Make sure descriptors are ready before ringing the doorbell */
 	wmb();
 	spin_lock_irqsave(hba->host->host_lock, flags);
@@ -2738,7 +2740,7 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba,
 	err = ufshcd_wait_for_dev_cmd(hba, lrbp, timeout);
 
 	ufshcd_add_query_upiu_trace(hba, tag,
-			err ? "query_complete_err" : "query_complete");
+			err ? "dev_cmd err" : "dev_cmd complete");
 
 out_put_tag:
 	blk_put_request(req);
Signature · 1 line
2.17.1
#2 lore raw

RE: [PATCH v1 1/2] scsi: ufs: differentiate dev_cmd trace message

Quoted 5 lines

From: Bean Huo <[email protected]>

fshcd_exec_dev_cmd() can send query request and NOP request, and it is

Typo ?

Quoted 5 lines

confusing that ufshcd_add_query_upiu_trace() prints us the "query_send" string in the trace log. Change it and add NOP key message in the trace print according to the dev_cmd type.

Our parsers already looking for those strings.
You can add stuff, but do not change anything that user-space already expects.

Thanks,
Avri

Quoted 32 lines
---
 drivers/scsi/ufs/ufshcd.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/scsi/ufs/ufshcd.c +3 -1
index 59358bb75014..173deee37e26 100644
@@ -2727,7 +2727,9 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba
 *hba,
 
        hba->dev_cmd.complete = &wait;
 
-       ufshcd_add_query_upiu_trace(hba, tag, "query_send");
+       ufshcd_add_query_upiu_trace(hba, tag,
+                                   cmd_type == DEV_CMD_TYPE_QUERY ?
+                                   "send QUERY" : "send NOP");
        /* Make sure descriptors are ready before ringing the doorbell */
        wmb();
        spin_lock_irqsave(hba->host->host_lock, flags);
drivers/scsi/ufs/ufshcd.c +1 -1
@@ -2738,7 +2740,7 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba
 *hba,
        err = ufshcd_wait_for_dev_cmd(hba, lrbp, timeout);
 
        ufshcd_add_query_upiu_trace(hba, tag,
-                       err ? "query_complete_err" : "query_complete");
+                       err ? "dev_cmd err" : "dev_cmd complete");
 
 out_put_tag:
        blk_put_request(req);

--
2.17.1

author
#3 lore raw

PATCH 2/2 scsi: ufs: change ufshcd_comp_devman_upiu() to ufshcd_compose_devman_upiu()

In reply to Bean Huo

From: Bean Huo <[email protected]>

ufshcd_comp_devman_upiu() alwasy make me confuse that it is a request completion calling function. Change it to ufshcd_compose_devman_upiu().

---
 drivers/scsi/ufs/ufshcd.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/scsi/ufs/ufshcd.c +4 -3
index 173deee37e26..96d830bb900f 100644
@@ -2368,12 +2368,13 @@ static inline void ufshcd_prepare_utp_nop_upiu(struct ufshcd_lrb *lrbp)
 }
 
 /**
- * ufshcd_comp_devman_upiu - UFS Protocol Information Unit(UPIU)
+ * ufshcd_compose_devman_upiu - UFS Protocol Information Unit(UPIU)
  *			     for Device Management Purposes
  * @hba: per adapter instance
  * @lrbp: pointer to local reference block
  */
-static int ufshcd_comp_devman_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
+static int ufshcd_compose_devman_upiu(struct ufs_hba *hba,
+				      struct ufshcd_lrb *lrbp)
 {
 	u32 upiu_flags;
 	int ret = 0;
@@ -2564,7 +2565,7 @@ static int ufshcd_compose_dev_cmd(struct ufs_hba *hba,
 	lrbp->intr_cmd = true; /* No interrupt aggregation */
 	hba->dev_cmd.type = cmd_type;
 
-	return ufshcd_comp_devman_upiu(hba, lrbp);
+	return ufshcd_compose_devman_upiu(hba, lrbp);
 }
 
 static int
Signature · 1 line
2.17.1