From: Finn Thain <fthain@telegraphics.com.au>
To: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.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>
Cc: Ondrej Zary <linux@rainbow-software.org>, Sam Creasey <sammy@sammy.net>
Subject: [PATCH v3 04/23] atari_NCR5380: Remove DMA_MIN_SIZE macro
Date: Mon, 21 Mar 2016 13:31:53 +1100 [thread overview]
Message-ID: <20160321023150.654436098@telegraphics.com.au> (raw)
In-Reply-To: 20160321023149.604138431@telegraphics.com.au
[-- Attachment #1: atari_NCR5380-remove-DMA_MIN_SIZE-macro --]
[-- Type: text/plain, Size: 4820 bytes --]
Only the atari_scsi and sun3_scsi drivers define DMA_MIN_SIZE.
Both drivers also define NCR5380_dma_xfer_len, which means
DMA_MIN_SIZE can be removed from the core driver.
This removes another discrepancy between the two core drivers.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
---
Changes since v1:
- Retain MIN_DMA_SIZE macro in wrapper drivers.
---
drivers/scsi/atari_NCR5380.c | 16 ++++++++--------
drivers/scsi/atari_scsi.c | 6 +++++-
drivers/scsi/sun3_scsi.c | 19 +++++++++----------
3 files changed, 22 insertions(+), 19 deletions(-)
Index: linux/drivers/scsi/atari_NCR5380.c
===================================================================
--- linux.orig/drivers/scsi/atari_NCR5380.c 2016-03-21 13:31:10.000000000 +1100
+++ linux/drivers/scsi/atari_NCR5380.c 2016-03-21 13:31:13.000000000 +1100
@@ -1857,12 +1857,11 @@ static void NCR5380_information_transfer
d = cmd->SCp.ptr;
}
/* this command setup for dma yet? */
- if ((count >= DMA_MIN_SIZE) && (sun3_dma_setup_done != cmd)) {
- if (cmd->request->cmd_type == REQ_TYPE_FS) {
- sun3scsi_dma_setup(instance, d, count,
- rq_data_dir(cmd->request));
- sun3_dma_setup_done = cmd;
- }
+ if (sun3_dma_setup_done != cmd &&
+ sun3scsi_dma_xfer_len(count, cmd) > 0) {
+ sun3scsi_dma_setup(instance, d, count,
+ rq_data_dir(cmd->request));
+ sun3_dma_setup_done = cmd;
}
#ifdef SUN3_SCSI_VME
dregs->csr |= CSR_INTR;
@@ -1927,7 +1926,7 @@ static void NCR5380_information_transfer
#endif
transfersize = NCR5380_dma_xfer_len(instance, cmd, phase);
- if (transfersize >= DMA_MIN_SIZE) {
+ if (transfersize > 0) {
len = transfersize;
cmd->SCp.phase = phase;
if (NCR5380_transfer_dma(instance, &phase,
@@ -2366,7 +2365,8 @@ static void NCR5380_reselect(struct Scsi
d = tmp->SCp.ptr;
}
/* setup this command for dma if not already */
- if ((count >= DMA_MIN_SIZE) && (sun3_dma_setup_done != tmp)) {
+ if (sun3_dma_setup_done != tmp &&
+ sun3scsi_dma_xfer_len(count, tmp) > 0) {
sun3scsi_dma_setup(instance, d, count,
rq_data_dir(tmp->request));
sun3_dma_setup_done = tmp;
Index: linux/drivers/scsi/atari_scsi.c
===================================================================
--- linux.orig/drivers/scsi/atari_scsi.c 2016-03-21 13:31:10.000000000 +1100
+++ linux/drivers/scsi/atari_scsi.c 2016-03-21 13:31:13.000000000 +1100
@@ -83,11 +83,12 @@
#include <scsi/scsi_host.h>
+#define DMA_MIN_SIZE 32
+
/* Definitions for the core NCR5380 driver. */
#define SUPPORT_TAGS
#define MAX_TAGS 32
-#define DMA_MIN_SIZE 32
#define NCR5380_implementation_fields /* none */
@@ -605,6 +606,9 @@ static unsigned long atari_dma_xfer_len(
{
unsigned long possible_len, limit;
+ if (wanted_len < DMA_MIN_SIZE)
+ return 0;
+
if (IS_A_TT())
/* TT SCSI DMA can transfer arbitrary #bytes */
return wanted_len;
Index: linux/drivers/scsi/sun3_scsi.c
===================================================================
--- linux.orig/drivers/scsi/sun3_scsi.c 2016-03-21 13:31:10.000000000 +1100
+++ linux/drivers/scsi/sun3_scsi.c 2016-03-21 13:31:13.000000000 +1100
@@ -36,12 +36,12 @@
#include <scsi/scsi_host.h>
#include "sun3_scsi.h"
-/* Definitions for the core NCR5380 driver. */
-
-/* #define SUPPORT_TAGS */
/* minimum number of bytes to do dma on */
#define DMA_MIN_SIZE 129
+/* Definitions for the core NCR5380 driver. */
+
+/* #define SUPPORT_TAGS */
/* #define MAX_TAGS 32 */
#define NCR5380_implementation_fields /* none */
@@ -61,7 +61,7 @@
#define NCR5380_dma_residual(instance) \
sun3scsi_dma_residual(instance)
#define NCR5380_dma_xfer_len(instance, cmd, phase) \
- sun3scsi_dma_xfer_len(cmd->SCp.this_residual, cmd, !((phase) & SR_IO))
+ sun3scsi_dma_xfer_len(cmd->SCp.this_residual, cmd)
#define NCR5380_acquire_dma_irq(instance) (1)
#define NCR5380_release_dma_irq(instance)
@@ -262,14 +262,13 @@ static inline unsigned long sun3scsi_dma
return last_residual;
}
-static inline unsigned long sun3scsi_dma_xfer_len(unsigned long wanted,
- struct scsi_cmnd *cmd,
- int write_flag)
+static inline unsigned long sun3scsi_dma_xfer_len(unsigned long wanted_len,
+ struct scsi_cmnd *cmd)
{
- if (cmd->request->cmd_type == REQ_TYPE_FS)
- return wanted;
- else
+ if (wanted_len < DMA_MIN_SIZE || cmd->request->cmd_type != REQ_TYPE_FS)
return 0;
+
+ return wanted_len;
}
static inline int sun3scsi_dma_start(unsigned long count, unsigned char *data)
next prev parent reply other threads:[~2016-03-21 4:05 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-21 2:31 [PATCH v3 00/23] ncr5380: Eliminate macros, reduce code duplication, fix bugs etc Finn Thain
2016-03-21 2:31 ` [PATCH v3 01/23] g_ncr5380: Remove CONFIG_SCSI_GENERIC_NCR53C400 Finn Thain
2016-03-21 2:31 ` [PATCH v3 02/23] ncr5380: Remove FLAG_NO_PSEUDO_DMA where possible Finn Thain
2016-03-21 2:31 ` [PATCH v3 03/23] ncr5380: Remove REAL_DMA and REAL_DMA_POLL macros Finn Thain
2016-03-21 2:31 ` Finn Thain [this message]
2016-03-23 7:27 ` [PATCH v3 04/23] atari_NCR5380: Remove DMA_MIN_SIZE macro Hannes Reinecke
2016-03-21 2:31 ` [PATCH v3 05/23] ncr5380: Disable the DMA errata workaround flag by default Finn Thain
2016-03-21 2:31 ` [PATCH v3 06/23] ncr5380: Remove PSEUDO_DMA macro Finn Thain
2016-03-21 2:31 ` [PATCH v3 07/23] ncr5380: Remove BOARD_REQUIRES_NO_DELAY macro Finn Thain
2016-03-21 2:31 ` [PATCH v3 08/23] ncr5380: Use DMA hooks for PDMA Finn Thain
2016-03-21 2:31 ` [PATCH v3 09/23] ncr5380: Adopt uniform DMA setup convention Finn Thain
2016-03-21 2:31 ` [PATCH v3 10/23] ncr5380: Merge DMA implementation from atari_NCR5380 core driver Finn Thain
2016-03-21 2:32 ` [PATCH v3 11/23] atari_scsi: Adopt NCR5380.c " Finn Thain
2016-03-21 2:32 ` [PATCH v3 12/23] sun3_scsi: " Finn Thain
2016-03-21 2:32 ` [PATCH v3 13/23] ncr5380: Remove disused atari_NCR5380.c " Finn Thain
2016-03-21 2:32 ` [PATCH v3 14/23] ncr5380: Reduce max_lun limit Finn Thain
2016-03-23 7:28 ` Hannes Reinecke
2016-03-21 2:32 ` [PATCH v3 15/23] dmx3191d: Drop max_sectors limit Finn Thain
2016-03-21 2:32 ` [PATCH v3 16/23] ncr5380: Fix register decoding for debugging Finn Thain
2016-03-21 2:32 ` [PATCH v3 17/23] ncr5380: Remove remaining register storage qualifiers Finn Thain
2016-03-21 2:32 ` [PATCH v3 18/23] ncr5380: Remove DONT_USE_INTR and AUTOPROBE_IRQ macros Finn Thain
2016-03-21 2:32 ` [PATCH v3 19/23] ncr5380: Update usage documentation Finn Thain
2016-03-21 2:32 ` [PATCH v3 20/23] atari_scsi: Set a reasonable default for cmd_per_lun Finn Thain
2016-03-23 7:28 ` Hannes Reinecke
2016-03-21 2:32 ` [PATCH v3 21/23] atari_scsi: Allow can_queue to be increased for Falcon Finn Thain
2016-03-21 2:32 ` [PATCH v3 22/23] mac_scsi: Fix pseudo DMA implementation Finn Thain
2016-03-21 2:32 ` [PATCH v3 23/23] ncr5380: Call complete_cmd() for disconnected commands on bus reset Finn Thain
2016-03-23 7:29 ` Hannes Reinecke
2016-03-22 22:24 ` [PATCH v3 00/23] ncr5380: Eliminate macros, reduce code duplication, fix bugs etc Ondrej Zary
2016-03-23 1:35 ` Finn Thain
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=20160321023150.654436098@telegraphics.com.au \
--to=fthain@telegraphics.com.au \
--cc=James.Bottomley@HansenPartnership.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux@rainbow-software.org \
--cc=martin.petersen@oracle.com \
--cc=sammy@sammy.net \
--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