From: Finn Thain <fthain@telegraphics.com.au>
To: "James E.J. Bottomley" <JBottomley@odin.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Michael Schmitz <schmitzmic@gmail.com>,
linux-m68k@vger.kernel.org, linux-scsi@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v4 58/78] ncr5380: Refactor command completion
Date: Sun, 03 Jan 2016 16:05:59 +1100 [thread overview]
Message-ID: <20160103050516.381766256@telegraphics.com.au> (raw)
In-Reply-To: 20160103050501.042035135@telegraphics.com.au
[-- Attachment #1: ncr5380-complete_cmd --]
[-- Type: text/plain, Size: 6928 bytes --]
Implement a 'complete_cmd' function to complete commands. This is needed
by the following patch; the new function provides a site for the logic
needed to correctly handle REQUEST SENSE commands.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Tested-by: Ondrej Zary <linux@rainbow-software.org>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
---
drivers/scsi/NCR5380.c | 31 ++++++++++++++++++++++------
drivers/scsi/atari_NCR5380.c | 46 ++++++++++++++++++++++++++++---------------
2 files changed, 55 insertions(+), 22 deletions(-)
Index: linux/drivers/scsi/atari_NCR5380.c
===================================================================
--- linux.orig/drivers/scsi/atari_NCR5380.c 2016-01-03 16:04:20.000000000 +1100
+++ linux/drivers/scsi/atari_NCR5380.c 2016-01-03 16:04:24.000000000 +1100
@@ -765,6 +765,27 @@ static void NCR5380_exit(struct Scsi_Hos
}
/**
+ * complete_cmd - finish processing a command and return it to the SCSI ML
+ * @instance: the host instance
+ * @cmd: command to complete
+ */
+
+static void complete_cmd(struct Scsi_Host *instance,
+ struct scsi_cmnd *cmd)
+{
+ struct NCR5380_hostdata *hostdata = shost_priv(instance);
+
+ dsprintk(NDEBUG_QUEUES, instance, "complete_cmd: cmd %p\n", cmd);
+
+#ifdef SUPPORT_TAGS
+ cmd_free_tag(cmd);
+#else
+ hostdata->busy[scmd_id(cmd)] &= ~(1 << cmd->device->lun);
+#endif
+ cmd->scsi_done(cmd);
+}
+
+/**
* NCR5380_queue_command - queue a command
* @instance: the relevant SCSI adapter
* @cmd: SCSI command
@@ -1352,10 +1373,7 @@ static int NCR5380_select(struct Scsi_Ho
spin_lock_irq(&hostdata->lock);
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
cmd->result = DID_BAD_TARGET << 16;
-#ifdef SUPPORT_TAGS
- cmd_free_tag(cmd);
-#endif
- cmd->scsi_done(cmd);
+ complete_cmd(instance, cmd);
NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
dprintk(NDEBUG_SELECTION, "scsi%d: target did not respond within 250ms\n", HOSTNO);
return 0;
@@ -1866,7 +1884,7 @@ static void NCR5380_information_transfer
sink = 1;
do_abort(instance);
cmd->result = DID_ERROR << 16;
- cmd->scsi_done(cmd);
+ complete_cmd(instance, cmd);
return;
#endif
case PHASE_DATAIN:
@@ -1926,7 +1944,7 @@ static void NCR5380_information_transfer
sink = 1;
do_abort(instance);
cmd->result = DID_ERROR << 16;
- cmd->scsi_done(cmd);
+ complete_cmd(instance, cmd);
/* XXX - need to source or sink data here, as appropriate */
} else {
#ifdef REAL_DMA
@@ -1982,8 +2000,6 @@ static void NCR5380_information_transfer
if (ta->queue_size > ta->nr_allocated)
ta->queue_size = ta->nr_allocated;
}
-#else
- hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
#endif
/*
@@ -2021,8 +2037,13 @@ static void NCR5380_information_transfer
dsprintk(NDEBUG_AUTOSENSE | NDEBUG_QUEUES,
instance, "REQUEST SENSE cmd %p added to head of issue queue\n",
cmd);
+#ifdef SUPPORT_TAGS
+ cmd_free_tag(cmd);
+#else
+ hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
+#endif
} else {
- cmd->scsi_done(cmd);
+ complete_cmd(instance, cmd);
}
/*
@@ -2193,15 +2214,10 @@ static void NCR5380_information_transfer
hostdata->last_message = msgout;
NCR5380_transfer_pio(instance, &phase, &len, &data);
if (msgout == ABORT) {
-#ifdef SUPPORT_TAGS
- cmd_free_tag(cmd);
-#else
- hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
-#endif
hostdata->connected = NULL;
cmd->result = DID_ERROR << 16;
+ complete_cmd(instance, cmd);
maybe_release_dma_irq(instance);
- cmd->scsi_done(cmd);
NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
return;
}
Index: linux/drivers/scsi/NCR5380.c
===================================================================
--- linux.orig/drivers/scsi/NCR5380.c 2016-01-03 16:04:20.000000000 +1100
+++ linux/drivers/scsi/NCR5380.c 2016-01-03 16:04:24.000000000 +1100
@@ -726,6 +726,24 @@ static void NCR5380_exit(struct Scsi_Hos
}
/**
+ * complete_cmd - finish processing a command and return it to the SCSI ML
+ * @instance: the host instance
+ * @cmd: command to complete
+ */
+
+static void complete_cmd(struct Scsi_Host *instance,
+ struct scsi_cmnd *cmd)
+{
+ struct NCR5380_hostdata *hostdata = shost_priv(instance);
+
+ dsprintk(NDEBUG_QUEUES, instance, "complete_cmd: cmd %p\n", cmd);
+
+ hostdata->busy[scmd_id(cmd)] &= ~(1 << cmd->device->lun);
+
+ cmd->scsi_done(cmd);
+}
+
+/**
* NCR5380_queue_command - queue a command
* @instance: the relevant SCSI adapter
* @cmd: SCSI command
@@ -1171,7 +1189,7 @@ static int NCR5380_select(struct Scsi_Ho
spin_lock_irq(&hostdata->lock);
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
cmd->result = DID_BAD_TARGET << 16;
- cmd->scsi_done(cmd);
+ complete_cmd(instance, cmd);
NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
dprintk(NDEBUG_SELECTION, "scsi%d : target did not respond within 250ms\n",
instance->host_no);
@@ -1759,7 +1777,7 @@ static void NCR5380_information_transfer
sink = 1;
do_abort(instance);
cmd->result = DID_ERROR << 16;
- cmd->scsi_done(cmd);
+ complete_cmd(instance, cmd);
return;
#endif
case PHASE_DATAIN:
@@ -1804,7 +1822,7 @@ static void NCR5380_information_transfer
sink = 1;
do_abort(instance);
cmd->result = DID_ERROR << 16;
- cmd->scsi_done(cmd);
+ complete_cmd(instance, cmd);
/* XXX - need to source or sink data here, as appropriate */
} else
cmd->SCp.this_residual -= transfersize - len;
@@ -1834,7 +1852,6 @@ static void NCR5380_information_transfer
cmd, scmd_id(cmd), cmd->device->lun);
hostdata->connected = NULL;
- hostdata->busy[cmd->device->id] &= ~(1 << (cmd->device->lun & 0xFF));
/*
* I'm not sure what the correct thing to do here is :
@@ -1870,8 +1887,9 @@ static void NCR5380_information_transfer
dsprintk(NDEBUG_AUTOSENSE | NDEBUG_QUEUES,
instance, "REQUEST SENSE cmd %p added to head of issue queue\n",
cmd);
+ hostdata->busy[cmd->device->id] &= ~(1 << (cmd->device->lun & 0xFF));
} else {
- cmd->scsi_done(cmd);
+ complete_cmd(instance, cmd);
}
/*
@@ -2018,10 +2036,9 @@ static void NCR5380_information_transfer
hostdata->last_message = msgout;
NCR5380_transfer_pio(instance, &phase, &len, &data);
if (msgout == ABORT) {
- hostdata->busy[cmd->device->id] &= ~(1 << (cmd->device->lun & 0xFF));
hostdata->connected = NULL;
cmd->result = DID_ERROR << 16;
- cmd->scsi_done(cmd);
+ complete_cmd(instance, cmd);
NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
return;
}
next prev parent reply other threads:[~2016-01-03 5:18 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-03 5:05 [PATCH v4 00/78] More fixes, cleanup and modernization for NCR5380 drivers Finn Thain
2016-01-03 5:05 ` [PATCH v4 01/78] atari_scsi: Fix SCSI host ID setting Finn Thain
2016-01-03 5:05 ` [PATCH v4 02/78] ncr5380: Remove redundant static variable initializers Finn Thain
2016-01-03 5:05 ` [PATCH v4 03/78] ncr5380: Eliminate PDEBUG*, TDEBUG* and DTCDEBUG* macros Finn Thain
2016-01-03 5:05 ` [PATCH v4 04/78] ncr5380: Remove more pointless macros Finn Thain
2016-01-03 5:05 ` [PATCH v4 05/78] ncr5380: Remove NCR5380_local_declare and NCR5380_setup macros Finn Thain
2016-01-03 5:05 ` [PATCH v4 06/78] ncr5380: Remove NCR5380_instance_name macro Finn Thain
2016-01-03 5:05 ` [PATCH v4 07/78] ncr5380: Split NCR5380_init() into two functions Finn Thain
2016-01-03 5:05 ` [PATCH v4 08/78] ncr5380: Move NCR53C400-specific code Finn Thain
2016-01-03 5:05 ` [PATCH v4 09/78] atari_NCR5380: Reset bus on driver initialization if required Finn Thain
2016-01-03 5:05 ` [PATCH v4 10/78] atari_NCR5380: Remove RESET_BOOT, CONFIG_ATARI_SCSI_TOSHIBA_DELAY and CONFIG_ATARI_SCSI_RESET_BOOT Finn Thain
2016-01-03 5:05 ` [PATCH v4 11/78] ncr5380: Simplify bus reset handlers Finn Thain
2016-01-03 5:05 ` [PATCH v4 12/78] ncr5380: Remove unused hostdata->aborted flag Finn Thain
2016-01-03 5:05 ` [PATCH v4 13/78] ncr5380: Remove redundant register writes Finn Thain
2016-01-03 5:05 ` [PATCH v4 14/78] ncr5380: Use return instead of goto in NCR5380_select() Finn Thain
2016-01-03 5:05 ` [PATCH v4 15/78] ncr5380: Always escalate bad target time-out " Finn Thain
2016-01-03 5:05 ` [PATCH v4 16/78] ncr5380: Proceed with next command after NCR5380_select() calls scsi_done Finn Thain
2016-01-03 5:05 ` [PATCH v4 17/78] ncr5380: Keep BSY asserted when entering SELECTION phase Finn Thain
2016-01-03 5:05 ` [PATCH v4 18/78] ncr5380: Eliminate USLEEP_WAITLONG delay Finn Thain
2016-01-03 5:05 ` [PATCH v4 19/78] ncr5380: Cleanup bogus {request, release}_region() calls Finn Thain
2016-01-03 5:05 ` [PATCH v4 20/78] ncr5380: Introduce unbound workqueue Finn Thain
2016-01-03 5:05 ` [PATCH v4 21/78] ncr5380: Sleep when polling, if possible Finn Thain
2016-01-03 5:05 ` [PATCH v4 22/78] ncr5380: Eliminate selecting state Finn Thain
2016-01-03 5:05 ` [PATCH v4 23/78] ncr5380: Always retry arbitration and selection Finn Thain
2016-01-03 5:05 ` [PATCH v4 24/78] ncr5380: Implement NCR5380_dma_xfer_len and remove LIMIT_TRANSFERSIZE macro Finn Thain
2016-01-03 5:05 ` [PATCH v4 25/78] ncr5380: Rework disconnect versus poll logic Finn Thain
2016-01-03 5:05 ` [PATCH v4 26/78] ncr5380: Fix NCR5380_transfer_pio() result Finn Thain
2016-01-03 5:05 ` [PATCH v4 27/78] ncr5380: Add missing lock in eh_abort_handler Finn Thain
2016-01-03 5:05 ` [PATCH v4 28/78] ncr5380: Drop DEF_SCSI_QCMD macro Finn Thain
2016-01-03 5:05 ` [PATCH v4 29/78] ncr5380: Remove references to linked commands Finn Thain
2016-01-03 5:05 ` [PATCH v4 30/78] ncr5380: Add missing break after case MESSAGE_REJECT Finn Thain
2016-01-03 5:05 ` [PATCH v4 31/78] ncr5380: Fix !REQ timeout in do_abort() Finn Thain
2016-01-03 5:05 ` [PATCH v4 32/78] ncr5380: Fix bus phase " Finn Thain
2016-01-03 5:05 ` [PATCH v4 33/78] atari_NCR5380: Set do_abort() timeouts Finn Thain
2016-01-03 5:05 ` [PATCH v4 34/78] atari_NCR5380: Use arbitration timeout Finn Thain
2016-01-24 10:38 ` Geert Uytterhoeven
2016-01-25 2:45 ` Finn Thain
2016-01-25 8:05 ` Geert Uytterhoeven
2016-01-25 18:28 ` Andreas Schwab
2016-01-25 19:56 ` Michael Schmitz
2016-01-26 0:18 ` Finn Thain
2016-01-26 11:13 ` Geert Uytterhoeven
2016-01-03 5:05 ` [PATCH v4 35/78] ncr5380: Dont wait for BUS FREE after disconnect Finn Thain
2016-01-03 5:05 ` [PATCH v4 36/78] ncr5380: Use work_struct instead of delayed_work Finn Thain
2016-01-03 5:05 ` [PATCH v4 37/78] ncr5380: Standardize work queueing algorithm Finn Thain
2016-01-03 5:05 ` [PATCH v4 38/78] ncr5380: Remove UNSAFE macro Finn Thain
2016-01-03 5:05 ` [PATCH v4 39/78] ncr5380: Standardize interrupt handling Finn Thain
2016-01-03 5:05 ` [PATCH v4 40/78] ncr5380: Introduce NCR5380_poll_politely2 Finn Thain
2016-01-03 5:05 ` [PATCH v4 41/78] ncr5380: Replace redundant flags with FLAG_NO_DMA_FIXUP Finn Thain
2016-01-03 5:05 ` [PATCH v4 42/78] ncr5380: Replace READ_OVERRUNS macro with FLAG_NO_DMA_FIXUPS Finn Thain
2016-01-03 5:05 ` [PATCH v4 43/78] ncr5380: Standardize reselection handling Finn Thain
2016-01-03 5:05 ` [PATCH v4 44/78] ncr5380: Fix off-by-one bug in extended_msg[] bounds check Finn Thain
2016-01-03 5:05 ` [PATCH v4 45/78] ncr5380: Cleanup #include directives Finn Thain
2016-01-03 5:05 ` [PATCH v4 46/78] ncr5380: Fix NDEBUG_NO_DATAOUT flag Finn Thain
2016-01-03 5:05 ` [PATCH v4 47/78] ncr5380: Fix and cleanup scsi_host_template initializers Finn Thain
2016-01-03 5:05 ` [PATCH v4 48/78] atari_NCR5380: Fix queue_size limit Finn Thain
2016-01-03 5:05 ` [PATCH v4 49/78] ncr5380: Remove redundant ICR_ARBITRATION_LOST test and eliminate FLAG_DTC3181E Finn Thain
2016-01-03 5:05 ` [PATCH v4 50/78] ncr5380: Change instance->host_lock to hostdata->lock Finn Thain
2016-01-03 5:05 ` [PATCH v4 51/78] ncr5380: Remove command list debug code Finn Thain
2016-01-03 5:05 ` [PATCH v4 52/78] ncr5380: Remove H_NO macro and introduce dsprintk Finn Thain
2016-01-03 5:05 ` [PATCH v4 53/78] ncr5380: Use shost_priv helper Finn Thain
2016-01-03 5:05 ` [PATCH v4 54/78] ncr5380: Use dsprintk() for queue debugging Finn Thain
2016-01-03 5:05 ` [PATCH v4 55/78] ncr5380: Remove LIST and REMOVE macros Finn Thain
2016-01-03 5:05 ` [PATCH v4 56/78] ncr5380: Remove redundant volatile qualifiers Finn Thain
2016-01-03 5:05 ` [PATCH v4 57/78] ncr5380: Use standard list data structure Finn Thain
2016-01-03 5:05 ` Finn Thain [this message]
2016-01-03 5:06 ` [PATCH v4 59/78] ncr5380: Fix autosense bugs Finn Thain
2016-01-03 5:06 ` [PATCH v4 60/78] ncr5380: Implement new eh_abort_handler Finn Thain
2016-01-03 5:06 ` [PATCH v4 61/78] ncr5380: Fix EH during arbitration and selection Finn Thain
2016-01-03 5:06 ` [PATCH v4 62/78] ncr5380: Implement new eh_bus_reset_handler Finn Thain
2016-01-03 5:06 ` [PATCH v4 63/78] atari_NCR5380: Remove HOSTNO macro from printk() and seq_printf() calls Finn Thain
2016-01-03 5:06 ` [PATCH v4 64/78] atari_NCR5380: Eliminate HOSTNO macro Finn Thain
2016-01-03 5:06 ` [PATCH v4 65/78] atari_scsi, sun3_scsi: Remove global Scsi_Host pointer Finn Thain
2016-01-03 5:06 ` [PATCH v4 66/78] ncr5380: Fix soft lockups Finn Thain
2016-01-03 5:06 ` [PATCH v4 67/78] ncr5380: Cleanup comments Finn Thain
2016-01-03 5:06 ` [PATCH v4 68/78] ncr5380: Fix trailing whitespace using regexp Finn Thain
2016-01-03 5:06 ` [PATCH v4 69/78] ncr5380: Fix whitespace in comments " Finn Thain
2016-01-03 7:54 ` Joe Perches
2016-01-03 8:17 ` Finn Thain
2016-01-03 14:10 ` One Thousand Gnomes
2016-01-03 18:20 ` Joe Perches
2016-01-03 21:29 ` One Thousand Gnomes
2016-01-03 21:46 ` Joe Perches
[not found] ` <20160103220505.7734a879@lxorguk.ukuu.org.uk>
2016-01-03 22:13 ` Joe Perches
2016-01-03 5:06 ` [PATCH v4 70/78] ncr5380: Merge changes from atari_NCR5380.c Finn Thain
2016-01-03 5:06 ` [PATCH v4 71/78] atari_NCR5380: Merge changes from NCR5380.c Finn Thain
2016-01-03 5:06 ` [PATCH v4 72/78] ncr5380: Cleanup whitespace and parentheses Finn Thain
2016-01-03 5:06 ` [PATCH v4 73/78] ncr5380: Fix pseudo DMA transfers on 53C400 Finn Thain
2016-01-03 5:06 ` [PATCH v4 74/78] ncr5380: Use runtime register mapping Finn Thain
2016-01-03 5:06 ` [PATCH v4 75/78] ncr5380: Enable PDMA for NCR53C400A Finn Thain
2016-01-03 5:06 ` [PATCH v4 76/78] ncr5380: Enable PDMA for DTC chips Finn Thain
2016-01-03 5:06 ` [PATCH v4 77/78] ncr5380: Fix wait for 53C80 registers registers after PDMA Finn Thain
2016-01-03 5:06 ` [PATCH v4 78/78] ncr5380: Add support for HP C2502 Finn Thain
2016-01-07 2:53 ` [PATCH v4 00/78] More fixes, cleanup and modernization for NCR5380 drivers 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=20160103050516.381766256@telegraphics.com.au \
--to=fthain@telegraphics.com.au \
--cc=JBottomley@odin.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=schmitzmic@gmail.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).