From: Can Guo <cang@codeaurora.org>
To: Bart Van Assche <bvanassche@acm.org>
Cc: "Martin K . Petersen" <martin.petersen@oracle.com>,
"James E . J . Bottomley" <jejb@linux.vnet.ibm.com>,
linux-scsi@vger.kernel.org, Bean Huo <beanhuo@micron.com>,
Avri Altman <avri.altman@wdc.com>,
Stanley Chu <stanley.chu@mediatek.com>,
Tomas Winkler <tomas.winkler@intel.com>
Subject: Re: [PATCH 6/6] ufs: Remove the SCSI timeout handler
Date: Wed, 25 Dec 2019 19:02:49 +0800 [thread overview]
Message-ID: <6d0c26d0e83c0372973889314eca004d@codeaurora.org> (raw)
In-Reply-To: <20191224220248.30138-7-bvanassche@acm.org>
On 2019-12-25 06:02, Bart Van Assche wrote:
> The UFS SCSI timeout handler was needed to compensate that
> ufshcd_queuecommand() could return SCSI_MLQUEUE_HOST_BUSY for a long
> time. Commit a276c19e3e98 ("scsi: ufs: Avoid busy-waiting by
> eliminating
> tag conflicts") fixed this so the timeout handler is no longer
> necessary.
>
> See also commit f550c65b543b ("scsi: ufs: implement scsi host timeout
> handler").
>
> Cc: Bean Huo <beanhuo@micron.com>
> Cc: Can Guo <cang@codeaurora.org>
> Cc: Avri Altman <avri.altman@wdc.com>
> Cc: Stanley Chu <stanley.chu@mediatek.com>
> Cc: Tomas Winkler <tomas.winkler@intel.com>
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> ---
> drivers/scsi/ufs/ufshcd.c | 36 ------------------------------------
> 1 file changed, 36 deletions(-)
>
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index edcc137c436b..763e41286a4b 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -7092,41 +7092,6 @@ static void ufshcd_async_scan(void *data,
> async_cookie_t cookie)
> ufshcd_probe_hba(hba);
> }
>
> -static enum blk_eh_timer_return ufshcd_eh_timed_out(struct scsi_cmnd
> *scmd)
> -{
> - unsigned long flags;
> - struct Scsi_Host *host;
> - struct ufs_hba *hba;
> - int index;
> - bool found = false;
> -
> - if (!scmd || !scmd->device || !scmd->device->host)
> - return BLK_EH_DONE;
> -
> - host = scmd->device->host;
> - hba = shost_priv(host);
> - if (!hba)
> - return BLK_EH_DONE;
> -
> - spin_lock_irqsave(host->host_lock, flags);
> -
> - for_each_set_bit(index, &hba->outstanding_reqs, hba->nutrs) {
> - if (hba->lrb[index].cmd == scmd) {
> - found = true;
> - break;
> - }
> - }
> -
> - spin_unlock_irqrestore(host->host_lock, flags);
> -
> - /*
> - * Bypass SCSI error handling and reset the block layer timer if this
> - * SCSI command was not actually dispatched to UFS driver, otherwise
> - * let SCSI layer handle the error as usual.
> - */
> - return found ? BLK_EH_DONE : BLK_EH_RESET_TIMER;
> -}
> -
> static const struct attribute_group *ufshcd_driver_groups[] = {
> &ufs_sysfs_unit_descriptor_group,
> &ufs_sysfs_lun_attributes_group,
> @@ -7145,7 +7110,6 @@ static struct scsi_host_template
> ufshcd_driver_template = {
> .eh_abort_handler = ufshcd_abort,
> .eh_device_reset_handler = ufshcd_eh_device_reset_handler,
> .eh_host_reset_handler = ufshcd_eh_host_reset_handler,
> - .eh_timed_out = ufshcd_eh_timed_out,
> .this_id = -1,
> .sg_tablesize = SG_ALL,
> .cmd_per_lun = UFSHCD_CMD_PER_LUN,
Reviewed-by: Can Guo <cang@codeaurora.org>
next prev parent reply other threads:[~2019-12-25 11:02 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-24 22:02 [PATCH 0/6] Six UFS patches Bart Van Assche
2019-12-24 22:02 ` [PATCH 1/6] ufs: Fix indentation in ufshcd_query_attr_retry() Bart Van Assche
2019-12-25 7:16 ` Stanley Chu
2019-12-25 8:17 ` Can Guo
2019-12-27 1:13 ` Alim Akhtar
2019-12-24 22:02 ` [PATCH 2/6] ufs: Make ufshcd_add_command_trace() easier to read Bart Van Assche
2019-12-25 7:16 ` Stanley Chu
2019-12-25 8:17 ` Can Guo
2019-12-27 1:17 ` Alim Akhtar
2019-12-24 22:02 ` [PATCH 3/6] ufs: Make ufshcd_prepare_utp_scsi_cmd_upiu() " Bart Van Assche
2019-12-25 7:17 ` Stanley Chu
2019-12-25 8:18 ` Can Guo
2019-12-24 22:02 ` [PATCH 4/6] ufs: Fix a race condition in the tracing code Bart Van Assche
2019-12-25 10:59 ` Can Guo
2019-12-26 17:35 ` Bart Van Assche
2019-12-27 5:50 ` Can Guo
2019-12-27 1:21 ` Alim Akhtar
2019-12-24 22:02 ` [PATCH 5/6] ufs: Remove superfluous memory barriers Bart Van Assche
2019-12-25 10:31 ` Can Guo
2019-12-26 17:36 ` Bart Van Assche
2019-12-24 22:02 ` [PATCH 6/6] ufs: Remove the SCSI timeout handler Bart Van Assche
2019-12-25 11:02 ` Can Guo [this message]
2019-12-27 1:24 ` Alim Akhtar
2020-05-28 9:47 ` Can Guo
2020-05-28 16:12 ` Bart Van Assche
2020-05-29 1:39 ` Can Guo
2020-05-29 3:56 ` Bart Van Assche
2020-01-03 2:58 ` [PATCH 0/6] Six UFS patches Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6d0c26d0e83c0372973889314eca004d@codeaurora.org \
--to=cang@codeaurora.org \
--cc=avri.altman@wdc.com \
--cc=beanhuo@micron.com \
--cc=bvanassche@acm.org \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=stanley.chu@mediatek.com \
--cc=tomas.winkler@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).