From: Hannes Reinecke <hare@suse.de>
To: Christoph Hellwig <hch@lst.de>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
James Bottomley <james.bottomley@hansenpartnership.com>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>
Subject: [PATCH 04/17] aha152x: look for stuck command when resetting device
Date: Mon, 16 Oct 2023 11:24:17 +0200 [thread overview]
Message-ID: <20231016092430.55557-5-hare@suse.de> (raw)
In-Reply-To: <20231016092430.55557-1-hare@suse.de>
The LLDD needs a command to send the reset with, so look at the
list of outstanding commands to get one.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/aha152x.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index 055adb349b0e..936c9f5c6f23 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -1070,24 +1070,28 @@ static int aha152x_abort(struct scsi_cmnd *SCpnt)
*/
static int aha152x_device_reset(struct scsi_cmnd * SCpnt)
{
- struct Scsi_Host *shpnt = SCpnt->device->host;
+ struct scsi_device *sdev = SCpnt->device;
+ struct Scsi_Host *shpnt = sdev->host;
DECLARE_COMPLETION(done);
int ret, issued, disconnected;
- unsigned char old_cmd_len = SCpnt->cmd_len;
+ unsigned char old_cmd_len;
unsigned long flags;
unsigned long timeleft;
- if(CURRENT_SC==SCpnt) {
- scmd_printk(KERN_ERR, SCpnt, "cannot reset current device\n");
- return FAILED;
- }
-
DO_LOCK(flags);
- issued = remove_SC(&ISSUE_SC, SCpnt) == NULL;
- disconnected = issued && remove_SC(&DISCONNECTED_SC, SCpnt);
+ /* Look for the stuck command */
+ SCpnt = remove_lun_SC(&ISSUE_SC, sdev->id, sdev->lun);
+ if (SCpnt)
+ issued = 1;
+ else
+ SCpnt = remove_lun_SC(&DISCONNECTED_SC, sdev->id, sdev->lun);
+ if (!issued && SCpnt)
+ disconnected = 1;
DO_UNLOCK(flags);
-
- SCpnt->cmd_len = 0;
+ if (!SCpnt)
+ return FAILED;
+ old_cmd_len = SCpnt->cmd_len;
+ SCpnt->cmd_len = 0;
aha152x_internal_queue(SCpnt, &done, resetting);
--
2.35.3
next prev parent reply other threads:[~2023-10-16 9:24 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-16 9:24 [PATCHv6 00/17] scsi: EH rework prep patches, part 2 Hannes Reinecke
2023-10-16 9:24 ` [PATCH 01/17] pmcraid: add missing scsi_device_put() in pmcraid_eh_target_reset_handler() Hannes Reinecke
2023-10-16 13:29 ` Christoph Hellwig
2023-10-16 13:37 ` Hannes Reinecke
2023-10-16 9:24 ` [PATCH 02/17] zfcp: do not wait for rports to become unblocked after host reset Hannes Reinecke
2023-10-16 9:24 ` [PATCH 03/17] bfa: Do not use scsi command to signal TMF status Hannes Reinecke
2023-10-16 13:35 ` Christoph Hellwig
2023-10-16 9:24 ` Hannes Reinecke [this message]
2023-10-16 13:35 ` [PATCH 04/17] aha152x: look for stuck command when resetting device Christoph Hellwig
2023-10-16 9:24 ` [PATCH 05/17] a1000u2w: do not rely on the command for inia100_device_reset() Hannes Reinecke
2023-10-16 13:36 ` Christoph Hellwig
2023-10-16 9:24 ` [PATCH 06/17] fas216: Rework device reset to not rely on SCSI command pointer Hannes Reinecke
2023-10-16 9:24 ` [PATCH 07/17] xen-scsifront: add scsi device as argument to scsifront_do_request() Hannes Reinecke
2023-10-16 9:24 ` [PATCH 08/17] xen-scsifront: rework scsifront_action_handler() Hannes Reinecke
2023-10-16 13:36 ` Christoph Hellwig
2023-10-16 9:24 ` [PATCH 09/17] libiscsi: use cls_session as argument for target and session reset Hannes Reinecke
2023-10-19 20:02 ` Mike Christie
2023-10-20 5:53 ` Hannes Reinecke
2023-10-20 16:55 ` michael.christie
2023-10-16 9:24 ` [PATCH 10/17] scsi_transport_iscsi: use session as argument for iscsi_block_scsi_eh() Hannes Reinecke
2023-10-16 9:24 ` [PATCH 11/17] snic: reserve tag for TMF Hannes Reinecke
2023-10-16 13:37 ` Christoph Hellwig
2023-10-16 9:24 ` [PATCH 12/17] snic: allocate device reset command Hannes Reinecke
2023-10-16 13:38 ` Christoph Hellwig
2023-10-16 14:58 ` Hannes Reinecke
2023-10-16 9:24 ` [PATCH 13/17] snic: Use scsi_host_busy_iter() to traverse commands Hannes Reinecke
2023-10-16 9:24 ` [PATCH 14/17] fnic: allocate device reset command on the fly Hannes Reinecke
2023-10-17 6:37 ` Christoph Hellwig
2023-10-16 9:24 ` [PATCH 15/17] fnic: use fc_block_rport() correctly Hannes Reinecke
2023-10-16 9:24 ` [PATCH 16/17] csiostor: use separate TMF command Hannes Reinecke
2023-10-17 6:37 ` Christoph Hellwig
2023-10-16 9:24 ` [PATCH 17/17] dc395x: Remove 'scmd' parameter from doing_srb_done() Hannes Reinecke
2023-10-17 6:38 ` Christoph Hellwig
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=20231016092430.55557-5-hare@suse.de \
--to=hare@suse.de \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.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