From patchwork Sun Dec 6 16:42:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 11954165 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3A96C1B0E3 for ; Sun, 6 Dec 2020 16:43:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CE1EC2310E for ; Sun, 6 Dec 2020 16:43:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727474AbgLFQnZ (ORCPT ); Sun, 6 Dec 2020 11:43:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726440AbgLFQnY (ORCPT ); Sun, 6 Dec 2020 11:43:24 -0500 Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11BA5C0613D1; Sun, 6 Dec 2020 08:42:44 -0800 (PST) Received: by mail-ed1-x543.google.com with SMTP id c7so11125702edv.6; Sun, 06 Dec 2020 08:42:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fv94yoCjxFMyCGDFrOP0JP4fAzP6SX6Q5aROorrzmI4=; b=GQgG2/43YsN3y3crytPcgsnYCX4/d6xwY86yz7zklXbRfqRRFlsf6E/5n2jySE/0Rb ME1SyFzkn+KOT1nsGKiEXLso20VMUf7m3ZfzXC2OfKuB5f5Hrs5qXAP6E2Y/g4Hlm59e DdIGzM4wLLU5uhwpI3UQgyKFGVFZIHH/HoLKY0Btlrodimkw5Exrqgl/pxyMigv8QY5o RypZBlJDHWOd7D3TtfZzCmK8R1vNF2Sic1eh/pDxBM6fVGn4SEPNmewTWGFSi3AZem/f CYMhOb0BDOqrsSqvUYAUhQQfQ3vHGEtUttTtnwmmVBEXLRFpowgXZrHQPlVr5n17+Epg l0+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fv94yoCjxFMyCGDFrOP0JP4fAzP6SX6Q5aROorrzmI4=; b=nMxej7lu7QRQI3JJfFgD3TbzOtZXNXaaHlpw10FI+2zEO/mrZKf98sC+AonWnvguQw WTaReGVSjJKi9B9GLwnWf3P5RG6LPwUCClbw0db4x6Rn95PivybxSX0VjzC+Njsuw1HH X7+QHiLdiachA/Q/EdI7irnQnq9kvey17sguhbPbDPV0iGQlwvMhXVrRPt9/5wt2bQKd kcTrURfGK23dkYdZwHFlErmshrbbXdC1fZVaLoWf8DafrUu0KrIPd/jtpkQeC6hsgefS D19ubBeKeaIqwFtvc4ntrl/+5MFyykyOBA5ag3PE08zOaL62u64u/pmg3dS7sxTpo/Ay Cl0Q== X-Gm-Message-State: AOAM5309cGS1EsM5whlifCKaXYhtHc6uM/UpUglevOwwoIz/FZdyXRZd OJ9m5R4ZbHJQ6Yr3xXCkBSg= X-Google-Smtp-Source: ABdhPJzQfLNqPOIJZOFJ1eClTxLxyhskNyUmskXv+EavJq+/Glb+Sbq9wQ6DquW+e6ZZOVCq/B09Ig== X-Received: by 2002:a50:fd88:: with SMTP id o8mr16699498edt.386.1607272962793; Sun, 06 Dec 2020 08:42:42 -0800 (PST) Received: from localhost.localdomain (ip5f5bfce9.dynamic.kabel-deutschland.de. [95.91.252.233]) by smtp.gmail.com with ESMTPSA id e19sm9157524edr.61.2020.12.06.08.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 08:42:42 -0800 (PST) From: Bean Huo To: alim.akhtar@samsung.com, avri.altman@wdc.com, asutoshd@codeaurora.org, jejb@linux.ibm.com, martin.petersen@oracle.com, stanley.chu@mediatek.com, beanhuo@micron.com, bvanassche@acm.org, tomas.winkler@intel.com, cang@codeaurora.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, rostedt@goodmis.org Subject: [PATCH v1 1/3] scsi: ufs: Distinguish between query REQ and query RSP in query trace Date: Sun, 6 Dec 2020 17:42:24 +0100 Message-Id: <20201206164226.6595-2-huobean@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201206164226.6595-1-huobean@gmail.com> References: <20201206164226.6595-1-huobean@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Bean Huo Currently, in the query completion trace print, since we use hba->lrb[tag].ucd_req_ptr and didn't differentiate UPIU between request and response, thus header and transaction-specific field in UPIU printed by query trace are identical. This is not very practical. As below: query_send: HDR:16 00 00 0e 00 81 00 00 00 00 00 00, CDB:06 0e 03 00 00 00 00 00 00 00 00 00 00 00 00 00 query_complete: HDR:16 00 00 0e 00 81 00 00 00 00 00 00, CDB:06 0e 03 00 00 00 00 00 00 00 00 00 00 00 00 00 For the failure analysis, we want to understand the real response reported by the UFS device, however, the current query trace tells us nothing. After this patch, the query trace on the query_send, and the above a pair of query_send and query_complete will be: query_send: HDR:16 00 00 0e 00 81 00 00 00 00 00 00, CDB:06 0e 03 00 00 00 00 00 00 00 00 00 00 00 00 00 ufshcd_upiu: HDR:36 00 00 0e 00 81 00 00 00 00 00 00, CDB:06 0e 03 00 00 00 00 00 00 00 00 01 00 00 00 00 Signed-off-by: Bean Huo Acked-by: Avri Altman --- drivers/scsi/ufs/ufshcd.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index ceb562accc39..e10de94adb3f 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -321,9 +321,15 @@ static void ufshcd_add_cmd_upiu_trace(struct ufs_hba *hba, unsigned int tag, static void ufshcd_add_query_upiu_trace(struct ufs_hba *hba, unsigned int tag, const char *str) { - struct utp_upiu_req *rq = hba->lrb[tag].ucd_req_ptr; + struct utp_upiu_req *rq_rsp; + + if (!strcmp("query_send", str)) + rq_rsp = hba->lrb[tag].ucd_req_ptr; + else + rq_rsp = (struct utp_upiu_req *)hba->lrb[tag].ucd_rsp_ptr; - trace_ufshcd_upiu(dev_name(hba->dev), str, &rq->header, &rq->qr); + trace_ufshcd_upiu(dev_name(hba->dev), str, &rq_rsp->header, + &rq_rsp->qr); } static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag, From patchwork Sun Dec 6 16:42:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 11954167 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF132C1B087 for ; Sun, 6 Dec 2020 16:43:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B55132336E for ; Sun, 6 Dec 2020 16:43:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727599AbgLFQn0 (ORCPT ); Sun, 6 Dec 2020 11:43:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726440AbgLFQn0 (ORCPT ); Sun, 6 Dec 2020 11:43:26 -0500 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26957C0613D2; Sun, 6 Dec 2020 08:42:45 -0800 (PST) Received: by mail-ej1-x642.google.com with SMTP id n26so16001875eju.6; Sun, 06 Dec 2020 08:42:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=q3yNP+sFnB3A5+UyZ6nIR07gloyNzZH21j8nTX4SFvo=; b=EZIyyKm+fEhUMIH2fZq3L+gMqH9O+1TbeM7rU6DXZdppU2LV5YIp7wBLMlPdsWfiH1 xiL4irCJQi6K97+K4z66FCjLpd9LtaK0WpIy5C0/0inlfd4EeDIHS1UIH8bM5o9NB1B3 uQxT+3+S93aGgng7lRx72WS9zPNnaj0UjXjOIJNp3G47kJWbIqN/V5z+vbiM+ThGG9B3 y/lxxpWc4vF8FpwOi1kHyQMrJgmC/R57wA/CsvNusfsGlwFa0K0UaocPxwOYr1QbAoPA bPjuxg5Vy+G1q+wq1amBGnPHtSiU742Tc5r0Cz4y0y6kPZF8mr6dim3lh91jVC1AANxn xKyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=q3yNP+sFnB3A5+UyZ6nIR07gloyNzZH21j8nTX4SFvo=; b=IRhCBO9aF66ztDNhFt53RZe2ulnDkXG5LVUO0tDD4+Laj9T5HMD7OaVHClVyzLxf4r 9aB/dsuyFxY3kqXOaHydk12gIJ4FC6Xx+gjkkw9t+nwvx6w9y2uEbH16KuvQR54E0o11 xB7O8kDMvOLPGqgsfTx6Nvv3CrBatFMzTMBATimbB207cOYZ7tCc0dy0E28xnCjAgkNn Rrn0R3eVbUhXDxkdSF/dtQWHOBR6RFjN7v2k0u7dYtjAZXP5QGGoz4R4ZWwiI8p/PSWn vZeERQNIuR768NJINYlN4bXYWM8g2KQAhczqLIi8vWJqHwUYcZp6Yopbb7msYLTsxJaL UZ5Q== X-Gm-Message-State: AOAM533+M/VHGxNOmOHgIqp0cBrXLlhW5iBcwkD10rEyMzBDATDDw1Jx BWWVxryEQYYDyDnOoC0Osgs= X-Google-Smtp-Source: ABdhPJxbPMwGkTUBIBcRKmEMKyHT74JWhDkkSrfU5nv5JqXVBNM1Gq73C+Ux2hf335QUa1Q5PtAf0g== X-Received: by 2002:a17:906:3a84:: with SMTP id y4mr15741502ejd.425.1607272963923; Sun, 06 Dec 2020 08:42:43 -0800 (PST) Received: from localhost.localdomain (ip5f5bfce9.dynamic.kabel-deutschland.de. [95.91.252.233]) by smtp.gmail.com with ESMTPSA id e19sm9157524edr.61.2020.12.06.08.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 08:42:43 -0800 (PST) From: Bean Huo To: alim.akhtar@samsung.com, avri.altman@wdc.com, asutoshd@codeaurora.org, jejb@linux.ibm.com, martin.petersen@oracle.com, stanley.chu@mediatek.com, beanhuo@micron.com, bvanassche@acm.org, tomas.winkler@intel.com, cang@codeaurora.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, rostedt@goodmis.org Subject: [PATCH v1 2/3] scsi: ufs: Distinguish between TM request UPIU and response UPIU in TM UPIU trace Date: Sun, 6 Dec 2020 17:42:25 +0100 Message-Id: <20201206164226.6595-3-huobean@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201206164226.6595-1-huobean@gmail.com> References: <20201206164226.6595-1-huobean@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Bean Huo Distinguish between TM request UPIU and response UPIU in TM UPIU trace, for the TM response, let TM UPIU trace print its TM response UPIU. Signed-off-by: Bean Huo Acked-by: Avri Altman --- drivers/scsi/ufs/ufshcd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index e10de94adb3f..29d7240a61bf 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -338,8 +338,12 @@ static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag, int off = (int)tag - hba->nutrs; struct utp_task_req_desc *descp = &hba->utmrdl_base_addr[off]; - trace_ufshcd_upiu(dev_name(hba->dev), str, &descp->req_header, - &descp->input_param1); + if (!strcmp("tm_send", str)) + trace_ufshcd_upiu(dev_name(hba->dev), str, &descp->req_header, + &descp->input_param1); + else + trace_ufshcd_upiu(dev_name(hba->dev), str, &descp->rsp_header, + &descp->output_param1); } static void ufshcd_add_uic_command_trace(struct ufs_hba *hba, From patchwork Sun Dec 6 16:42:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bean Huo X-Patchwork-Id: 11954169 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2893C1B0D8 for ; Sun, 6 Dec 2020 16:43:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C5E52310E for ; Sun, 6 Dec 2020 16:43:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727696AbgLFQn2 (ORCPT ); Sun, 6 Dec 2020 11:43:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727617AbgLFQn0 (ORCPT ); Sun, 6 Dec 2020 11:43:26 -0500 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 591CBC0613D3; Sun, 6 Dec 2020 08:42:46 -0800 (PST) Received: by mail-ed1-x52c.google.com with SMTP id c7so11125778edv.6; Sun, 06 Dec 2020 08:42:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XnNK85yQIqDf9XSgYG256xv+0HGL3Yjy71sTBa+LrtE=; b=ZmYXWaMfV7ng5TLBwop9hTTh6CZP4NC8fuCYrzeiKZU8WTs4fj1zjGty3upop0PieK 0EZYA+MDWxgtPLpFxxTK5gzUu0UHh9l7Qv1j0gUAMZPup9m6ffpMZ2pBm5hDuQNQH36n 1oyuNQgIl0o34dFX9+XGBO37K9fTGziu0Tw4iR+qlS7PFumX+nRuxEFSmvg3qVwJAqc6 9gUk0YSth/m65FeTqYJ66ppJqK94up3t0aCRxP0C+uHz9cdPRvfLpHjH6xoZDDM2R2HZ 4YsSLUAY/2ERlLfaooHjUokO/fOpXecb4ldvgMf+VW4lMXRXBS2wdo/g8E9uIt+a/2l0 0ixQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XnNK85yQIqDf9XSgYG256xv+0HGL3Yjy71sTBa+LrtE=; b=MZzRxvy2J4rx96NSje6UXAdoX4VuA/mwYIhYrf/2Duuayv1iynIsrqx2p4ecZJOVkM FqC7oOwwtJZ1WwWOOqv1bg0DlGPOZjkXRMbF9seRVaqZIPRCh8j2PpBh1QmIp1tILW7/ SlP2S2Ip1Iql7walB5+3wz7kyPVAhxJ+dONgflmWbSywYpk9qPL0uN6cfRJsLfySqiWb UvBSOZ3MmYk5NJmY4NGu28fZ0UKWXVmoOBLqa8hCUhJqNbWYqZOXEy+acIIRWZwbBWNK c3DkxnHJoJ3x7JBL/qrkKCT3UvTeWXioF7PHaVzvlyNOMMoVcQZuN6aIL/4PDpptmMbc K+Gg== X-Gm-Message-State: AOAM531YYyUINWsgafoDts0LZ7oNqyBiCLhdOG7afN+Z0MqTKldq5txR Vq5EdQpT8cJwmffXcXU/bsg= X-Google-Smtp-Source: ABdhPJwOETKzaM7KMpytJ205AVMHQUCCEjcqRbrI1EqqZS28SUbKN8Hl4NuVddTUZOyeueYaJ/ud4w== X-Received: by 2002:aa7:c652:: with SMTP id z18mr15916104edr.60.1607272965040; Sun, 06 Dec 2020 08:42:45 -0800 (PST) Received: from localhost.localdomain (ip5f5bfce9.dynamic.kabel-deutschland.de. [95.91.252.233]) by smtp.gmail.com with ESMTPSA id e19sm9157524edr.61.2020.12.06.08.42.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 08:42:44 -0800 (PST) From: Bean Huo To: alim.akhtar@samsung.com, avri.altman@wdc.com, asutoshd@codeaurora.org, jejb@linux.ibm.com, martin.petersen@oracle.com, stanley.chu@mediatek.com, beanhuo@micron.com, bvanassche@acm.org, tomas.winkler@intel.com, cang@codeaurora.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, rostedt@goodmis.org Subject: [PATCH v1 3/3] scsi: ufs: Make UPIU trace easier differentiate among CDB, OSF, and TM Date: Sun, 6 Dec 2020 17:42:26 +0100 Message-Id: <20201206164226.6595-4-huobean@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201206164226.6595-1-huobean@gmail.com> References: <20201206164226.6595-1-huobean@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Bean Huo Transaction Specific Fields (TSF) in the UPIU package could be CDB (SCSI/UFS Command Descriptor Block), OSF (Opcode Specific Field), and TM I/O parameter (Task Management Input/Output Parameter). But, currently, we take all of these as CDB in the UPIU trace. Thus makes user confuse among CDB, OSF, and TM message. So fix it with this patch. Signed-off-by: Bean Huo --- drivers/scsi/ufs/ufshcd.c | 9 +++++---- include/trace/events/ufs.h | 10 +++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 29d7240a61bf..5b2219e44743 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -315,7 +315,8 @@ 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; - trace_ufshcd_upiu(dev_name(hba->dev), str, &rq->header, &rq->sc.cdb); + trace_ufshcd_upiu(dev_name(hba->dev), str, &rq->header, &rq->sc.cdb, + "CDB"); } static void ufshcd_add_query_upiu_trace(struct ufs_hba *hba, unsigned int tag, @@ -329,7 +330,7 @@ static void ufshcd_add_query_upiu_trace(struct ufs_hba *hba, unsigned int tag, rq_rsp = (struct utp_upiu_req *)hba->lrb[tag].ucd_rsp_ptr; trace_ufshcd_upiu(dev_name(hba->dev), str, &rq_rsp->header, - &rq_rsp->qr); + &rq_rsp->qr, "OSF"); } static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag, @@ -340,10 +341,10 @@ static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag, if (!strcmp("tm_send", str)) trace_ufshcd_upiu(dev_name(hba->dev), str, &descp->req_header, - &descp->input_param1); + &descp->input_param1, "TM_INPUT"); else trace_ufshcd_upiu(dev_name(hba->dev), str, &descp->rsp_header, - &descp->output_param1); + &descp->output_param1, "TM_OUTPUT"); } static void ufshcd_add_uic_command_trace(struct ufs_hba *hba, diff --git a/include/trace/events/ufs.h b/include/trace/events/ufs.h index 0bd54a184391..68e8e97a9b47 100644 --- a/include/trace/events/ufs.h +++ b/include/trace/events/ufs.h @@ -295,15 +295,17 @@ TRACE_EVENT(ufshcd_uic_command, ); TRACE_EVENT(ufshcd_upiu, - TP_PROTO(const char *dev_name, const char *str, void *hdr, void *tsf), + TP_PROTO(const char *dev_name, const char *str, void *hdr, void *tsf, + const char *tsf_type), - TP_ARGS(dev_name, str, hdr, tsf), + TP_ARGS(dev_name, str, hdr, tsf, tsf_type), TP_STRUCT__entry( __string(dev_name, dev_name) __string(str, str) __array(unsigned char, hdr, 12) __array(unsigned char, tsf, 16) + __string(tsf_type, tsf_type) ), TP_fast_assign( @@ -311,12 +313,14 @@ TRACE_EVENT(ufshcd_upiu, __assign_str(str, str); memcpy(__entry->hdr, hdr, sizeof(__entry->hdr)); memcpy(__entry->tsf, tsf, sizeof(__entry->tsf)); + __assign_str(tsf_type, tsf_type); ), TP_printk( - "%s: %s: HDR:%s, CDB:%s", + "%s: %s: HDR:%s, %s:%s", __get_str(str), __get_str(dev_name), __print_hex(__entry->hdr, sizeof(__entry->hdr)), + __get_str(tsf_type), __print_hex(__entry->tsf, sizeof(__entry->tsf)) ) );