From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from 003.mia.mailroute.net (003.mia.mailroute.net [199.89.3.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D96D1324B25 for ; Fri, 12 Sep 2025 18:26:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.6 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757701585; cv=none; b=IzfYPPcNEndSi16FW2M8//BVPDLOdG01PNdkAPIMKRCV0a5kKuMn51dvq8seoAgpTDZ7JI1EKpYJHrlmTXkF2OBY+awsFOKZm0YSHhR/sEpV95e/arakCIuoVEF+uxhCpf0XsLV5kTn4dYUrvTw+ZMD113bijgTqwlOCrfOFcjI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757701585; c=relaxed/simple; bh=/D+38pryNqSt14cdcE8nxrx8FSzQlBLkmJNPiCmsBaA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Gb77uHklkOxfxPpA+fgEv+6P9MwWEcYmXiNDLTovD8Gq8SoYB0xB6Z2NxolnCAHtIVTLZAF5kAbHy1btiDemxNWzK/PGJgkVnaD0o/r2DobMgLZA+ASSK2TFfcfXQ6q/Rev8dJbvU77uSxV2b9rwUSy7F8GeOV7MVIim3nTD8ZU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=acm.org; spf=pass smtp.mailfrom=acm.org; dkim=pass (2048-bit key) header.d=acm.org header.i=@acm.org header.b=SxHM/WBJ; arc=none smtp.client-ip=199.89.3.6 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=acm.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=acm.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=acm.org header.i=@acm.org header.b="SxHM/WBJ" Received: from localhost (localhost [127.0.0.1]) by 003.mia.mailroute.net (Postfix) with ESMTP id 4cNjYW1GXqzlgqVJ; Fri, 12 Sep 2025 18:26:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=acm.org; h= content-transfer-encoding:mime-version:references:in-reply-to :x-mailer:message-id:date:date:subject:subject:from:from :received:received; s=mr01; t=1757701581; x=1760293582; bh=wKco0 F6PfGzxkZ0dEvq6sgzqN35RPvpGy+6uKh2C6KU=; b=SxHM/WBJI/FyG178NsRMg vzYNr7WM71H9AXFxzEJJUvrQCGJRQtECQjBcVqm9oaku12JlZ01V1YPJsbYyFsrJ +KTFLBqJWZpFofQdYPXpkEuw99yKT9zDGUKJYcxzfiAWc1G5qnCYI9/PunrZQzSO AnOzG1zcRvHZJ+oQvLyP0K9l1JXsQhU5BLp9956gG0ZzBPLhMm4oQ0FzDV7o8kSm /hoIY4+92h3cM0Na2rBlE/IgfI948QzkldeMApygB3+3TLhEMjT6bJVYndWFTNqr eJEBdqIxDdDxf6vtT1wHRg7zBuUlMkZI1nxR0SZ5wFwmW5zFsWDsurPbv33CxWii w== X-Virus-Scanned: by MailRoute Received: from 003.mia.mailroute.net ([127.0.0.1]) by localhost (003.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id fNSbXr6hy7CO; Fri, 12 Sep 2025 18:26:21 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.204.82]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: bvanassche@acm.org) by 003.mia.mailroute.net (Postfix) with ESMTPSA id 4cNjYN01GZzltKGN; Fri, 12 Sep 2025 18:26:15 +0000 (UTC) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Peter Wang , "James E.J. Bottomley" , Matthias Brugger , AngeloGioacchino Del Regno , Avri Altman , Bean Huo Subject: [PATCH v4 13/29] ufs: core: Only call ufshcd_should_inform_monitor() for SCSI commands Date: Fri, 12 Sep 2025 11:21:34 -0700 Message-ID: <20250912182340.3487688-14-bvanassche@acm.org> X-Mailer: git-send-email 2.51.0.384.g4c02a37b29-goog In-Reply-To: <20250912182340.3487688-1-bvanassche@acm.org> References: <20250912182340.3487688-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable ufshcd_should_inform_monitor() only returns 'true' for SCSI commands. Instead of checking inside ufshcd_should_inform_monitor() whether its second argument represents a SCSI command, only call this function for SCSI commands. This patch prepares for removing the lrbp->cmd member. Reviewed-by: Peter Wang Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index eb2c6fe5e7ea..bd57baa15e8d 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -2289,12 +2289,13 @@ static inline int ufshcd_monitor_opcode2dir(u8 op= code) return -EINVAL; } =20 +/* Must only be called for SCSI commands. */ static inline bool ufshcd_should_inform_monitor(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) { const struct ufs_hba_monitor *m =3D &hba->monitor; =20 - return (m->enabled && lrbp && lrbp->cmd && + return (m->enabled && (!m->chunk_size || m->chunk_size =3D=3D lrbp->cmd->sdb.length) && ktime_before(hba->monitor.enabled_ts, lrbp->issue_time_stamp)); } @@ -2364,9 +2365,9 @@ static inline void ufshcd_send_command(struct ufs_h= ba *hba, if (lrbp->cmd) { ufshcd_add_command_trace(hba, lrbp->cmd, UFS_CMD_SEND); ufshcd_clk_scaling_start_busy(hba); + if (unlikely(ufshcd_should_inform_monitor(hba, lrbp))) + ufshcd_start_monitor(hba, lrbp); } - if (unlikely(ufshcd_should_inform_monitor(hba, lrbp))) - ufshcd_start_monitor(hba, lrbp); =20 if (hba->mcq_enabled) { int utrd_size =3D sizeof(struct utp_transfer_req_desc);