ncr5380: Enable PDMA for DTC chips

Add I/O register mapping for DTC chips and enable PDMA mode.

These chips have 16-bit wide HOST BUFFER register and it must be read
by 16-bit accesses (we lose data otherwise).

Large PIO transfers crash at least the DTCT-436P chip (all reads result
in 0xFF) so this patch actually makes it work.

The chip also crashes when we bang on the C400 host status register too
heavily after PDMA write - a small udelay is needed.

Tested on DTCT-436P and verified that it does not break 53C400A.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 53e437744c4fc199314eda5f04bab489e6718315..87060c49693b5b36797fc1dac33eca148c67f812 100644 (file)
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -327,7 +327,7 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt)
                        ports = ncr_53c400a_ports;
                        break;
                case BOARD_DTC3181E:
-                       flags = FLAG_NO_PSEUDO_DMA;
+                       flags = FLAG_NO_DMA_FIXUP;
                        ports = dtc_3181e_ports;
                        break;
                }
@@ -400,6 +400,7 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt)
 #ifndef SCSI_G_NCR5380_MEM
                instance->io_port = overrides[current_override].NCR5380_map_name;
                instance->n_io_port = region_size;
+               hostdata->io_width = 1; /* 8-bit PDMA by default */
 
                /*
                 * On NCR53C400 boards, NCR5380 registers are mapped 8 past
@@ -412,6 +413,9 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt)
                        hostdata->c400_blk_cnt = 1;
                        hostdata->c400_host_buf = 4;
                        break;
+               case BOARD_DTC3181E:
+                       hostdata->io_width = 2; /* 16-bit PDMA */
+                       /* fall through */
                case BOARD_NCR53C400A:
                        hostdata->c400_ctl_status = 9;
                        hostdata->c400_blk_cnt = 10;
@@ -427,6 +431,7 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt)
                        hostdata->c400_blk_cnt = 0x101;
                        hostdata->c400_host_buf = 0x104;
                        break;
+               case BOARD_DTC3181E:
                case BOARD_NCR53C400A:
                        pr_err(DRV_MODULE_NAME ": unknown register offsets\n");
                        goto out_unregister;
@@ -438,6 +443,7 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt)
 
                switch (overrides[current_override].board) {
                case BOARD_NCR53C400:
+               case BOARD_DTC3181E:
                case BOARD_NCR53C400A:
                        NCR5380_write(hostdata->c400_ctl_status, CSR_BASE);
                }
@@ -565,7 +571,11 @@ static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst,
                        ; /* FIXME - no timeout */
 
 #ifndef SCSI_G_NCR5380_MEM
-               insb(instance->io_port + hostdata->c400_host_buf,
+               if (hostdata->io_width == 2)
+                       insw(instance->io_port + hostdata->c400_host_buf,
+                                                       dst + start, 64);
+               else
+                       insb(instance->io_port + hostdata->c400_host_buf,
                                                        dst + start, 128);
 #else
                /* implies SCSI_G_NCR5380_MEM */
@@ -581,7 +591,11 @@ static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst,
                        ; /* FIXME - no timeout */
 
 #ifndef SCSI_G_NCR5380_MEM
-               insb(instance->io_port + hostdata->c400_host_buf,
+               if (hostdata->io_width == 2)
+                       insw(instance->io_port + hostdata->c400_host_buf,
+                                                       dst + start, 64);
+               else
+                       insb(instance->io_port + hostdata->c400_host_buf,
                                                        dst + start, 128);
 #else
                /* implies SCSI_G_NCR5380_MEM */
@@ -639,7 +653,11 @@ static inline int NCR5380_pwrite(struct Scsi_Host *instance, unsigned char *src,
                while (NCR5380_read(hostdata->c400_ctl_status) & CSR_HOST_BUF_NOT_RDY)
                        ; // FIXME - timeout
 #ifndef SCSI_G_NCR5380_MEM
-               outsb(instance->io_port + hostdata->c400_host_buf,
+               if (hostdata->io_width == 2)
+                       outsw(instance->io_port + hostdata->c400_host_buf,
+                                                       src + start, 64);
+               else
+                       outsb(instance->io_port + hostdata->c400_host_buf,
                                                        src + start, 128);
 #else
                /* implies SCSI_G_NCR5380_MEM */
@@ -654,7 +672,11 @@ static inline int NCR5380_pwrite(struct Scsi_Host *instance, unsigned char *src,
                        ; // FIXME - no timeout
 
 #ifndef SCSI_G_NCR5380_MEM
-               outsb(instance->io_port + hostdata->c400_host_buf,
+               if (hostdata->io_width == 2)
+                       outsw(instance->io_port + hostdata->c400_host_buf,
+                                                       src + start, 64);
+               else
+                       outsb(instance->io_port + hostdata->c400_host_buf,
                                                        src + start, 128);
 #else
                /* implies SCSI_G_NCR5380_MEM */
@@ -675,8 +697,10 @@ static inline int NCR5380_pwrite(struct Scsi_Host *instance, unsigned char *src,
        /* All documentation says to check for this. Maybe my hardware is too
         * fast. Waiting for it seems to work fine! KLL
         */
-       while (!(i = NCR5380_read(hostdata->c400_ctl_status) & CSR_GATED_53C80_IRQ))
-               ;       // FIXME - no timeout
+       while (!(i = NCR5380_read(hostdata->c400_ctl_status) & CSR_GATED_53C80_IRQ)) {
+               udelay(4); /* DTC436 chip hangs without this */
+               /* FIXME - no timeout */
+       }
 
        /*
         * I know. i is certainly != 0 here but the loop is new. See previous

diff --git a/drivers/scsi/g_NCR5380.h b/drivers/scsi/g_NCR5380.h
index c5e57b7588c19b4763c5964828d319f448ec58a6..5ab64d96b5768bf60be056a9351dfdad4c9a5154 100644 (file)
--- a/drivers/scsi/g_NCR5380.h
+++ b/drivers/scsi/g_NCR5380.h
@@ -44,7 +44,8 @@
 #define NCR5380_implementation_fields \
        int c400_ctl_status; \
        int c400_blk_cnt; \
-       int c400_host_buf;
+       int c400_host_buf; \
+       int io_width;
 
 #else 
 /* therefore SCSI_G_NCR5380_MEM */