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 AB9922FF676 for ; Thu, 30 Oct 2025 19:41:52 +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=1761853314; cv=none; b=U7I4EK7z8Tl+Xa+ocTjs2ofSLOfgG+ozoEMMFAwHxAtE2aIDQYDFx+IFkFypl02DDz4ugBdRiEOW3/BOTnC0IeE+fguYPB+QAOicnHf/UQ+R4c3CZGXVc+hFwV1ZjBlt+uTNny3LM0thD6aCdzgb1GjRozGwmHyscFv6YD1wbGg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761853314; c=relaxed/simple; bh=ESL3ux7/8g0sWVy+YGGg18dxyBNpOzfKR3xc3VT8Sdc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OCFlf49KKiVBb9nF743xOl9Dsm7XCzBUhOCpUhFlOB3iRXZE7J6HxOQYDiL8ZinxIxUTATDyh6ZaT+42TCh3/ZImbIp1g9AJM8thMXPRqEwFdoIFT3RRCXZiQMwwpTDGiocRj2W6Yu3MvqgfqM2Q1Lmdo1EtNEUgigNY6vf/Q8c= 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=gmtnXYHp; 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="gmtnXYHp" Received: from localhost (localhost [127.0.0.1]) by 003.mia.mailroute.net (Postfix) with ESMTP id 4cyDyR5GnYzlssyp; Thu, 30 Oct 2025 19:41:51 +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=1761853309; x=1764445310; bh=/V3fB hxHSBvFhCn/bmVoa3kzwpTC30jg0PtLUnUMSfM=; b=gmtnXYHpvbLSPx0FtLH/2 XbEQmj+xDvLmyyayBNgKRDDRqmNPLkFXj23/GuWaT474ReJR06TgXwh4Cn2451nn nftNHB1L673eqKfnhfZl++odiSnYMC3qxlDgzrXWrJnZHSofPUcDeDF0P2pn91t7 d8wXpfm/rhnbPggIlSjZCnVu0R9RBq3r8F8FG14CDtO/0IRh8EByj1hqOV2n2f3k q2d1JrKm0/nrMNKuJ0tOb4JQSjYjDzkLwTACCbiO/XRVx9W+RWAVbtfFjGalnRHp KENTgsWm62yHc/bV+qhaK8meCyi23NBQEyzF5qML38HjLgfNqkzPpnWY9g+kZLQL A== 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 fSWJNEh91j1R; Thu, 30 Oct 2025 19:41:49 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.180.219]) (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 4cyDyH5CStzlvkT6; Thu, 30 Oct 2025 19:41:42 +0000 (UTC) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Avri Altman , "James E.J. Bottomley" , Peter Wang , Bean Huo , "Bao D. Nguyen" , Adrian Hunter Subject: [PATCH v7 27/28] ufs: core: Move code out of ufshcd_wait_for_dev_cmd() Date: Thu, 30 Oct 2025 12:36:26 -0700 Message-ID: <20251030193720.871635-28-bvanassche@acm.org> X-Mailer: git-send-email 2.51.1.930.gacf6e81ea2-goog In-Reply-To: <20251030193720.871635-1-bvanassche@acm.org> References: <20251030193720.871635-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 The ufshcd_dev_cmd_completion() call is useful for some but not for all ufshcd_wait_for_dev_cmd() callers. Hence, remove the ufshcd_dev_cmd_completion() call from ufshcd_wait_for_dev_cmd() and move it past the ufshcd_issue_dev_cmd() calls where appropriate. This makes it easier to detect timeout errors for UPIU frames submitted through the BSG interface. Reviewed-by: Avri Altman Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index e9ae27f0c25a..b69e73d74f68 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -3264,8 +3264,6 @@ static int ufshcd_wait_for_dev_cmd(struct ufs_hba *= hba, =20 if (likely(time_left)) { err =3D ufshcd_get_tr_ocs(lrbp, NULL); - if (!err) - err =3D ufshcd_dev_cmd_completion(hba, lrbp); } else { err =3D -ETIMEDOUT; dev_dbg(hba->dev, "%s: dev_cmd request timedout, tag %d\n", @@ -3375,6 +3373,7 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba, { const u32 tag =3D hba->reserved_slot; struct scsi_cmnd *cmd =3D ufshcd_tag_to_cmd(hba, tag); + struct ufshcd_lrb *lrbp =3D scsi_cmd_priv(cmd); int err; =20 /* Protects use of hba->reserved_slot. */ @@ -3384,7 +3383,11 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba= , if (unlikely(err)) return err; =20 - return ufshcd_issue_dev_cmd(hba, cmd, tag, timeout); + err =3D ufshcd_issue_dev_cmd(hba, cmd, tag, timeout); + if (err) + return err; + + return ufshcd_dev_cmd_completion(hba, lrbp); } =20 /** @@ -7411,12 +7414,9 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs= _hba *hba, =20 memset(lrbp->ucd_rsp_ptr, 0, sizeof(struct utp_upiu_rsp)); =20 - /* - * ignore the returning value here - ufshcd_check_query_response is - * bound to fail since dev_cmd.query and dev_cmd.type were left empty. - * read the response directly ignoring all errors. - */ - ufshcd_issue_dev_cmd(hba, cmd, tag, dev_cmd_timeout); + err =3D ufshcd_issue_dev_cmd(hba, cmd, tag, dev_cmd_timeout); + if (err) + return err; =20 /* just copy the upiu response as it is */ memcpy(rsp_upiu, lrbp->ucd_rsp_ptr, sizeof(*rsp_upiu)); @@ -7562,7 +7562,10 @@ int ufshcd_advanced_rpmb_req_handler(struct ufs_hb= a *hba, struct utp_upiu_req *r memset(lrbp->ucd_rsp_ptr, 0, sizeof(struct utp_upiu_rsp)); =20 err =3D ufshcd_issue_dev_cmd(hba, cmd, tag, ADVANCED_RPMB_REQ_TIMEOUT); + if (err) + return err; =20 + err =3D ufshcd_dev_cmd_completion(hba, lrbp); if (!err) { /* Just copy the upiu response as it is */ memcpy(rsp_upiu, lrbp->ucd_rsp_ptr, sizeof(*rsp_upiu));