Message ID | 20200706091905.12885-2-huobean@gmail.com (mailing list archive) |
---|---|
State | Changes Requested |
Headers | show |
Series | make UFS dev_cmd more readable | expand |
> > From: Bean Huo <beanhuo@micron.com> > > fshcd_exec_dev_cmd() can send query request and NOP request, and it is Typo ? > 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. > > Signed-off-by: Bean Huo <beanhuo@micron.com> Our parsers already looking for those strings. You can add stuff, but do not change anything that user-space already expects. Thanks, Avri > --- > drivers/scsi/ufs/ufshcd.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index 59358bb75014..173deee37e26 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -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); > -- > 2.17.1
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 59358bb75014..173deee37e26 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -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);