scsi/ncr5380: Expedite register polling
Subsystems (3)
PATCH 2/12 scsi/cumana_1: Remove unused cumanascsi_setup() function
In reply to a message not in the archive--- drivers/scsi/arm/cumana_1.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/scsi/arm/cumana_1.c +0 -4
@@ -33,10 +33,6 @@#include "../NCR5380.h" -void cumanascsi_setup (char *str,int *ints) -{ -} -#define CTRL 0x16fc#define STAT 0x2004#define L (v) (((v)<<16)|((v) & 0x0000ffff))
Signature · 1 line
2.7.3
PATCH 7/12 scsi/ncr5380: Store IO ports and addresses in host private data
In reply to a message not in the archiveThe various 5380 drivers inconsistently store register pointers either in the Scsi_Host struct "legacy crap" area or in special, board-specific members of the NCR5380_hostdata struct. Uniform use of the latter struct makes for simpler and faster code (see the following patches) and helps to reduce use of the NCR5380_implementation_fields macro.
--- drivers/scsi/NCR5380.c | 8 +++--- drivers/scsi/NCR5380.h | 5 ++++ drivers/scsi/arm/cumana_1.c | 60 ++++++++++++++++++++-------------------- drivers/scsi/arm/oak.c | 23 ++++++++-------- drivers/scsi/dmx3191d.c | 14 +++++++--- drivers/scsi/g_NCR5380.c | 67 +++++++++++++++++++++++---------------------- drivers/scsi/g_NCR5380.h | 6 ++-- drivers/scsi/mac_scsi.c | 27 ++++++++++-------- drivers/scsi/sun3_scsi.c | 5 +++- 9 files changed, 118 insertions(+), 97 deletions(-)
drivers/scsi/NCR5380.c +4 -4
@@ -437,14 +437,14 @@ static void prepare_info(struct Scsi_Host *instance)struct NCR5380_hostdata *hostdata =shost_priv (instance); snprintf(hostdata->info, sizeof(hostdata->info), - "%s, io_port 0x%lx, n_io_port %d, " - "base 0x%lx, irq %d, " + "%s, irq %d, " + "io_port 0x%lx, base 0x%lx, " "can_queue %d, cmd_per_lun %d, " "sg_tablesize %d, this_id %d, " "flags { %s%s%s}, " "options { %s} ", - instance->hostt->name, instance->io_port, instance->n_io_port, - instance->base, instance->irq, + instance->hostt->name, instance->irq, + hostdata->io_port, hostdata->base, instance->can_queue, instance->cmd_per_lun, instance->sg_tablesize, instance->this_id, hostdata->flags & FLAG_DMA_FIXUP ? "DMA_FIXUP " : "",
drivers/scsi/NCR5380.h +5 -0
@@ -220,6 +220,9 @@struct NCR5380_hostdata {NCR5380_implementation_fields ;/* Board-specific data */ +u8 __iomem *io;/* Remapped 5380 address */ +u8 __iomem *pdma_io;/* Remapped PDMA address */ +unsigned long io_port;/* Device IO port */ unsigned long poll_loops;/* Register polling limit */ spinlock_t lock;/* Protects this struct */ struct scsi_cmnd *connected;/* Currently connected cmnd */
@@ -239,6 +242,8 @@ struct NCR5380_hostdata {unsigned char id_mask;/* 1 << Host ID */ unsigned char id_higher_mask;/* All bits above id_mask */ unsigned char last_message;/* Last Message Out */ +unsigned long base;/* Device base address */ +unsigned long region_size;/* Size of address/port range */ char info[256 ]; };
drivers/scsi/arm/cumana_1.c +31 -29
180 lines not on this page · raw message
drivers/scsi/arm/oak.c +11 -12
@@ -17,9 +17,9 @@#define priv (host) ((struct NCR5380_hostdata *)(host)->hostdata)#define NCR5380_read (reg) \ - readb(priv(instance)->base + ((reg) << 2)) + readb(priv(instance)->io + ((reg) << 2))#define NCR5380_write (reg, value) \ - writeb(value, priv(instance)->base + ((reg) << 2)) + writeb(value, priv(instance)->io + ((reg) << 2))#define NCR5380_dma_xfer_len (instance, cmd, phase) (0)#define NCR5380_dma_recv_setup oakscsi_pread
@@ -29,8 +29,7 @@#define NCR5380_queue_command oakscsi_queue_command#define NCR5380_info oakscsi_info -#define NCR5380_implementation_fields \ - void __iomem *base +#define NCR5380_implementation_fields/* none */ #include "../NCR5380.h"
@@ -43,7 +42,7 @@static inline int oakscsi_pwrite (struct Scsi_Host *instance,unsigned char *addr,int len) { -void __iomem *base =priv (instance)->base; +u8 __iomem *base =priv (instance)->io;printk ("writing %p len %d\n" ,addr, len);
@@ -58,7 +57,7 @@ printk("writing %p len %d\n",addr, len);static inline int oakscsi_pread (struct Scsi_Host *instance,unsigned char *addr,int len) { -void __iomem *base =priv (instance)->base; +u8 __iomem *base =priv (instance)->io;printk ("reading %p len %d\n" , addr, len);while (len >0 ) {
@@ -133,15 +132,14 @@ static int oakscsi_probe(struct expansion_card *ec, const struct ecard_id *id) goto release; } -priv (host)->base =ioremap (ecard_resource_start (ec,ECARD_RES_MEMC ), -ecard_resource_len (ec,ECARD_RES_MEMC )); -if (!priv (host)->base) { +priv (host)->io =ioremap (ecard_resource_start (ec,ECARD_RES_MEMC ), +ecard_resource_len (ec,ECARD_RES_MEMC )); +if (!priv (host)->io) { ret = -ENOMEM ; goto unreg; } host->irq =NO_IRQ ; - host->n_io_port =255 ; ret =NCR5380_init (host,FLAG_DMA_FIXUP |FLAG_LATE_DMA_SETUP );if (ret)
@@ -159,7 +157,7 @@ static int oakscsi_probe(struct expansion_card *ec, const struct ecard_id *id) out_exit:NCR5380_exit (host); out_unmap: -iounmap (priv (host)->base); +iounmap (priv (host)->io); unreg:scsi_host_put (host); release:
@@ -171,13 +169,14 @@ static int oakscsi_probe(struct expansion_card *ec, const struct ecard_id *id)static void oakscsi_remove (struct expansion_card *ec) {struct Scsi_Host *host =ecard_get_drvdata (ec); +void __iomem *base =priv (host)->io;ecard_set_drvdata (ec,NULL );scsi_remove_host (host);NCR5380_exit (host); -iounmap (priv (host)->base);scsi_host_put (host); +iounmap (base);ecard_release_resources (ec); }
drivers/scsi/dmx3191d.c +10 -4
@@ -34,8 +34,10 @@* Definitions for the generic 5380 driver. */ -#define NCR5380_read (reg) inb(instance->io_port + reg) -#define NCR5380_write (reg, value) outb(value, instance->io_port + reg) +#define priv (instance) ((struct NCR5380_hostdata *)shost_priv(instance)) + +#define NCR5380_read (reg) inb(priv(instance)->base + (reg)) +#define NCR5380_write (reg, value) outb(value, priv(instance)->base + (reg))#define NCR5380_dma_xfer_len (instance, cmd, phase) (0)#define NCR5380_dma_recv_setup (instance, dst, len) (0)
@@ -71,6 +73,7 @@ static int dmx3191d_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) {struct Scsi_Host *shost; +struct NCR5380_hostdata *hostdata;unsigned long io;int error = -ENODEV ;
@@ -88,7 +91,9 @@ static int dmx3191d_probe_one(struct pci_dev *pdev, sizeof(struct NCR5380_hostdata));if (!shost) goto out_release_region; - shost->io_port = io; + + hostdata =shost_priv (shost); + hostdata->base = io;/* This card does not seem to raise an interrupt on pdev->irq. * Steam-powered SCSI controllers run without an IRQ anyway.
@@ -125,7 +130,8 @@ out_host_put:static void dmx3191d_remove_one (struct pci_dev *pdev) {struct Scsi_Host *shost =pci_get_drvdata (pdev); -unsigned long io = shost->io_port; +struct NCR5380_hostdata *hostdata =shost_priv (shost); +unsigned long io = hostdata->base;scsi_remove_host (shost);
drivers/scsi/g_NCR5380.c +35 -32
143 lines not on this page · raw message
drivers/scsi/g_NCR5380.h +2 -4
@@ -17,18 +17,16 @@#define DRV_MODULE_NAME "g_NCR5380"#define NCR5380_read (reg) \ - ioread8(((struct NCR5380_hostdata *)shost_priv(instance))->iomem + \ + ioread8(((struct NCR5380_hostdata *)shost_priv(instance))->io + \ ((struct NCR5380_hostdata *)shost_priv(instance))->offset + \ (reg))#define NCR5380_write (reg, value) \ - iowrite8(value, ((struct NCR5380_hostdata *)shost_priv(instance))->iomem + \ + iowrite8(value, ((struct NCR5380_hostdata *)shost_priv(instance))->io + \ ((struct NCR5380_hostdata *)shost_priv(instance))->offset + \ (reg))#define NCR5380_implementation_fields \ int offset; \ - void __iomem *iomem; \ - resource_size_t iomem_size; \ int c400_ctl_status; \ int c400_blk_cnt; \ int c400_host_buf; \
drivers/scsi/mac_scsi.c +16 -11
@@ -28,8 +28,7 @@/* Definitions for the core NCR5380 driver. */ -#define NCR5380_implementation_fields unsigned char *pdma_base; \ - int pdma_residual +#define NCR5380_implementation_fields int pdma_residual#define NCR5380_read (reg) macscsi_read(instance, reg)#define NCR5380_write (reg, value) macscsi_write(instance, reg, value)
@@ -67,12 +66,16 @@ module_param(setup_toshiba_delay, int, 0);static inline char macscsi_read (struct Scsi_Host *instance,int reg) { -return in_8 (instance->base + (reg <<4 )); +struct NCR5380_hostdata *hostdata =shost_priv (instance); + +return in_8 (hostdata->io + (reg <<4 )); }static inline void macscsi_write (struct Scsi_Host *instance,int reg,int value) { -out_8 (instance->base + (reg <<4 ), value); +struct NCR5380_hostdata *hostdata =shost_priv (instance); + +out_8 (hostdata->io + (reg <<4 ), value); }#ifndef MODULE
@@ -171,7 +174,7 @@ static int macscsi_pread(struct Scsi_Host *instance, unsigned char *dst, int len) {struct NCR5380_hostdata *hostdata =shost_priv (instance); -unsigned char *s = hostdata->pdma_base + (INPUT_DATA_REG <<4 ); +unsigned char *s = hostdata->pdma_io + (INPUT_DATA_REG <<4 );unsigned char *d = dst;int n = len;int transferred;
@@ -275,7 +278,7 @@ static int macscsi_pwrite(struct Scsi_Host *instance, {struct NCR5380_hostdata *hostdata =shost_priv (instance);unsigned char *s = src; -unsigned char *d = hostdata->pdma_base + (OUTPUT_DATA_REG <<4 ); +unsigned char *d = hostdata->pdma_io + (OUTPUT_DATA_REG <<4 );int n = len;int transferred;
@@ -356,6 +359,7 @@ static struct scsi_host_template mac_scsi_template = {static int __init mac_scsi_probe (struct platform_device *pdev) {struct Scsi_Host *instance; +struct NCR5380_hostdata *hostdata;int error;int host_flags =0 ;struct resource *irq, *pio_mem, *pdma_mem =NULL ;
@@ -388,17 +392,18 @@ static int __init mac_scsi_probe(struct platform_device *pdev)if (!instance)return -ENOMEM ; - instance->base = pio_mem->start;if (irq) instance->irq = irq->start;else instance->irq =NO_IRQ ; -if (pdma_mem && setup_use_pdma) { -struct NCR5380_hostdata *hostdata =shost_priv (instance); + hostdata =shost_priv (instance); + hostdata->base = pio_mem->start; + hostdata->io = (void *)pio_mem->start; - hostdata->pdma_base = (unsigned char *)pdma_mem->start; - }else +if (pdma_mem && setup_use_pdma) + hostdata->pdma_io = (void *)pdma_mem->start; +else host_flags |=FLAG_NO_PSEUDO_DMA ; host_flags |= setup_toshiba_delay >0 ?FLAG_TOSHIBA_DELAY :0 ;
drivers/scsi/sun3_scsi.c +4 -1
@@ -428,6 +428,7 @@ static struct scsi_host_template sun3_scsi_template = {static int __init sun3_scsi_probe (struct platform_device *pdev) {struct Scsi_Host *instance; +struct NCR5380_hostdata *hostdata;int error;struct resource *irq, *mem;unsigned char *ioaddr;
@@ -502,9 +503,11 @@ static int __init sun3_scsi_probe(struct platform_device *pdev) goto fail_alloc; } - instance->io_port = (unsigned long )ioaddr; instance->irq = irq->start; + hostdata =shost_priv (instance); + hostdata->base = (unsigned long )ioaddr; + error =NCR5380_init (instance, host_flags);if (error) goto fail_init;
Signature · 1 line
2.7.3
PATCH 8/12 scsi/ncr5380: Use correct types for device register accessors
In reply to a message not in the archiveFor timeout values adopt unsigned long, which is the type of jiffies etc.
For chip register values and bit masks pass u8, which is the return type of readb, inb etc.
For device register offsets adopt unsigned int, as it is suitable for adding to base addresses.
Pass the NCR5380_hostdata pointer to the board-specific routines instead of the Scsi_Host pointer. The board-specific code is concerned with hardware and not with SCSI protocol or the mid-layer.
--- drivers/scsi/NCR5380.c | 10 ++++++++-- drivers/scsi/NCR5380.h | 7 +++++-- drivers/scsi/arm/cumana_1.c | 20 +++++++++++--------- drivers/scsi/arm/oak.c | 6 ++---- drivers/scsi/atari_scsi.c | 16 ++++++++-------- drivers/scsi/dmx3191d.c | 6 ++---- drivers/scsi/g_NCR5380.h | 8 ++------ drivers/scsi/mac_scsi.c | 22 ++-------------------- drivers/scsi/sun3_scsi.c | 32 +++++++++----------------------- 9 files changed, 49 insertions(+), 78 deletions(-)
drivers/scsi/NCR5380.c +8 -2
@@ -196,8 +196,9 @@ static inline void initialize_SCp(struct scsi_cmnd *cmd)*/ static int NCR5380_poll_politely2 (struct Scsi_Host *instance, -int reg1,int bit1,int val1, -int reg2,int bit2,int val2,int wait) +unsigned int reg1,u8 bit1,u8 val1, +unsigned int reg2,u8 bit2,u8 val2, +unsigned long wait) {struct NCR5380_hostdata *hostdata =shost_priv (instance);unsigned long n = hostdata->poll_loops;
@@ -284,6 +285,7 @@ mrs[] = {static void NCR5380_print (struct Scsi_Host *instance) { +struct NCR5380_hostdata *hostdata =shost_priv (instance);unsigned char status, data, basr, mr, icr, i; data =NCR5380_read (CURRENT_SCSI_DATA_REG );
@@ -333,6 +335,7 @@ static struct {static void NCR5380_print_phase (struct Scsi_Host *instance) { +struct NCR5380_hostdata *hostdata =shost_priv (instance);unsigned char status;int i;
@@ -1316,6 +1319,7 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, unsigned char *phase, int *count, unsigned char **data) { + struct NCR5380_hostdata *hostdata = shost_priv(instance);unsigned char p = *phase, tmp;int c = *count;unsigned char *d = *data;
@@ -1438,6 +1442,7 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance,static void do_reset (struct Scsi_Host *instance) { +struct NCR5380_hostdata __maybe_unused *hostdata =shost_priv (instance);unsigned long flags;local_irq_save (flags);
@@ -1460,6 +1465,7 @@ static void do_reset(struct Scsi_Host *instance)static int do_abort (struct Scsi_Host *instance) { +struct NCR5380_hostdata *hostdata =shost_priv (instance);unsigned char *msgptr, phase, tmp;int len;int rc;
drivers/scsi/NCR5380.h +5 -2
@@ -302,10 +302,13 @@ static void NCR5380_reselect(struct Scsi_Host *instance);static struct scsi_cmnd *NCR5380_select (struct Scsi_Host *,struct scsi_cmnd *);static int NCR5380_transfer_dma (struct Scsi_Host *instance,unsigned char *phase,int *count,unsigned char **data);static int NCR5380_transfer_pio (struct Scsi_Host *instance,unsigned char *phase,int *count,unsigned char **data); -static int NCR5380_poll_politely2 (struct Scsi_Host *,int ,int ,int ,int ,int ,int ,int ); +static int NCR5380_poll_politely2 (struct Scsi_Host *, +unsigned int ,u8 ,u8 , +unsigned int ,u8 ,u8 ,unsigned long );static inline int NCR5380_poll_politely (struct Scsi_Host *instance, -int reg,int bit,int val,int wait) +unsigned int reg,u8 bit,u8 val, +unsigned long wait) {return NCR5380_poll_politely2 (instance, reg, bit, val, reg, bit, val, wait);
drivers/scsi/arm/cumana_1.c +11 -9
@@ -14,8 +14,8 @@#include <scsi/scsi_host.h> #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_read (reg) cumanascsi_read(hostdata, reg) +#define NCR5380_write (reg, value) cumanascsi_write(hostdata, reg, value)#define NCR5380_dma_xfer_len (instance, cmd, phase) (cmd->transfersize)#define NCR5380_dma_recv_setup cumanascsi_pread
@@ -169,30 +169,32 @@ end:return 0 ; } -static unsigned char cumanascsi_read (struct Scsi_Host *host,unsigned int reg) +static u8 cumanascsi_read (struct NCR5380_hostdata *hostdata, +unsigned int reg) { -u8 __iomem *base =priv (host)->io; -unsigned char val; +u8 __iomem *base = hostdata->io; +u8 val;writeb (0 , base +CTRL ); val =readb (base +0x2100 + (reg <<2 )); -priv (host)->ctrl =0x40 ; + hostdata->ctrl =0x40 ;writeb (0x40 , base +CTRL );return val; } -static void cumanascsi_write (struct Scsi_Host *host,unsigned int reg,unsigned int value) +static void cumanascsi_write (struct NCR5380_hostdata *hostdata, +unsigned int reg,u8 value) { -u8 __iomem *base =priv (host)->io; +u8 __iomem *base = hostdata->io;writeb (0 , base +CTRL );writeb (value, base +0x2100 + (reg <<2 )); -priv (host)->ctrl =0x40 ; + hostdata->ctrl =0x40 ;writeb (0x40 , base +CTRL ); }
drivers/scsi/arm/oak.c +2 -4
@@ -16,10 +16,8 @@#define priv (host) ((struct NCR5380_hostdata *)(host)->hostdata) -#define NCR5380_read (reg) \ - readb(priv(instance)->io + ((reg) << 2)) -#define NCR5380_write (reg, value) \ - writeb(value, priv(instance)->io + ((reg) << 2)) +#define NCR5380_read (reg) readb(hostdata->io + ((reg) << 2)) +#define NCR5380_write (reg, value) writeb(value, hostdata->io + ((reg) << 2))#define NCR5380_dma_xfer_len (instance, cmd, phase) (0)#define NCR5380_dma_recv_setup oakscsi_pread
drivers/scsi/atari_scsi.c +8 -8
@@ -126,8 +126,8 @@ static inline unsigned long SCSI_DMA_GETADR(void)static void atari_scsi_fetch_restbytes (void ); -static unsigned char (*atari_scsi_reg_read)(unsigned char reg); -static void (*atari_scsi_reg_write)(unsigned char reg,unsigned char value); +static u8 (*atari_scsi_reg_read)(unsigned int ); +static void (*atari_scsi_reg_write)(unsigned int ,u8 );static unsigned long atari_dma_residual, atari_dma_startaddr;static short atari_dma_active;
@@ -658,30 +658,30 @@ static unsigned long atari_dma_xfer_len(unsigned long wanted_len,* NCR5380_write call these functions via function pointers. */ -static unsigned char atari_scsi_tt_reg_read (unsigned char reg) +static u8 atari_scsi_tt_reg_read (unsigned int reg) {return tt_scsi_regp[reg *2 ]; } -static void atari_scsi_tt_reg_write (unsigned char reg,unsigned char value) +static void atari_scsi_tt_reg_write (unsigned int reg,u8 value) { tt_scsi_regp[reg *2 ] = value; } -static unsigned char atari_scsi_falcon_reg_read (unsigned char reg) +static u8 atari_scsi_falcon_reg_read (unsigned int reg) {unsigned long flags; -unsigned char result; +u8 result; reg +=0x88 ;local_irq_save (flags); dma_wd.dma_mode_status = (u_short )reg; - result = (u_char )dma_wd.fdc_acces_seccount; + result = (u8 )dma_wd.fdc_acces_seccount;local_irq_restore (flags);return result; } -static void atari_scsi_falcon_reg_write (unsigned char reg,unsigned char value) +static void atari_scsi_falcon_reg_write (unsigned int reg,u8 value) {unsigned long flags;
drivers/scsi/dmx3191d.c +2 -4
@@ -34,10 +34,8 @@* Definitions for the generic 5380 driver. */ -#define priv (instance) ((struct NCR5380_hostdata *)shost_priv(instance)) - -#define NCR5380_read (reg) inb(priv(instance)->base + (reg)) -#define NCR5380_write (reg, value) outb(value, priv(instance)->base + (reg)) +#define NCR5380_read (reg) inb(hostdata->base + (reg)) +#define NCR5380_write (reg, value) outb(value, hostdata->base + (reg))#define NCR5380_dma_xfer_len (instance, cmd, phase) (0)#define NCR5380_dma_recv_setup (instance, dst, len) (0)
drivers/scsi/g_NCR5380.h +2 -6
@@ -17,13 +17,9 @@#define DRV_MODULE_NAME "g_NCR5380"#define NCR5380_read (reg) \ - ioread8(((struct NCR5380_hostdata *)shost_priv(instance))->io + \ - ((struct NCR5380_hostdata *)shost_priv(instance))->offset + \ - (reg)) + ioread8(hostdata->io + hostdata->offset + (reg))#define NCR5380_write (reg, value) \ - iowrite8(value, ((struct NCR5380_hostdata *)shost_priv(instance))->io + \ - ((struct NCR5380_hostdata *)shost_priv(instance))->offset + \ - (reg)) + iowrite8(value, hostdata->io + hostdata->offset + (reg))#define NCR5380_implementation_fields \ int offset; \
drivers/scsi/mac_scsi.c +2 -20
@@ -30,8 +30,8 @@#define NCR5380_implementation_fields int pdma_residual -#define NCR5380_read (reg) macscsi_read(instance, reg) -#define NCR5380_write (reg, value) macscsi_write(instance, reg, value) +#define NCR5380_read (reg) in_8(hostdata->io + ((reg) << 4)) +#define NCR5380_write (reg, value) out_8(hostdata->io + ((reg) << 4), value)#define NCR5380_dma_xfer_len (instance, cmd, phase) \ macscsi_dma_xfer_len(instance, cmd)
@@ -60,24 +60,6 @@ module_param(setup_hostid, int, 0);static int setup_toshiba_delay =-1 ;module_param (setup_toshiba_delay, int,0 ); -/* -* NCR 5380 register access functions -*/ - -static inline char macscsi_read (struct Scsi_Host *instance,int reg) -{ -struct NCR5380_hostdata *hostdata =shost_priv (instance); - -return in_8 (hostdata->io + (reg <<4 )); -} - -static inline void macscsi_write (struct Scsi_Host *instance,int reg,int value) -{ -struct NCR5380_hostdata *hostdata =shost_priv (instance); - -out_8 (hostdata->io + (reg <<4 ), value); -} -#ifndef MODULE static int __init mac_scsi_setup (char *str) {
drivers/scsi/sun3_scsi.c +9 -23
@@ -43,8 +43,8 @@#define NCR5380_implementation_fields/* none */ -#define NCR5380_read (reg) sun3scsi_read(reg) -#define NCR5380_write (reg, value) sun3scsi_write(reg, value) +#define NCR5380_read (reg) in_8(hostdata->io + (reg)) +#define NCR5380_write (reg, value) out_8(hostdata->io + (reg), value)#define NCR5380_queue_command sun3scsi_queue_command#define NCR5380_bus_reset sun3scsi_bus_reset
@@ -82,7 +82,6 @@ module_param(setup_hostid, int, 0);#define SUN3_DVMA_BUFSIZE 0xe000static struct scsi_cmnd *sun3_dma_setup_done; -static unsigned char *sun3_scsi_regp;static volatile struct sun3_dma_regs *dregs;static struct sun3_udc_regs *udc_regs;static unsigned char *sun3_dma_orig_addr;
@@ -90,20 +89,6 @@ static unsigned long sun3_dma_orig_count;static int sun3_dma_active;static unsigned long last_residual; -/* -* NCR 5380 register access functions -*/ - -static inline unsigned char sun3scsi_read (int reg) -{ -return in_8 (sun3_scsi_regp + reg); -} - -static inline void sun3scsi_write (int reg,int value) -{ -out_8 (sun3_scsi_regp + reg, value); -} -#ifndef SUN3_SCSI_VME /* dma controller register access functions */
@@ -431,7 +416,7 @@ static int __init sun3_scsi_probe(struct platform_device *pdev)struct NCR5380_hostdata *hostdata;int error;struct resource *irq, *mem; -unsigned char *ioaddr; +void __iomem *ioaddr;int host_flags =0 ;#ifdef SUN3_SCSI_VME int i;
@@ -494,8 +479,6 @@ static int __init sun3_scsi_probe(struct platform_device *pdev) }#endif - sun3_scsi_regp = ioaddr; - instance =scsi_host_alloc (&sun3_scsi_template,sizeof (struct NCR5380_hostdata ));if (!instance) {
@@ -506,7 +489,8 @@ static int __init sun3_scsi_probe(struct platform_device *pdev) instance->irq = irq->start; hostdata =shost_priv (instance); - hostdata->base = (unsigned long )ioaddr; + hostdata->base = mem->start; + hostdata->io = ioaddr; error =NCR5380_init (instance, host_flags);if (error)
@@ -555,13 +539,15 @@ fail_init: fail_alloc:if (udc_regs)dvma_free (udc_regs); -iounmap (sun3_scsi_regp); +iounmap (ioaddr);return error; } static int __exit sun3_scsi_remove(struct platform_device *pdev) {struct Scsi_Host *instance =platform_get_drvdata (pdev); +struct NCR5380_hostdata *hostdata =shost_priv (instance); +void __iomem *ioaddr = hostdata->io;scsi_remove_host (instance);free_irq (instance->irq, instance);
@@ -569,7 +555,7 @@ static int __exit sun3_scsi_remove(struct platform_device *pdev)scsi_host_put (instance);if (udc_regs)dvma_free (udc_regs); -iounmap (sun3_scsi_regp); +iounmap (ioaddr);return 0 ; }
Signature · 1 line
2.7.3
PATCH 10/12 scsi/ncr5380: Expedite register polling
In reply to a message not in the archiveAvoid the call to NCR5380_poll_politely2() when possible. The call is easily short-circuited on the PIO fast path, using the inline wrapper. This requires that the NCR5380_read macro be made available before any #include "NCR5380.h" so a few declarations have to be moved too.
--- drivers/scsi/NCR5380.h | 3 +++ drivers/scsi/arm/cumana_1.c | 4 ++++ drivers/scsi/atari_scsi.c | 6 +++--- 3 files changed, 10 insertions(+), 3 deletions(-)
drivers/scsi/NCR5380.h +3 -0
@@ -310,6 +310,9 @@ static inline int NCR5380_poll_politely(struct NCR5380_hostdata *hostdata, unsigned int reg, u8 bit, u8 val, unsigned long wait) { + if ((NCR5380_read(reg) & bit) == val) + return 0; +return NCR5380_poll_politely2 (hostdata, reg, bit, val, reg, bit, val, wait); }
drivers/scsi/arm/cumana_1.c +4 -0
@@ -29,6 +29,10 @@#define NCR5380_implementation_fields \ unsigned ctrl +struct NCR5380_hostdata ; +static u8 cumanascsi_read (struct NCR5380_hostdata *,unsigned int ); +static void cumanascsi_write (struct NCR5380_hostdata *,unsigned int ,u8 ); +#include "../NCR5380.h" #define CTRL 0x16fc
drivers/scsi/atari_scsi.c +3 -3
@@ -57,6 +57,9 @@#define NCR5380_implementation_fields/* none */ +static u8 (*atari_scsi_reg_read)(unsigned int ); +static void (*atari_scsi_reg_write)(unsigned int ,u8 ); +#define NCR5380_read (reg) atari_scsi_reg_read(reg)#define NCR5380_write (reg, value) atari_scsi_reg_write(reg, value)
@@ -126,9 +129,6 @@ static inline unsigned long SCSI_DMA_GETADR(void)static void atari_scsi_fetch_restbytes (void ); -static u8 (*atari_scsi_reg_read)(unsigned int ); -static void (*atari_scsi_reg_write)(unsigned int ,u8 ); -static unsigned long atari_dma_residual, atari_dma_startaddr;static short atari_dma_active;/* pointer to the dribble buffer */
Signature · 1 line
2.7.3
PATCH 11/12 scsi/ncr5380: Use correct types for DMA routines
In reply to a message not in the archiveApply prototypes to get consistent function signatures for the DMA functions implemented in the board-specific drivers. To avoid using macros to alter actual parameters, some of those functions are reworked slightly.
This is a step toward the goal of passing the board-specific routines to the core driver using an ops struct (as in a platform driver or library module).
This also helps fix some inconsistent types: where the core driver uses ints (cmd->SCp.this_residual and hostdata->dma_len) for keeping track of transfers, certain board-specific routines used unsigned long.
While we are fixing these function signatures, pass the hostdata pointer to DMA routines instead of a Scsi_Host pointer, for shorter and faster code.
--- drivers/scsi/NCR5380.c | 74 +++++++++++++++++++++++++-------------------- drivers/scsi/NCR5380.h | 25 +++++++++++++++ drivers/scsi/arm/cumana_1.c | 26 ++++++++++------ drivers/scsi/arm/oak.c | 13 ++++---- drivers/scsi/atari_scsi.c | 45 +++++++++++++++------------ drivers/scsi/dmx3191d.c | 8 ++--- drivers/scsi/g_NCR5380.c | 13 +++----- drivers/scsi/g_NCR5380.h | 5 ++- drivers/scsi/mac_scsi.c | 36 +++++++++++----------- drivers/scsi/sun3_scsi.c | 45 +++++++++++++++++++-------- 10 files changed, 176 insertions(+), 114 deletions(-)
drivers/scsi/NCR5380.c +41 -33
@@ -121,9 +121,10 @@* * Either real DMA *or* pseudo DMA may be implemented * -* NCR5380_dma_write_setup(instance, src, count) - initialize -* NCR5380_dma_read_setup(instance, dst, count) - initialize -* NCR5380_dma_residual(instance); - residual count +* NCR5380_dma_xfer_len - determine size of DMA/PDMA transfer +* NCR5380_dma_send_setup - execute DMA/PDMA from memory to 5380 +* NCR5380_dma_recv_setup - execute DMA/PDMA from 5380 to memory +* NCR5380_dma_residual - residual byte count * * The generic driver is initialized by calling NCR5380_init(instance), * after setting the appropriate host specific fields and ID. If the
@@ -871,7 +872,7 @@ static void NCR5380_dma_complete(struct Scsi_Host *instance)NCR5380_write (INITIATOR_COMMAND_REG ,ICR_BASE );NCR5380_read (RESET_PARITY_INTERRUPT_REG ); - transferred = hostdata->dma_len -NCR5380_dma_residual (instance); + transferred = hostdata->dma_len -NCR5380_dma_residual (hostdata); hostdata->dma_len =0 ; data = (unsigned char **)&hostdata->connected->SCp.ptr;
@@ -1578,9 +1579,9 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance,* starting the NCR. This is also the cleaner way for the TT. */ if (p &SR_IO ) - result =NCR5380_dma_recv_setup (instance, d, c); + result =NCR5380_dma_recv_setup (hostdata, d, c);else - result =NCR5380_dma_send_setup (instance, d, c); + result =NCR5380_dma_send_setup (hostdata, d, c); }/*
@@ -1612,9 +1613,9 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance,* NCR access, else the DMA setup gets trashed! */ if (p &SR_IO ) - result =NCR5380_dma_recv_setup (instance, d, c); + result =NCR5380_dma_recv_setup (hostdata, d, c);else - result =NCR5380_dma_send_setup (instance, d, c); + result =NCR5380_dma_send_setup (hostdata, d, c); }/* On failure, NCR5380_dma_xxxx_setup() returns a negative int. */
@@ -1754,22 +1755,26 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)NCR5380_dprint_phase (NDEBUG_INFORMATION , instance); }#ifdef CONFIG_SUN3 -if (phase ==PHASE_CMDOUT ) { -void *d; -unsigned long count; +if (phase ==PHASE_CMDOUT && + sun3_dma_setup_done != cmd) { +int count;if (!cmd->SCp.this_residual && cmd->SCp.buffers_residual) { - count = cmd->SCp.buffer->length; - d =sg_virt (cmd->SCp.buffer); - }else { - count = cmd->SCp.this_residual; - d = cmd->SCp.ptr; + ++cmd->SCp.buffer; + --cmd->SCp.buffers_residual; + cmd->SCp.this_residual = cmd->SCp.buffer->length; + cmd->SCp.ptr =sg_virt (cmd->SCp.buffer); } -if (sun3_dma_setup_done != cmd && -sun3scsi_dma_xfer_len (count, cmd) >0 ) { -sun3scsi_dma_setup (instance, d, count, -rq_data_dir (cmd->request)); + count =sun3scsi_dma_xfer_len (hostdata, cmd); + +if (count >0 ) { +if (rq_data_dir (cmd->request)) +sun3scsi_dma_send_setup (hostdata, + cmd->SCp.ptr, count); +else +sun3scsi_dma_recv_setup (hostdata, + cmd->SCp.ptr, count); sun3_dma_setup_done = cmd; }#ifdef SUN3_SCSI_VME
@@ -1830,7 +1835,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) transfersize =0 ;if (!cmd->device->borken) - transfersize =NCR5380_dma_xfer_len (instance, cmd, phase); + transfersize =NCR5380_dma_xfer_len (hostdata, cmd);if (transfersize >0 ) { len = transfersize;
@@ -2207,22 +2212,25 @@ static void NCR5380_reselect(struct Scsi_Host *instance) }#ifdef CONFIG_SUN3 - { -void *d; -unsigned long count; +if (sun3_dma_setup_done != tmp) { +int count;if (!tmp->SCp.this_residual && tmp->SCp.buffers_residual) { - count = tmp->SCp.buffer->length; - d =sg_virt (tmp->SCp.buffer); - }else { - count = tmp->SCp.this_residual; - d = tmp->SCp.ptr; + ++tmp->SCp.buffer; + --tmp->SCp.buffers_residual; + tmp->SCp.this_residual = tmp->SCp.buffer->length; + tmp->SCp.ptr =sg_virt (tmp->SCp.buffer); } -if (sun3_dma_setup_done != tmp && -sun3scsi_dma_xfer_len (count, tmp) >0 ) { -sun3scsi_dma_setup (instance, d, count, -rq_data_dir (tmp->request)); + count =sun3scsi_dma_xfer_len (hostdata, tmp); + +if (count >0 ) { +if (rq_data_dir (tmp->request)) +sun3scsi_dma_send_setup (hostdata, + tmp->SCp.ptr, count); +else +sun3scsi_dma_recv_setup (hostdata, + tmp->SCp.ptr, count); sun3_dma_setup_done = tmp; } }
drivers/scsi/NCR5380.h +25 -0
@@ -317,5 +317,30 @@ static inline int NCR5380_poll_politely(struct NCR5380_hostdata *hostdata, reg, bit, val, wait); } +static int NCR5380_dma_xfer_len (struct NCR5380_hostdata *, +struct scsi_cmnd *); +static int NCR5380_dma_send_setup (struct NCR5380_hostdata *, +unsigned char *,int ); +static int NCR5380_dma_recv_setup (struct NCR5380_hostdata *, +unsigned char *,int ); +static int NCR5380_dma_residual (struct NCR5380_hostdata *); + +static inline int NCR5380_dma_xfer_none (struct NCR5380_hostdata *hostdata, +struct scsi_cmnd *cmd) +{ +return 0 ; +} + +static inline int NCR5380_dma_setup_none (struct NCR5380_hostdata *hostdata, +unsigned char *data,int count) +{ +return 0 ; +} + +static inline int NCR5380_dma_residual_none (struct NCR5380_hostdata *hostdata) +{ +return 0 ; +} +#endif /* __KERNEL__ */ #endif /* NCR5380_H */
drivers/scsi/arm/cumana_1.c +16 -10
@@ -17,10 +17,10 @@#define NCR5380_read (reg) cumanascsi_read(hostdata, reg)#define NCR5380_write (reg, value) cumanascsi_write(hostdata, reg, value) -#define NCR5380_dma_xfer_len (instance, cmd, phase) (cmd->transfersize) +#define NCR5380_dma_xfer_len cumanascsi_dma_xfer_len#define NCR5380_dma_recv_setup cumanascsi_pread#define NCR5380_dma_send_setup cumanascsi_pwrite -#define NCR5380_dma_residual (instance) (0) +#define NCR5380_dma_residual NCR5380_dma_residual_none#define NCR5380_intr cumanascsi_intr#define NCR5380_queue_command cumanascsi_queue_command
@@ -40,12 +40,12 @@ static void cumanascsi_write(struct NCR5380_hostdata *, unsigned int, u8);#define L (v) (((v)<<16)|((v) & 0x0000ffff))#define H (v) (((v)>>16)|((v) & 0xffff0000)) -static inline int cumanascsi_pwrite (struct Scsi_Host *host, +static inline int cumanascsi_pwrite (struct NCR5380_hostdata *hostdata,unsigned char *addr,int len) {unsigned long *laddr; -u8 __iomem *base =priv (host)->io; -u8 __iomem *dma =priv (host)->pdma_io +0x2000 ; +u8 __iomem *base = hostdata->io; +u8 __iomem *dma = hostdata->pdma_io +0x2000 ;if (!len)return 0 ;
@@ -100,19 +100,19 @@ static inline int cumanascsi_pwrite(struct Scsi_Host *host, } } end: -writeb (priv (host)->ctrl |0x40 , base +CTRL ); +writeb (hostdata->ctrl |0x40 , base +CTRL );if (len)return -1 ;return 0 ; } -static inline int cumanascsi_pread (struct Scsi_Host *host, +static inline int cumanascsi_pread (struct NCR5380_hostdata *hostdata,unsigned char *addr,int len) {unsigned long *laddr; -u8 __iomem *base =priv (host)->io; -u8 __iomem *dma =priv (host)->pdma_io +0x2000 ; +u8 __iomem *base = hostdata->io; +u8 __iomem *dma = hostdata->pdma_io +0x2000 ;if (!len)return 0 ;
@@ -166,13 +166,19 @@ static inline int cumanascsi_pread(struct Scsi_Host *host, } } end: -writeb (priv (host)->ctrl |0x40 , base +CTRL ); +writeb (hostdata->ctrl |0x40 , base +CTRL );if (len)return -1 ;return 0 ; } +static int cumanascsi_dma_xfer_len (struct NCR5380_hostdata *hostdata, +struct scsi_cmnd *cmd) +{ +return cmd->transfersize; +} +static u8 cumanascsi_read (struct NCR5380_hostdata *hostdata,unsigned int reg) {
drivers/scsi/arm/oak.c +7 -6
@@ -19,10 +19,10 @@#define NCR5380_read (reg) readb(hostdata->io + ((reg) << 2))#define NCR5380_write (reg, value) writeb(value, hostdata->io + ((reg) << 2)) -#define NCR5380_dma_xfer_len (instance, cmd, phase) (0) +#define NCR5380_dma_xfer_len NCR5380_dma_xfer_none#define NCR5380_dma_recv_setup oakscsi_pread#define NCR5380_dma_send_setup oakscsi_pwrite -#define NCR5380_dma_residual (instance) (0) +#define NCR5380_dma_residual NCR5380_dma_residual_none#define NCR5380_queue_command oakscsi_queue_command#define NCR5380_info oakscsi_info
@@ -37,10 +37,10 @@#define STAT ((128 + 16) << 2)#define DATA ((128 + 8) << 2) -static inline int oakscsi_pwrite (struct Scsi_Host *instance, +static inline int oakscsi_pwrite (struct NCR5380_hostdata *hostdata,unsigned char *addr,int len) { -u8 __iomem *base =priv (instance)->io; +u8 __iomem *base = hostdata->io;printk ("writing %p len %d\n" ,addr, len);
@@ -52,10 +52,11 @@ printk("writing %p len %d\n",addr, len);return 0 ; } -static inline int oakscsi_pread (struct Scsi_Host *instance, +static inline int oakscsi_pread (struct NCR5380_hostdata *hostdata,unsigned char *addr,int len) { -u8 __iomem *base =priv (instance)->io; +u8 __iomem *base = hostdata->io; +printk ("reading %p len %d\n" , addr, len);while (len >0 ) {
drivers/scsi/atari_scsi.c +26 -19
88 lines not on this page · raw message
drivers/scsi/dmx3191d.c +4 -4
@@ -37,10 +37,10 @@#define NCR5380_read (reg) inb(hostdata->base + (reg))#define NCR5380_write (reg, value) outb(value, hostdata->base + (reg)) -#define NCR5380_dma_xfer_len (instance, cmd, phase) (0) -#define NCR5380_dma_recv_setup (instance, dst, len) (0) -#define NCR5380_dma_send_setup (instance, src, len) (0) -#define NCR5380_dma_residual (instance) (0) +#define NCR5380_dma_xfer_len NCR5380_dma_xfer_none +#define NCR5380_dma_recv_setup NCR5380_dma_setup_none +#define NCR5380_dma_send_setup NCR5380_dma_setup_none +#define NCR5380_dma_residual NCR5380_dma_residual_none#define NCR5380_implementation_fields/* none */
drivers/scsi/g_NCR5380.c +5 -8
@@ -332,7 +332,7 @@ static void generic_NCR5380_release_resources(struct Scsi_Host *instance)/** * generic_NCR5380_pread - pseudo DMA read -* @instance: adapter to read from +* @hostdata: scsi host private data * @dst: buffer to read into * @len: buffer length *
@@ -340,10 +340,9 @@ static void generic_NCR5380_release_resources(struct Scsi_Host *instance)* controller */ -static inline int generic_NCR5380_pread (struct Scsi_Host *instance, +static inline int generic_NCR5380_pread (struct NCR5380_hostdata *hostdata,unsigned char *dst,int len) { -struct NCR5380_hostdata *hostdata =shost_priv (instance);int blocks = len /128 ;int start =0 ;
@@ -406,7 +405,7 @@ static inline int generic_NCR5380_pread(struct Scsi_Host *instance,/** * generic_NCR5380_pwrite - pseudo DMA write -* @instance: adapter to read from +* @hostdata: scsi host private data * @dst: buffer to read into * @len: buffer length *
@@ -414,10 +413,9 @@ static inline int generic_NCR5380_pread(struct Scsi_Host *instance,* controller */ -static inline int generic_NCR5380_pwrite (struct Scsi_Host *instance, +static inline int generic_NCR5380_pwrite (struct NCR5380_hostdata *hostdata,unsigned char *src,int len) { -struct NCR5380_hostdata *hostdata =shost_priv (instance);int blocks = len /128 ;int start =0 ;
@@ -480,10 +478,9 @@ static inline int generic_NCR5380_pwrite(struct Scsi_Host *instance,return 0 ; } -static int generic_NCR5380_dma_xfer_len (struct Scsi_Host *instance, +static int generic_NCR5380_dma_xfer_len (struct NCR5380_hostdata *hostdata,struct scsi_cmnd *cmd) { -struct NCR5380_hostdata *hostdata =shost_priv (instance);int transfersize = cmd->transfersize;if (hostdata->flags &FLAG_NO_PSEUDO_DMA )
drivers/scsi/g_NCR5380.h +2 -3
@@ -32,11 +32,10 @@#define NCR53C400_host_buffer 0x3900#define NCR53C400_region_size 0x3a00 -#define NCR5380_dma_xfer_len (instance, cmd, phase) \ - generic_NCR5380_dma_xfer_len(instance, cmd) +#define NCR5380_dma_xfer_len generic_NCR5380_dma_xfer_len#define NCR5380_dma_recv_setup generic_NCR5380_pread#define NCR5380_dma_send_setup generic_NCR5380_pwrite -#define NCR5380_dma_residual (instance) (0) +#define NCR5380_dma_residual NCR5380_dma_residual_none#define NCR5380_intr generic_NCR5380_intr#define NCR5380_queue_command generic_NCR5380_queue_command
drivers/scsi/mac_scsi.c +18 -18
@@ -33,11 +33,10 @@#define NCR5380_read (reg) in_8(hostdata->io + ((reg) << 4))#define NCR5380_write (reg, value) out_8(hostdata->io + ((reg) << 4), value) -#define NCR5380_dma_xfer_len (instance, cmd, phase) \ - macscsi_dma_xfer_len(instance, cmd) +#define NCR5380_dma_xfer_len macscsi_dma_xfer_len#define NCR5380_dma_recv_setup macscsi_pread#define NCR5380_dma_send_setup macscsi_pwrite -#define NCR5380_dma_residual (instance) (hostdata->pdma_residual) +#define NCR5380_dma_residual macscsi_dma_residual#define NCR5380_intr macscsi_intr#define NCR5380_queue_command macscsi_queue_command
@@ -152,10 +151,9 @@ __asm__ __volatile__ \ : "0"(s), "1"(d), "2"(n) \ : "d0") -static int macscsi_pread (struct Scsi_Host *instance, -unsigned char *dst,int len) +static inline int macscsi_pread (struct NCR5380_hostdata *hostdata, +unsigned char *dst,int len) { -struct NCR5380_hostdata *hostdata =shost_priv (instance);unsigned char *s = hostdata->pdma_io + (INPUT_DATA_REG <<4 );unsigned char *d = dst;int n = len;
@@ -181,16 +179,16 @@ static int macscsi_pread(struct Scsi_Host *instance,if (!(NCR5380_read (BUS_AND_STATUS_REG ) &BASR_PHASE_MATCH ))return 0 ; -dsprintk (NDEBUG_PSEUDO_DMA , instance, +dsprintk (NDEBUG_PSEUDO_DMA , hostdata->host,"%s: bus error (%d/%d)\n" , __func__, transferred, len); -NCR5380_dprint (NDEBUG_PSEUDO_DMA , instance); +NCR5380_dprint (NDEBUG_PSEUDO_DMA , hostdata->host); d = dst + transferred; n = len - transferred; }scmd_printk (KERN_ERR , hostdata->connected,"%s: phase mismatch or !DRQ\n" , __func__); -NCR5380_dprint (NDEBUG_PSEUDO_DMA , instance); +NCR5380_dprint (NDEBUG_PSEUDO_DMA , hostdata->host);return -1 ; }
@@ -255,10 +253,9 @@ __asm__ __volatile__ \ : "0"(s), "1"(d), "2"(n) \ : "d0") -static int macscsi_pwrite (struct Scsi_Host *instance, -unsigned char *src,int len) +static inline int macscsi_pwrite (struct NCR5380_hostdata *hostdata, +unsigned char *src,int len) { -struct NCR5380_hostdata *hostdata =shost_priv (instance);unsigned char *s = src;unsigned char *d = hostdata->pdma_io + (OUTPUT_DATA_REG <<4 );int n = len;
@@ -290,25 +287,23 @@ static int macscsi_pwrite(struct Scsi_Host *instance,return 0 ; } -dsprintk (NDEBUG_PSEUDO_DMA , instance, +dsprintk (NDEBUG_PSEUDO_DMA , hostdata->host,"%s: bus error (%d/%d)\n" , __func__, transferred, len); -NCR5380_dprint (NDEBUG_PSEUDO_DMA , instance); +NCR5380_dprint (NDEBUG_PSEUDO_DMA , hostdata->host); s = src + transferred; n = len - transferred; }scmd_printk (KERN_ERR , hostdata->connected,"%s: phase mismatch or !DRQ\n" , __func__); -NCR5380_dprint (NDEBUG_PSEUDO_DMA , instance); +NCR5380_dprint (NDEBUG_PSEUDO_DMA , hostdata->host);return -1 ; } -static int macscsi_dma_xfer_len (struct Scsi_Host *instance, +static int macscsi_dma_xfer_len (struct NCR5380_hostdata *hostdata,struct scsi_cmnd *cmd) { -struct NCR5380_hostdata *hostdata =shost_priv (instance); -if (hostdata->flags &FLAG_NO_PSEUDO_DMA || cmd->SCp.this_residual <16 )return 0 ;
@@ -316,6 +311,11 @@ static int macscsi_dma_xfer_len(struct Scsi_Host *instance,return cmd->SCp.this_residual; } +static int macscsi_dma_residual (struct NCR5380_hostdata *hostdata) +{ +return hostdata->pdma_residual; +} +#include "NCR5380.c" #define DRV_MODULE_NAME "mac_scsi"
drivers/scsi/sun3_scsi.c +32 -13
75 lines not on this page · raw message
Signature · 1 line
2.7.3
Martin K. Petersen
AppliedRe: [PATCH 00/12] Fixes, cleanup and g_NCR5380_mmio/g_NCR5380 merger
In reply to a message not in the archiveQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Finn" == Finn Thain <[email protected]> writes:
Finn> This patch series has fixes for compatibility, reliability and Finn> performance issues and some cleanup. It also includes a new Finn> version of Ondrej Zary's patch that merges g_NCR5380_mmio into Finn> g_NCR5380.
Finn> I've tested this patch series on a Powerbook 180. If someone would Finn> test some of the other platforms that would be very helpful. All Finn> drivers were compile-tested.
Applied to 4.10/scsi-queue.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering