Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1284721
| From | Finn Thain <fthain@telegraphics.com.au> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 62/72] ncr5380: Implement new eh_bus_reset_handler |
| Date | 2015-12-06 04:50 +0100 |
| Message-ID | <qCyuK-1Aw-21@gated-at.bofh.it> (permalink) |
| References | <qCyuJ-1Aw-1@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
NCR5380.c lacks a sane eh_bus_reset_handler. The atari_NCR5380.c code is
much better but it should not throw out the issue queue (that would be
a host reset) and it neglects to set the result code for commands that it
throws out. Fix these bugs and keep the two core drivers in sync.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
---
drivers/scsi/NCR5380.c | 50 ++++++++++++++++++++++++++++++++++++++++++-
drivers/scsi/atari_NCR5380.c | 39 +++++++++++++++++++--------------
2 files changed, 72 insertions(+), 17 deletions(-)
Index: linux/drivers/scsi/atari_NCR5380.c
===================================================================
--- linux.orig/drivers/scsi/atari_NCR5380.c 2015-12-06 12:31:07.000000000 +1100
+++ linux/drivers/scsi/atari_NCR5380.c 2015-12-06 12:31:08.000000000 +1100
@@ -2689,11 +2689,12 @@ static int NCR5380_bus_reset(struct scsi
struct NCR5380_hostdata *hostdata = shost_priv(instance);
int i;
unsigned long flags;
+ struct NCR5380_cmd *ncmd;
spin_lock_irqsave(&hostdata->lock, flags);
#if (NDEBUG & NDEBUG_ANY)
- scmd_printk(KERN_INFO, cmd, "performing bus reset\n");
+ scmd_printk(KERN_INFO, cmd, __func__);
#endif
NCR5380_dprint(NDEBUG_ANY, instance);
NCR5380_dprint_phase(NDEBUG_ANY, instance);
@@ -2713,27 +2714,32 @@ static int NCR5380_bus_reset(struct scsi
hostdata->selecting = NULL;
- if (hostdata->connected)
- dsprintk(NDEBUG_ABORT, instance, "reset aborted a connected command\n");
- hostdata->connected = NULL;
+ list_for_each_entry(ncmd, &hostdata->disconnected, list) {
+ struct scsi_cmnd *cmd = NCR5380_to_scmd(ncmd);
+
+ set_host_byte(cmd, DID_RESET);
+ cmd->scsi_done(cmd);
+ }
+
+ list_for_each_entry(ncmd, &hostdata->autosense, list) {
+ struct scsi_cmnd *cmd = NCR5380_to_scmd(ncmd);
+
+ set_host_byte(cmd, DID_RESET);
+ cmd->scsi_done(cmd);
+ }
+
+ if (hostdata->connected) {
+ set_host_byte(hostdata->connected, DID_RESET);
+ complete_cmd(instance, hostdata->connected);
+ hostdata->connected = NULL;
+ }
if (hostdata->sensing) {
+ set_host_byte(hostdata->connected, DID_RESET);
complete_cmd(instance, hostdata->sensing);
hostdata->sensing = NULL;
}
- if (!list_empty(&hostdata->autosense))
- dsprintk(NDEBUG_ABORT, instance, "reset aborted autosense list\n");
- INIT_LIST_HEAD(&hostdata->autosense);
-
- if (!list_empty(&hostdata->unissued))
- dsprintk(NDEBUG_ABORT, instance, "reset aborted unissued list\n");
- INIT_LIST_HEAD(&hostdata->unissued);
-
- if (!list_empty(&hostdata->disconnected))
- dsprintk(NDEBUG_ABORT, instance, "reset aborted disconnected list\n");
- INIT_LIST_HEAD(&hostdata->disconnected);
-
#ifdef SUPPORT_TAGS
free_all_tags(hostdata);
#endif
@@ -2743,6 +2749,7 @@ static int NCR5380_bus_reset(struct scsi
hostdata->dma_len = 0;
#endif
+ queue_work(hostdata->work_q, &hostdata->main_task);
maybe_release_dma_irq(instance);
spin_unlock_irqrestore(&hostdata->lock, flags);
Index: linux/drivers/scsi/NCR5380.c
===================================================================
--- linux.orig/drivers/scsi/NCR5380.c 2015-12-06 12:31:06.000000000 +1100
+++ linux/drivers/scsi/NCR5380.c 2015-12-06 12:31:08.000000000 +1100
@@ -2477,18 +2477,66 @@ static int NCR5380_bus_reset(struct scsi
{
struct Scsi_Host *instance = cmd->device->host;
struct NCR5380_hostdata *hostdata = shost_priv(instance);
+ int i;
unsigned long flags;
+ struct NCR5380_cmd *ncmd;
spin_lock_irqsave(&hostdata->lock, flags);
#if (NDEBUG & NDEBUG_ANY)
- scmd_printk(KERN_INFO, cmd, "performing bus reset\n");
+ scmd_printk(KERN_INFO, cmd, __func__);
#endif
NCR5380_dprint(NDEBUG_ANY, instance);
NCR5380_dprint_phase(NDEBUG_ANY, instance);
do_reset(instance);
+ /* reset NCR registers */
+ NCR5380_write(MODE_REG, MR_BASE);
+ NCR5380_write(TARGET_COMMAND_REG, 0);
+ NCR5380_write(SELECT_ENABLE_REG, 0);
+
+ /* After the reset, there are no more connected or disconnected commands
+ * and no busy units; so clear the low-level status here to avoid
+ * conflicts when the mid-level code tries to wake up the affected
+ * commands!
+ */
+
+ hostdata->selecting = NULL;
+
+ list_for_each_entry(ncmd, &hostdata->disconnected, list) {
+ struct scsi_cmnd *cmd = NCR5380_to_scmd(ncmd);
+
+ set_host_byte(cmd, DID_RESET);
+ cmd->scsi_done(cmd);
+ }
+
+ list_for_each_entry(ncmd, &hostdata->autosense, list) {
+ struct scsi_cmnd *cmd = NCR5380_to_scmd(ncmd);
+
+ set_host_byte(cmd, DID_RESET);
+ cmd->scsi_done(cmd);
+ }
+
+ if (hostdata->connected) {
+ set_host_byte(hostdata->connected, DID_RESET);
+ complete_cmd(instance, hostdata->connected);
+ hostdata->connected = NULL;
+ }
+
+ if (hostdata->sensing) {
+ set_host_byte(hostdata->connected, DID_RESET);
+ complete_cmd(instance, hostdata->sensing);
+ hostdata->sensing = NULL;
+ }
+
+ for (i = 0; i < 8; ++i)
+ hostdata->busy[i] = 0;
+#ifdef REAL_DMA
+ hostdata->dma_len = 0;
+#endif
+
+ queue_work(hostdata->work_q, &hostdata->main_task);
spin_unlock_irqrestore(&hostdata->lock, flags);
return SUCCESS;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 00/72] More fixes, cleanup and modernization for NCR5380 drivers Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 66/72] ncr5380: Fix soft lockups Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 44/72] ncr5380: Fix off-by-one bug in extended_msg[] bounds check Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 57/72] ncr5380: Use standard list data structure Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 69/72] ncr5380: Merge changes from atari_NCR5380.c Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 72/72] ncr5380: Fix pseudo DMA transfers on 53C400 Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 58/72] ncr5380: Refactor command completion Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 67/72] ncr5380: Cleanup comments Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 59/72] ncr5380: Fix autosense bugs Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 62/72] ncr5380: Implement new eh_bus_reset_handler Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 64/72] atari_NCR5380: Eliminate HOSTNO macro Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 63/72] atari_NCR5380: Remove HOSTNO macro from printk() and seq_printf() calls Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 60/72] ncr5380: Implement new eh_abort_handler Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 71/72] ncr5380: Cleanup whitespace and parentheses Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 65/72] atari_scsi, sun3_scsi: Remove global Scsi_Host pointer Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 70/72] atari_NCR5380: Merge changes from NCR5380.c Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 61/72] ncr5380: Fix EH during arbitration and selection Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 04:50 +0100
[PATCH v2 08/72] ncr5380: Move NCR53C400-specific code Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 48/72] atari_NCR5380: Fix queue_size limit Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 47/72] ncr5380: Fix and cleanup scsi_host_template initializers Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 55/72] ncr5380: Remove LIST and REMOVE macros Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 32/72] ncr5380: Fix bus phase in do_abort() Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 31/72] ncr5380: Fix !REQ timeout in do_abort() Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 30/72] ncr5380: Add missing break after case MESSAGE_REJECT Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 33/72] atari_NCR5380: Set do_abort() timeouts Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 41/72] ncr5380: Replace redundant flags with FLAG_NO_DMA_FIXUP Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 54/72] ncr5380: Use dsprintk() for queue debugging Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 38/72] ncr5380: Remove UNSAFE macro Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 53/72] ncr5380: Use shost_priv helper Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 34/72] atari_NCR5380: Use arbitration timeout Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 39/72] ncr5380: Standardize interrupt handling Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 37/72] ncr5380: Standardize work queueing algorithm Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 51/72] ncr5380: Remove command list debug code Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 06/72] ncr5380: Remove NCR5380_instance_name macro Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 52/72] ncr5380: Remove H_NO macro and introduce dsprintk Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 43/72] ncr5380: Standardize reselection handling Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 42/72] ncr5380: Replace READ_OVERRUNS macro with FLAG_NO_DMA_FIXUPS Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 45/72] ncr5380: Cleanup #include directives Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 46/72] ncr5380: Fix NDEBUG_NO_DATAOUT flag Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 49/72] ncr5380: Remove redundant ICR_ARBITRATION_LOST test and eliminate FLAG_DTC3181E Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 26/72] ncr5380: Fix NCR5380_transfer_pio() result Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 36/72] ncr5380: Use work_struct instead of delayed_work Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 35/72] ncr5380: Dont wait for BUS FREE after disconnect Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 28/72] ncr5380: Drop DEF_SCSI_QCMD macro Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 56/72] ncr5380: Remove redundant volatile qualifiers Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 29/72] ncr5380: Remove references to linked commands Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 40/72] ncr5380: Introduce NCR5380_poll_politely2 Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 25/72] ncr5380: Rework disconnect versus poll logic Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 50/72] ncr5380: Change instance->host_lock to hostdata->lock Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:00 +0100
[PATCH v2 14/72] ncr5380: Use return instead of goto in NCR5380_select() Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 01/72] atari_scsi: Fix SCSI host ID setting Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 20/72] ncr5380: Introduce unbound workqueue Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 19/72] ncr5380: Cleanup bogus {request,release}_region() calls Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 07/72] ncr5380: Split NCR5380_init() into two functions Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 21/72] ncr5380: Sleep when polling, if possible Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
Re: [PATCH v2 21/72] ncr5380: Sleep when polling, if possible Geert Uytterhoeven <geert@linux-m68k.org> - 2015-12-06 11:20 +0100
Re: [PATCH v2 21/72] ncr5380: Sleep when polling, if possible Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 23:10 +0100
[PATCH v2 04/72] ncr5380: Remove more pointless macros Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 16/72] ncr5380: Proceed with next command after NCR5380_select() calls scsi_done Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 13/72] ncr5380: Remove redundant register writes Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 02/72] ncr5380: Remove redundant static variable initializers Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 11/72] ncr5380: Simplify bus reset handlers Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 27/72] ncr5380: Add missing lock in eh_abort_handler Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 23/72] ncr5380: Always retry arbitration and selection Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 09/72] atari_NCR5380: Reset bus on driver initialization if required Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 05/72] ncr5380: Remove NCR5380_local_declare and NCR5380_setup macros Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 22/72] ncr5380: Eliminate selecting state Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 03/72] ncr5380: Eliminate PDEBUG*, TDEBUG* and DTCDEBUG* macros Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 12/72] ncr5380: Remove unused hostdata->aborted flag Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 10/72] atari_NCR5380: Remove RESET_BOOT, CONFIG_ATARI_SCSI_TOSHIBA_DELAY and CONFIG_ATARI_SCSI_RESET_BOOT Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 18/72] ncr5380: Eliminate USLEEP_WAITLONG delay Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 15/72] ncr5380: Always escalate bad target time-out in NCR5380_select() Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 17/72] ncr5380: Keep BSY asserted when entering SELECTION phase Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
[PATCH v2 24/72] ncr5380: Implement NCR5380_dma_xfer_len and remove LIMIT_TRANSFERSIZE macro Finn Thain <fthain@telegraphics.com.au> - 2015-12-06 05:10 +0100
csiph-web