Commit ff3d4578 authored by Finn Thain's avatar Finn Thain Committed by Martin K. Petersen
Browse files

ncr5380: Implement NCR5380_dma_xfer_len and remove LIMIT_TRANSFERSIZE macro 



Follow the example of the atari_NCR5380.c core driver and adopt the
NCR5380_dma_xfer_len() hook. Implement NCR5380_dma_xfer_len() for dtc.c
and g_NCR5380.c to take care of the limitations of these cards. Keep the
default for drivers using PSEUDO_DMA.

Eliminate the unused macro LIMIT_TRANSFERSIZE.

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Tested-by: default avatarOndrej Zary <linux@rainbow-software.org>
Tested-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1d3db59d

drivers/scsi/NCR5380.c

+6 −28
Original line number Diff line number Diff line
@@ -201,11 +201,6 @@ 
 * DONT_USE_INTR - if defined, never use interrupts, even if we probe or

 *      override-configure an IRQ.

 *

 * LIMIT_TRANSFERSIZE - if defined, limit the pseudo-dma transfers to 512

 *      bytes at a time.  Since interrupts are disabled by default during

 *      these transfers, we might need this to give reasonable interrupt

 *      service time if the transfer size gets too large.

 *

 * LINKED - if defined, linked commands are supported.

 *

 * PSEUDO_DMA - if defined, PSEUDO DMA is used during the data transfer phases.
@@ -2000,29 +1995,12 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { 
				 */



#if defined(PSEUDO_DMA) || defined(REAL_DMA_POLL)

				/* KLL

				 * PSEUDO_DMA is defined here. If this is the g_NCR5380

				 * driver then it will always be defined, so the

				 * FLAG_NO_PSEUDO_DMA is used to inhibit PDMA in the base

				 * NCR5380 case.  I think this is a fairly clean solution.

				 * We supplement these 2 if's with the flag.

				 */

#ifdef NCR5380_dma_xfer_len

				if (!cmd->device->borken && !(hostdata->flags & FLAG_NO_PSEUDO_DMA) && (transfersize = NCR5380_dma_xfer_len(instance, cmd)) != 0) {

#else

				transfersize = cmd->transfersize;



#ifdef LIMIT_TRANSFERSIZE	/* If we have problems with interrupt service */

				if (transfersize > 512)

					transfersize = 512;

#endif				/* LIMIT_TRANSFERSIZE */



				if (!cmd->device->borken && transfersize && !(hostdata->flags & FLAG_NO_PSEUDO_DMA) && cmd->SCp.this_residual && !(cmd->SCp.this_residual % transfersize)) {

					/* Limit transfers to 32K, for xx400 & xx406

					 * pseudoDMA that transfers in 128 bytes blocks. */

					if (transfersize > 32 * 1024)

						transfersize = 32 * 1024;

#endif

				transfersize = 0;

				if (!cmd->device->borken &&

				    !(hostdata->flags & FLAG_NO_PSEUDO_DMA))

					transfersize = NCR5380_dma_xfer_len(instance, cmd, phase);



				if (transfersize) {

					len = transfersize;

					if (NCR5380_transfer_dma(instance, &phase, &len, (unsigned char **) &cmd->SCp.ptr)) {

						/*

drivers/scsi/arm/cumana_1.c

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
#define priv(host)			((struct NCR5380_hostdata *)(host)->hostdata)

#define NCR5380_read(reg)		cumanascsi_read(instance, reg)

#define NCR5380_write(reg, value)	cumanascsi_write(instance, reg, value)



#define NCR5380_dma_xfer_len(instance, cmd, phase)	(cmd->transfersize)



#define NCR5380_intr			cumanascsi_intr

#define NCR5380_queue_command		cumanascsi_queue_command

#define NCR5380_info			cumanascsi_info

drivers/scsi/arm/oak.c

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#define NCR5380_write(reg, value) \

	writeb(value, priv(instance)->base + ((reg) << 2))



#define NCR5380_dma_xfer_len(instance, cmd, phase)	(cmd->transfersize)



#define NCR5380_queue_command		oakscsi_queue_command

#define NCR5380_info			oakscsi_info

#define NCR5380_show_info		oakscsi_show_info

drivers/scsi/atari_NCR5380.c

+5 −3
Original line number Diff line number Diff line
@@ -2170,11 +2170,13 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) 
				 */



#if defined(REAL_DMA)

				if (

#if !defined(CONFIG_SUN3)

				    !cmd->device->borken &&

				transfersize = 0;

				if (!cmd->device->borken)

#endif

				    (transfersize = NCR5380_dma_xfer_len(instance, cmd, phase)) >= DMA_MIN_SIZE) {

					transfersize = NCR5380_dma_xfer_len(instance, cmd, phase);



				if (transfersize >= DMA_MIN_SIZE) {

					len = transfersize;

					cmd->SCp.phase = phase;

					if (NCR5380_transfer_dma(instance, &phase,

drivers/scsi/dtc.c

+14 −0
Original line number Diff line number Diff line
@@ -419,6 +419,20 @@ static inline int NCR5380_pwrite(struct Scsi_Host *instance, unsigned char *src, 
	return (0);

}



static int dtc_dma_xfer_len(struct scsi_cmnd *cmd)

{

	int transfersize = cmd->transfersize;



	/* Limit transfers to 32K, for xx400 & xx406

	 * pseudoDMA that transfers in 128 bytes blocks.

	 */

	if (transfersize > 32 * 1024 && cmd->SCp.this_residual &&

	    !(cmd->SCp.this_residual % transfersize))

		transfersize = 32 * 1024;



	return transfersize;

}



MODULE_LICENSE("GPL");



#include "NCR5380.c"

CRA Git | Maintained and supported by SUSTech CRA and CCSE