From patchwork Sun Aug 5 12:46:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Sharabi X-Patchwork-Id: 10556133 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2B44114E2 for ; Sun, 5 Aug 2018 12:47:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AE66298AA for ; Sun, 5 Aug 2018 12:47:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0EA93298B7; Sun, 5 Aug 2018 12:47:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56EEB298AA for ; Sun, 5 Aug 2018 12:47:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726165AbeHEOv2 (ORCPT ); Sun, 5 Aug 2018 10:51:28 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:4917 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726100AbeHEOv2 (ORCPT ); Sun, 5 Aug 2018 10:51:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=sandisk.com; i=@sandisk.com; q=dns/txt; s=dkim.sandisk.com; t=1533473220; x=1565009220; h=from:to:cc:subject:date:message-id; bh=m8CuS8sEAiiAz8+zkPS3GBoGjKbB2ygoFxNboyYS7OU=; b=rSI/QBLPYfm6u1Jef93/GCmG+zKPvWuczXSSKia1Z1CDQ3enphqmkhS0 16TevMBCWEKkK3B4CGQNeffBFxSH2vETFNVYv+PW2gNFlEY5upi4OzSQ5 B9HGQ1qV5KeM+doM1cNBjeqjd0MOwTxtqHjFuBETsQAk6s/OKPiQJsn/r 4clRARLIESSXOPCY7uOX+gozFYbKjXSeWoo8zPdiOSEjdg7+/3oavXA2M w6+ZycArChVFyQ+37cW3MWntSxfCTxPT83qZ/I+9PxsFpFH2AlL6g6zY1 lKDo41IUlYQhGZCfM2xf4PQ4Z85uxDOn6+lEgbtRwChE5jhouZ0LiDmJF A==; X-IronPort-AV: E=Sophos;i="5.51,447,1526313600"; d="scan'208";a="190448441" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 05 Aug 2018 20:47:00 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP; 05 Aug 2018 05:35:18 -0700 Received: from ile419070.sdcorp.global.sandisk.com ([10.0.230.165]) by uls-op-cesaip01.wdc.com with ESMTP; 05 Aug 2018 05:46:58 -0700 From: Ohad Sharabi To: stanislav.nijnikov@wdc.com, avri.altman@wdc.com, alex.lemberg@wdc.com, jejb@linux.vnet.ibm.com, martin.petersen@oracle.com, gregkh@linuxfoundation.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Ohad Sharabi Subject: [PATCH] scsi: ufs: remove unnecessary query(DM) UPIU trace Date: Sun, 5 Aug 2018 15:46:54 +0300 Message-Id: <1533473214-12698-1-git-send-email-ohad.sharabi@sandisk.com> X-Mailer: git-send-email 1.9.1 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch removes redundant trace that occurs when sending Device Management(DM) request (fix behavior in patch https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git/commit/?id=6667e6d91c88a788d5ab1b1e999d245473e84a9) Since the function send_command is called also for DM request, UPIU trace for DM request is called twice- one identified as query_* the other as send/complete. Signed-off-by: Ohad Sharabi --- drivers/scsi/ufs/ufshcd.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 397081d..33e6dd0 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -321,18 +321,19 @@ static void ufshcd_add_command_trace(struct ufs_hba *hba, sector_t lba = -1; u8 opcode = 0; u32 intr, doorbell; - struct ufshcd_lrb *lrbp; + struct ufshcd_lrb *lrbp = &hba->lrb[tag]; int transfer_len = -1; - /* trace UPIU also */ - ufshcd_add_cmd_upiu_trace(hba, tag, str); - - if (!trace_ufshcd_command_enabled()) + if (!trace_ufshcd_command_enabled()) { + /* trace UPIU W/O tracing command */ + if (lrbp->cmd) + ufshcd_add_cmd_upiu_trace(hba, tag, str); return; - - lrbp = &hba->lrb[tag]; + } if (lrbp->cmd) { /* data phase exists */ + /* trace UPIU also */ + ufshcd_add_cmd_upiu_trace(hba, tag, str); opcode = (u8)(*lrbp->cmd->cmnd); if ((opcode == READ_10) || (opcode == WRITE_10)) { /*