From 5ceb0f7be3b68a37884e6bbb32f1eff021f589d1 Mon Sep 17 00:00:00 2001 From: Bean Huo Date: Tue, 5 Jan 2021 12:34:43 +0100 Subject: [PATCH] UPSTREAM: scsi: ufs: Don't call trace_ufshcd_upiu() in case trace poit is disabled Don't call trace_ufshcd_upiu() in case ufshba_upiu trace poit is not enabled. Link: https://lore.kernel.org/r/20210105113446.16027-4-huobean@gmail.com Acked-by: Steven Rostedt (VMware) Signed-off-by: Bean Huo Signed-off-by: Martin K. Petersen (cherry picked from commit 9d5095e74c830f0251a913b9147ee091ad228b56) Bug: 204438323 Change-Id: Ia205c0aadd5c830eed89f3c69ec1da45ee3f070e Signed-off-by: Bart Van Assche --- drivers/scsi/ufs/ufshcd.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index b69b676c8cc4..cbc462589923 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -313,6 +313,9 @@ static void ufshcd_add_cmd_upiu_trace(struct ufs_hba *hba, unsigned int tag, { struct utp_upiu_req *rq = hba->lrb[tag].ucd_req_ptr; + if (!trace_ufshcd_upiu_enabled()) + return; + trace_ufshcd_upiu(dev_name(hba->dev), str_t, &rq->header, &rq->sc.cdb); } @@ -321,6 +324,9 @@ static void ufshcd_add_query_upiu_trace(struct ufs_hba *hba, unsigned int tag, { struct utp_upiu_req *rq = hba->lrb[tag].ucd_req_ptr; + if (!trace_ufshcd_upiu_enabled()) + return; + trace_ufshcd_upiu(dev_name(hba->dev), str_t, &rq->header, &rq->qr); } @@ -341,6 +347,9 @@ static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag, { struct utp_task_req_desc *descp = &hba->utmrdl_base_addr[tag]; + if (!trace_ufshcd_upiu_enabled()) + return; + trace_android_vh_ufs_send_tm_command(hba, tag, str_t_to_str[str_t]); trace_ufshcd_upiu(dev_name(hba->dev), str_t, &descp->req_header, &descp->input_param1);