Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ncr5380: Disable the DMA errata workaround flag by default 



The only chip that needs the workarounds enabled is an early NMOS
device. That means that the common case is to disable them.

Unfortunately the sense of the flag is such that it has to be set
for the common case.

Rename the flag so that zero can be used to mean "no errata workarounds
needed". This simplifies the code.

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

drivers/scsi/NCR5380.c

+7 −7
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static void prepare_info(struct Scsi_Host *instance) 
	         instance->base, instance->irq,

	         instance->can_queue, instance->cmd_per_lun,

	         instance->sg_tablesize, instance->this_id,

	         hostdata->flags & FLAG_NO_DMA_FIXUP  ? "NO_DMA_FIXUP "  : "",

	         hostdata->flags & FLAG_DMA_FIXUP     ? "DMA_FIXUP "     : "",

	         hostdata->flags & FLAG_NO_PSEUDO_DMA ? "NO_PSEUDO_DMA " : "",

	         hostdata->flags & FLAG_TOSHIBA_DELAY ? "TOSHIBA_DELAY "  : "",

#ifdef AUTOPROBE_IRQ
@@ -1480,11 +1480,11 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, 
	 * before the setting of DMA mode to after transfer of the last byte.

	 */



	if (hostdata->flags & FLAG_NO_DMA_FIXUP)

	if (hostdata->flags & FLAG_DMA_FIXUP)

		NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE | MR_MONITOR_BSY);

	else

		NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE | MR_MONITOR_BSY |

		                        MR_ENABLE_EOP_INTR);

	else

		NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE | MR_MONITOR_BSY);



	dprintk(NDEBUG_DMA, "scsi%d : mode reg = 0x%X\n", instance->host_no, NCR5380_read(MODE_REG));
@@ -1540,8 +1540,8 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, 


	if (p & SR_IO) {

		foo = NCR5380_pread(instance, d,

			hostdata->flags & FLAG_NO_DMA_FIXUP ? c : c - 1);

		if (!foo && !(hostdata->flags & FLAG_NO_DMA_FIXUP)) {

			hostdata->flags & FLAG_DMA_FIXUP ? c - 1 : c);

		if (!foo && (hostdata->flags & FLAG_DMA_FIXUP)) {

			/*

			 * The workaround was to transfer fewer bytes than we

			 * intended to with the pseudo-DMA read function, wait for
@@ -1571,7 +1571,7 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, 
		}

	} else {

		foo = NCR5380_pwrite(instance, d, c);

		if (!foo && !(hostdata->flags & FLAG_NO_DMA_FIXUP)) {

		if (!foo && (hostdata->flags & FLAG_DMA_FIXUP)) {

			/*

			 * Wait for the last byte to be sent.  If REQ is being asserted for

			 * the byte we're interested, we'll ACK it and it will go false.

drivers/scsi/NCR5380.h

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ 
#define NO_IRQ		0

#endif



#define FLAG_NO_DMA_FIXUP		1	/* No DMA errata workarounds */

#define FLAG_DMA_FIXUP			1	/* Use DMA errata workarounds */

#define FLAG_NO_PSEUDO_DMA		8	/* Inhibit DMA */

#define FLAG_LATE_DMA_SETUP		32	/* Setup NCR before DMA H/W */

#define FLAG_TAGGED_QUEUING		64	/* as X3T9.2 spelled it */

drivers/scsi/arm/cumana_1.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static int cumanascsi1_probe(struct expansion_card *ec, 


	host->irq = ec->irq;



	ret = NCR5380_init(host, 0);

	ret = NCR5380_init(host, FLAG_DMA_FIXUP);

	if (ret)

		goto out_unmap;

drivers/scsi/arm/oak.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static int oakscsi_probe(struct expansion_card *ec, const struct ecard_id *id) 
	host->irq = NO_IRQ;

	host->n_io_port = 255;



	ret = NCR5380_init(host, 0);

	ret = NCR5380_init(host, FLAG_DMA_FIXUP);

	if (ret)

		goto out_unmap;

drivers/scsi/dtc.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int __init dtc_detect(struct scsi_host_template * tpnt) 
		instance->base = addr;

		((struct NCR5380_hostdata *)(instance)->hostdata)->base = base;



		if (NCR5380_init(instance, FLAG_NO_DMA_FIXUP))

		if (NCR5380_init(instance, 0))

			goto out_unregister;



		NCR5380_maybe_reset_bus(instance);