From: Hannes Reinecke <hare@suse.de>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
James Bottomley <james.bottomley@hansenpartnership.com>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.com>
Subject: [PATCHv2 20/26] nsp32: drop bus reset
Date: Fri, 25 Aug 2017 13:57:15 +0200 [thread overview]
Message-ID: <1503662241-127788-21-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1503662241-127788-1-git-send-email-hare@suse.de>
From: Hannes Reinecke <hare@suse.com>
bus reset is a host reset without nsp32hw_init(), and will always
return SUCCESS, thus disabling the use of host reset.
So drop bus reset in favour of host reset.
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/scsi/nsp32.c | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 53c8477..107e191 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -201,7 +201,6 @@
/* SCSI error handler */
static int nsp32_eh_abort (struct scsi_cmnd *);
-static int nsp32_eh_bus_reset (struct scsi_cmnd *);
static int nsp32_eh_host_reset(struct scsi_cmnd *);
/* generate SCSI message */
@@ -276,8 +275,7 @@
.max_sectors = 128,
.this_id = NSP32_HOST_SCSIID,
.use_clustering = DISABLE_CLUSTERING,
- .eh_abort_handler = nsp32_eh_abort,
- .eh_bus_reset_handler = nsp32_eh_bus_reset,
+ .eh_abort_handler = nsp32_eh_abort,
.eh_host_reset_handler = nsp32_eh_host_reset,
/* .highmem_io = 1, */
};
@@ -2845,24 +2843,6 @@ static int nsp32_eh_abort(struct scsi_cmnd *SCpnt)
return SUCCESS;
}
-static int nsp32_eh_bus_reset(struct scsi_cmnd *SCpnt)
-{
- nsp32_hw_data *data = (nsp32_hw_data *)SCpnt->device->host->hostdata;
- unsigned int base = SCpnt->device->host->io_port;
-
- spin_lock_irq(SCpnt->device->host->host_lock);
-
- nsp32_msg(KERN_INFO, "Bus Reset");
- nsp32_dbg(NSP32_DEBUG_BUSRESET, "SCpnt=0x%x", SCpnt);
-
- nsp32_write2(base, IRQ_CONTROL, IRQ_CONTROL_ALL_IRQ_MASK);
- nsp32_do_bus_reset(data);
- nsp32_write2(base, IRQ_CONTROL, 0);
-
- spin_unlock_irq(SCpnt->device->host->host_lock);
- return SUCCESS; /* SCSI bus reset is succeeded at any time. */
-}
-
static void nsp32_do_bus_reset(nsp32_hw_data *data)
{
unsigned int base = data->BaseAddress;
--
1.8.5.6
next prev parent reply other threads:[~2017-08-25 11:58 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-25 11:56 [PATCHv2 00/26] SCSI EH argument reshuffle part I Hannes Reinecke
2017-08-25 11:56 ` [PATCHv2 01/26] scsi: fix comment in scsi_device_set_state() Hannes Reinecke
2017-08-25 11:56 ` [PATCHv2 02/26] mptfc: Do not call fc_block_scsi_eh() on host reset Hannes Reinecke
2017-08-25 11:56 ` [PATCHv2 03/26] ibmvfc: " Hannes Reinecke
2017-08-25 11:56 ` [PATCHv2 04/26] fc_fcp: do not call fc_block_scsi_eh() from " Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 05/26] fnic: do not call host reset from command abort Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 06/26] uas: move eh_bus_reset_handler to eh_device_reset_handler Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 07/26] libsas: move bus_reset_handler() to target_reset_handler() Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 08/26] bfa: move bus reset to target reset Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 09/26] hptiop: Simplify reset handling Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 10/26] fdomain: move bus reset to host reset Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 11/26] scsi: drop bus reset for wd33c93-compatible boards Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 12/26] rtsx: drop bus reset function Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 13/26] qlogicpti: move bus reset to host reset Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 14/26] acornscsi: " Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 15/26] NCR5380: Move " Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 16/26] qlogicfas: move bus_reset to host_reset Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 17/26] imm: drop duplicate bus_reset handler Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 18/26] ppa: " Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 19/26] qedf: drop bus reset handler Hannes Reinecke
2017-08-25 11:57 ` Hannes Reinecke [this message]
2017-08-25 11:57 ` [PATCHv2 21/26] aha152x: drop host reset Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 22/26] 53c700: move bus reset to " Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 23/26] bnx2fc: remove obsolete bnx2fc_eh_host_reset() definition Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 24/26] megaraid_mbox: drop duplicate bus reset and device reset function Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 25/26] visorhba: sanitze private device data allocation Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 26/26] eata: remove 'arg_done' from eata2x_eh_host_reset() Hannes Reinecke
2017-08-25 21:22 ` [PATCHv2 00/26] SCSI EH argument reshuffle part I 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=1503662241-127788-21-git-send-email-hare@suse.de \
--to=hare@suse.de \
--cc=hare@suse.com \
--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