Skip to content

L
linux
Commit e4dec680 authored by Finn Thain's avatar Finn Thain Committed by Martin K. Petersen
Browse files
Options

ncr5380: Remove REAL_DMA and REAL_DMA_POLL macros 

For the NCR5380.c core driver, these macros are never used.
If REAL_DMA were to be defined, compilation would fail.

For the atari_NCR5380.c core driver, REAL_DMA is always defined.

Hence these macros are pointless.
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 7e9ec8d9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 415 deletions
drivers/scsi/NCR5380.c
View file @ e4dec680
This diff is collapsed.
drivers/scsi/NCR5380.h
View file @ e4dec680
...@@ -239,9 +239,7 @@ struct NCR5380_hostdata { ...@@ -239,9 +239,7 @@ struct NCR5380_hostdata {
struct Scsi_Host *host; /* Host backpointer */ struct Scsi_Host *host; /* Host backpointer */
unsigned char id_mask, id_higher_mask; /* 1 << id, all bits greater */ unsigned char id_mask, id_higher_mask; /* 1 << id, all bits greater */
unsigned char busy[8]; /* index = target, bit = lun */ unsigned char busy[8]; /* index = target, bit = lun */
#if defined(REAL_DMA) || defined(REAL_DMA_POLL)
int dma_len; /* requested length of DMA */ int dma_len; /* requested length of DMA */
#endif
unsigned char last_message; /* last message OUT */ unsigned char last_message; /* last message OUT */
struct scsi_cmnd *connected; /* currently connected cmnd */ struct scsi_cmnd *connected; /* currently connected cmnd */
struct scsi_cmnd *selecting; /* cmnd to be connected */ struct scsi_cmnd *selecting; /* cmnd to be connected */
...@@ -319,118 +317,8 @@ static void NCR5380_main(struct work_struct *work); ...@@ -319,118 +317,8 @@ static void NCR5380_main(struct work_struct *work);
static const char *NCR5380_info(struct Scsi_Host *instance); static const char *NCR5380_info(struct Scsi_Host *instance);
static void NCR5380_reselect(struct Scsi_Host *instance); static void NCR5380_reselect(struct Scsi_Host *instance);
static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *, struct scsi_cmnd *); static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *, struct scsi_cmnd *);
#if defined(PSEUDO_DMA) || defined(REAL_DMA) || defined(REAL_DMA_POLL)
static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase, int *count, unsigned char **data); static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase, int *count, unsigned char **data);
#endif
static int NCR5380_transfer_pio(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);
#if (defined(REAL_DMA) || defined(REAL_DMA_POLL))
#if defined(i386) || defined(__alpha__)
/**
* NCR5380_pc_dma_setup - setup ISA DMA
* @instance: adapter to set up
* @ptr: block to transfer (virtual address)
* @count: number of bytes to transfer
* @mode: DMA controller mode to use
*
* Program the DMA controller ready to perform an ISA DMA transfer
* on this chip.
*
* Locks: takes and releases the ISA DMA lock.
*/
static __inline__ int NCR5380_pc_dma_setup(struct Scsi_Host *instance, unsigned char *ptr, unsigned int count, unsigned char mode)
{
unsigned limit;
unsigned long bus_addr = virt_to_bus(ptr);
unsigned long flags;
if (instance->dma_channel <= 3) {
if (count > 65536)
count = 65536;
limit = 65536 - (bus_addr & 0xFFFF);
} else {
if (count > 65536 * 2)
count = 65536 * 2;
limit = 65536 * 2 - (bus_addr & 0x1FFFF);
}
if (count > limit)
count = limit;
if ((count & 1) || (bus_addr & 1))
panic("scsi%d : attempted unaligned DMA transfer\n", instance->host_no);
flags=claim_dma_lock();
disable_dma(instance->dma_channel);
clear_dma_ff(instance->dma_channel);
set_dma_addr(instance->dma_channel, bus_addr);
set_dma_count(instance->dma_channel, count);
set_dma_mode(instance->dma_channel, mode);
enable_dma(instance->dma_channel);
release_dma_lock(flags);
return count;
}
/**
* NCR5380_pc_dma_write_setup - setup ISA DMA write
* @instance: adapter to set up
* @ptr: block to transfer (virtual address)
* @count: number of bytes to transfer
*
* Program the DMA controller ready to perform an ISA DMA write to the
* SCSI controller.
*
* Locks: called routines take and release the ISA DMA lock.
*/
static __inline__ int NCR5380_pc_dma_write_setup(struct Scsi_Host *instance, unsigned char *src, unsigned int count)
{
return NCR5380_pc_dma_setup(instance, src, count, DMA_MODE_WRITE);
}
/**
* NCR5380_pc_dma_read_setup - setup ISA DMA read
* @instance: adapter to set up
* @ptr: block to transfer (virtual address)
* @count: number of bytes to transfer
*
* Program the DMA controller ready to perform an ISA DMA read from the
* SCSI controller.
*
* Locks: called routines take and release the ISA DMA lock.
*/
static __inline__ int NCR5380_pc_dma_read_setup(struct Scsi_Host *instance, unsigned char *src, unsigned int count)
{
return NCR5380_pc_dma_setup(instance, src, count, DMA_MODE_READ);
}
/**
* NCR5380_pc_dma_residual - return bytes left
* @instance: adapter
*
* Reports the number of bytes left over after the DMA was terminated.
*
* Locks: takes and releases the ISA DMA lock.
*/
static __inline__ int NCR5380_pc_dma_residual(struct Scsi_Host *instance)
{
unsigned long flags;
int tmp;
flags = claim_dma_lock();
clear_dma_ff(instance->dma_channel);
tmp = get_dma_residue(instance->dma_channel);
release_dma_lock(flags);
return tmp;
}
#endif /* defined(i386) || defined(__alpha__) */
#endif /* defined(REAL_DMA) */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* NCR5380_H */ #endif /* NCR5380_H */
drivers/scsi/atari_NCR5380.c
View file @ e4dec680
...@@ -112,15 +112,9 @@ ...@@ -112,15 +112,9 @@
* specific implementation of the NCR5380 * specific implementation of the NCR5380
* *
* Either real DMA *or* pseudo DMA may be implemented * Either real DMA *or* pseudo DMA may be implemented
* REAL functions :
* NCR5380_REAL_DMA should be defined if real DMA is to be used.
* Note that the DMA setup functions should return the number of bytes * Note that the DMA setup functions should return the number of bytes
* that they were able to program the controller for. * that they were able to program the controller for.
* *
* Also note that generic i386/PC versions of these macros are
* available as NCR5380_i386_dma_write_setup,
* NCR5380_i386_dma_read_setup, and NCR5380_i386_dma_residual.
*
* NCR5380_dma_write_setup(instance, src, count) - initialize * NCR5380_dma_write_setup(instance, src, count) - initialize
* NCR5380_dma_read_setup(instance, dst, count) - initialize * NCR5380_dma_read_setup(instance, dst, count) - initialize
* NCR5380_dma_residual(instance); - residual count * NCR5380_dma_residual(instance); - residual count
...@@ -586,9 +580,6 @@ static void prepare_info(struct Scsi_Host *instance) ...@@ -586,9 +580,6 @@ static void prepare_info(struct Scsi_Host *instance)
#ifdef DIFFERENTIAL #ifdef DIFFERENTIAL
"DIFFERENTIAL " "DIFFERENTIAL "
#endif #endif
#ifdef REAL_DMA
"REAL_DMA "
#endif
#ifdef PARITY #ifdef PARITY
"PARITY " "PARITY "
#endif #endif
...@@ -629,9 +620,8 @@ static int __init NCR5380_init(struct Scsi_Host *instance, int flags) ...@@ -629,9 +620,8 @@ static int __init NCR5380_init(struct Scsi_Host *instance, int flags)
#ifdef SUPPORT_TAGS #ifdef SUPPORT_TAGS
init_tags(hostdata); init_tags(hostdata);
#endif #endif
#if defined (REAL_DMA)
hostdata->dma_len = 0; hostdata->dma_len = 0;
#endif
spin_lock_init(&hostdata->lock); spin_lock_init(&hostdata->lock);
hostdata->connected = NULL; hostdata->connected = NULL;
hostdata->sensing = NULL; hostdata->sensing = NULL;
...@@ -974,11 +964,7 @@ static void NCR5380_main(struct work_struct *work) ...@@ -974,11 +964,7 @@ static void NCR5380_main(struct work_struct *work)
#endif #endif
} }
} }
if (hostdata->connected if (hostdata->connected && !hostdata->dma_len) {
#ifdef REAL_DMA
&& !hostdata->dma_len
#endif
) {
dsprintk(NDEBUG_MAIN, instance, "main: performing information transfer\n"); dsprintk(NDEBUG_MAIN, instance, "main: performing information transfer\n");
NCR5380_information_transfer(instance); NCR5380_information_transfer(instance);
done = 0; done = 0;
...@@ -990,7 +976,6 @@ static void NCR5380_main(struct work_struct *work) ...@@ -990,7 +976,6 @@ static void NCR5380_main(struct work_struct *work)
} }
#ifdef REAL_DMA
/* /*
* Function : void NCR5380_dma_complete (struct Scsi_Host *instance) * Function : void NCR5380_dma_complete (struct Scsi_Host *instance)
* *
...@@ -1071,7 +1056,6 @@ static void NCR5380_dma_complete(struct Scsi_Host *instance) ...@@ -1071,7 +1056,6 @@ static void NCR5380_dma_complete(struct Scsi_Host *instance)
} }
} }
} }
#endif /* REAL_DMA */
/** /**
...@@ -1126,7 +1110,6 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id) ...@@ -1126,7 +1110,6 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id)
dsprintk(NDEBUG_INTR, instance, "IRQ %d, BASR 0x%02x, SR 0x%02x, MR 0x%02x\n", dsprintk(NDEBUG_INTR, instance, "IRQ %d, BASR 0x%02x, SR 0x%02x, MR 0x%02x\n",
irq, basr, sr, mr); irq, basr, sr, mr);
#if defined(REAL_DMA)
if ((mr & MR_DMA_MODE) || (mr & MR_MONITOR_BSY)) { if ((mr & MR_DMA_MODE) || (mr & MR_MONITOR_BSY)) {
/* Probably End of DMA, Phase Mismatch or Loss of BSY. /* Probably End of DMA, Phase Mismatch or Loss of BSY.
* We ack IRQ after clearing Mode Register. Workarounds * We ack IRQ after clearing Mode Register. Workarounds
...@@ -1142,9 +1125,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id) ...@@ -1142,9 +1125,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id)
NCR5380_write(MODE_REG, MR_BASE); NCR5380_write(MODE_REG, MR_BASE);
NCR5380_read(RESET_PARITY_INTERRUPT_REG); NCR5380_read(RESET_PARITY_INTERRUPT_REG);
} }
} else } else if ((NCR5380_read(CURRENT_SCSI_DATA_REG) & hostdata->id_mask) &&
#endif /* REAL_DMA */
if ((NCR5380_read(CURRENT_SCSI_DATA_REG) & hostdata->id_mask) &&
(sr & (SR_SEL | SR_IO | SR_BSY | SR_RST)) == (SR_SEL | SR_IO)) { (sr & (SR_SEL | SR_IO | SR_BSY | SR_RST)) == (SR_SEL | SR_IO)) {
/* Probably reselected */ /* Probably reselected */
NCR5380_write(SELECT_ENABLE_REG, 0); NCR5380_write(SELECT_ENABLE_REG, 0);
...@@ -1710,7 +1691,7 @@ static int do_abort(struct Scsi_Host *instance) ...@@ -1710,7 +1691,7 @@ static int do_abort(struct Scsi_Host *instance)
return -1; return -1;
} }
#if defined(REAL_DMA)
/* /*
* Function : int NCR5380_transfer_dma (struct Scsi_Host *instance, * Function : int NCR5380_transfer_dma (struct Scsi_Host *instance,
* unsigned char *phase, int *count, unsigned char **data) * unsigned char *phase, int *count, unsigned char **data)
...@@ -1819,7 +1800,6 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, ...@@ -1819,7 +1800,6 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance,
return 0; return 0;
} }
#endif /* defined(REAL_DMA) */
/* /*
* Function : NCR5380_information_transfer (struct Scsi_Host *instance) * Function : NCR5380_information_transfer (struct Scsi_Host *instance)
...@@ -1866,7 +1846,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) ...@@ -1866,7 +1846,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
} }
#if defined(CONFIG_SUN3) #if defined(CONFIG_SUN3)
if (phase == PHASE_CMDOUT) { if (phase == PHASE_CMDOUT) {
#if defined(REAL_DMA)
void *d; void *d;
unsigned long count; unsigned long count;
...@@ -1885,7 +1864,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) ...@@ -1885,7 +1864,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
sun3_dma_setup_done = cmd; sun3_dma_setup_done = cmd;
} }
} }
#endif
#ifdef SUN3_SCSI_VME #ifdef SUN3_SCSI_VME
dregs->csr |= CSR_INTR; dregs->csr |= CSR_INTR;
#endif #endif
...@@ -1943,12 +1921,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) ...@@ -1943,12 +1921,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
* in an unconditional loop. * in an unconditional loop.
*/ */
/* ++roman: I suggest, this should be
* #if def(REAL_DMA)
* instead of leaving REAL_DMA out.
*/
#if defined(REAL_DMA)
#if !defined(CONFIG_SUN3) #if !defined(CONFIG_SUN3)
transfersize = 0; transfersize = 0;
if (!cmd->device->borken) if (!cmd->device->borken)
...@@ -1972,21 +1944,9 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) ...@@ -1972,21 +1944,9 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
do_abort(instance); do_abort(instance);
cmd->result = DID_ERROR << 16; cmd->result = DID_ERROR << 16;
/* XXX - need to source or sink data here, as appropriate */ /* XXX - need to source or sink data here, as appropriate */
} else {
#ifdef REAL_DMA
/* ++roman: When using real DMA,
* information_transfer() should return after
* starting DMA since it has nothing more to
* do.
*/
return;
#else
cmd->SCp.this_residual -= transfersize - len;
#endif
}
} else } else
#endif /* defined(REAL_DMA) */ return;
{ } else {
/* Break up transfer into 3 ms chunks, /* Break up transfer into 3 ms chunks,
* presuming 6 accesses per handshake. * presuming 6 accesses per handshake.
*/ */
...@@ -1997,7 +1957,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) ...@@ -1997,7 +1957,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
(unsigned char **)&cmd->SCp.ptr); (unsigned char **)&cmd->SCp.ptr);
cmd->SCp.this_residual -= transfersize - len; cmd->SCp.this_residual -= transfersize - len;
} }
#if defined(CONFIG_SUN3) && defined(REAL_DMA) #if defined(CONFIG_SUN3)
/* if we had intended to dma that command clear it */ /* if we had intended to dma that command clear it */
if (sun3_dma_setup_done == cmd) if (sun3_dma_setup_done == cmd)
sun3_dma_setup_done = NULL; sun3_dma_setup_done = NULL;
...@@ -2305,7 +2265,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) ...@@ -2305,7 +2265,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance)
return; return;
} }
#if defined(CONFIG_SUN3) && defined(REAL_DMA) #if defined(CONFIG_SUN3)
/* acknowledge toggle to MSGIN */ /* acknowledge toggle to MSGIN */
NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(PHASE_MSGIN)); NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(PHASE_MSGIN));
...@@ -2392,7 +2352,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) ...@@ -2392,7 +2352,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance)
return; return;
} }
#if defined(CONFIG_SUN3) && defined(REAL_DMA) #if defined(CONFIG_SUN3)
/* engage dma setup for the command we just saw */ /* engage dma setup for the command we just saw */
{ {
void *d; void *d;
...@@ -2555,9 +2515,7 @@ static int NCR5380_abort(struct scsi_cmnd *cmd) ...@@ -2555,9 +2515,7 @@ static int NCR5380_abort(struct scsi_cmnd *cmd)
if (hostdata->connected == cmd) { if (hostdata->connected == cmd) {
dsprintk(NDEBUG_ABORT, instance, "abort: cmd %p is connected\n", cmd); dsprintk(NDEBUG_ABORT, instance, "abort: cmd %p is connected\n", cmd);
hostdata->connected = NULL; hostdata->connected = NULL;
#ifdef REAL_DMA
hostdata->dma_len = 0; hostdata->dma_len = 0;
#endif
if (do_abort(instance)) { if (do_abort(instance)) {
set_host_byte(cmd, DID_ERROR); set_host_byte(cmd, DID_ERROR);
complete_cmd(instance, cmd); complete_cmd(instance, cmd);
...@@ -2664,9 +2622,7 @@ static int NCR5380_bus_reset(struct scsi_cmnd *cmd) ...@@ -2664,9 +2622,7 @@ static int NCR5380_bus_reset(struct scsi_cmnd *cmd)
#endif #endif
for (i = 0; i < 8; ++i) for (i = 0; i < 8; ++i)
hostdata->busy[i] = 0; hostdata->busy[i] = 0;
#ifdef REAL_DMA
hostdata->dma_len = 0; hostdata->dma_len = 0;
#endif
queue_work(hostdata->work_q, &hostdata->main_task); queue_work(hostdata->work_q, &hostdata->main_task);
maybe_release_dma_irq(instance); maybe_release_dma_irq(instance);
......
drivers/scsi/atari_scsi.c
View file @ e4dec680
...@@ -85,7 +85,6 @@ ...@@ -85,7 +85,6 @@
/* Definitions for the core NCR5380 driver. */ /* Definitions for the core NCR5380 driver. */
#define REAL_DMA
#define SUPPORT_TAGS #define SUPPORT_TAGS
#define MAX_TAGS 32 #define MAX_TAGS 32
#define DMA_MIN_SIZE 32 #define DMA_MIN_SIZE 32
...@@ -159,14 +158,11 @@ static inline unsigned long SCSI_DMA_GETADR(void) ...@@ -159,14 +158,11 @@ static inline unsigned long SCSI_DMA_GETADR(void)
return adr; return adr;
} }
#ifdef REAL_DMA
static void atari_scsi_fetch_restbytes(void); static void atari_scsi_fetch_restbytes(void);
#endif
static unsigned char (*atari_scsi_reg_read)(unsigned char reg); static unsigned char (*atari_scsi_reg_read)(unsigned char reg);
static void (*atari_scsi_reg_write)(unsigned char reg, unsigned char value); static void (*atari_scsi_reg_write)(unsigned char reg, unsigned char value);
#ifdef REAL_DMA
static unsigned long atari_dma_residual, atari_dma_startaddr; static unsigned long atari_dma_residual, atari_dma_startaddr;
static short atari_dma_active; static short atari_dma_active;
/* pointer to the dribble buffer */ /* pointer to the dribble buffer */
...@@ -185,7 +181,6 @@ static char *atari_dma_orig_addr; ...@@ -185,7 +181,6 @@ static char *atari_dma_orig_addr;
/* mask for address bits that can't be used with the ST-DMA */ /* mask for address bits that can't be used with the ST-DMA */
static unsigned long atari_dma_stram_mask; static unsigned long atari_dma_stram_mask;
#define STRAM_ADDR(a) (((a) & atari_dma_stram_mask) == 0) #define STRAM_ADDR(a) (((a) & atari_dma_stram_mask) == 0)
#endif
static int setup_can_queue = -1; static int setup_can_queue = -1;
module_param(setup_can_queue, int, 0); module_param(setup_can_queue, int, 0);
...@@ -201,8 +196,6 @@ static int setup_toshiba_delay = -1; ...@@ -201,8 +196,6 @@ static int setup_toshiba_delay = -1;
module_param(setup_toshiba_delay, int, 0); module_param(setup_toshiba_delay, int, 0);
#if defined(REAL_DMA)
static int scsi_dma_is_ignored_buserr(unsigned char dma_stat) static int scsi_dma_is_ignored_buserr(unsigned char dma_stat)
{ {
int i; int i;
...@@ -255,12 +248,9 @@ static void scsi_dma_buserr(int irq, void *dummy) ...@@ -255,12 +248,9 @@ static void scsi_dma_buserr(int irq, void *dummy)
} }
#endif #endif
#endif
static irqreturn_t scsi_tt_intr(int irq, void *dev) static irqreturn_t scsi_tt_intr(int irq, void *dev)
{ {
#ifdef REAL_DMA
struct Scsi_Host *instance = dev; struct Scsi_Host *instance = dev;
struct NCR5380_hostdata *hostdata = shost_priv(instance); struct NCR5380_hostdata *hostdata = shost_priv(instance);
int dma_stat; int dma_stat;
...@@ -342,8 +332,6 @@ static irqreturn_t scsi_tt_intr(int irq, void *dev) ...@@ -342,8 +332,6 @@ static irqreturn_t scsi_tt_intr(int irq, void *dev)
tt_scsi_dma.dma_ctrl = 0; tt_scsi_dma.dma_ctrl = 0;
} }
#endif /* REAL_DMA */
NCR5380_intr(irq, dev); NCR5380_intr(irq, dev);
return IRQ_HANDLED; return IRQ_HANDLED;
...@@ -352,7 +340,6 @@ static irqreturn_t scsi_tt_intr(int irq, void *dev) ...@@ -352,7 +340,6 @@ static irqreturn_t scsi_tt_intr(int irq, void *dev)
static irqreturn_t scsi_falcon_intr(int irq, void *dev) static irqreturn_t scsi_falcon_intr(int irq, void *dev)
{ {
#ifdef REAL_DMA
struct Scsi_Host *instance = dev; struct Scsi_Host *instance = dev;
struct NCR5380_hostdata *hostdata = shost_priv(instance); struct NCR5380_hostdata *hostdata = shost_priv(instance);
int dma_stat; int dma_stat;
...@@ -405,15 +392,12 @@ static irqreturn_t scsi_falcon_intr(int irq, void *dev) ...@@ -405,15 +392,12 @@ static irqreturn_t scsi_falcon_intr(int irq, void *dev)
atari_dma_orig_addr = NULL; atari_dma_orig_addr = NULL;
} }
#endif /* REAL_DMA */
NCR5380_intr(irq, dev); NCR5380_intr(irq, dev);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
#ifdef REAL_DMA
static void atari_scsi_fetch_restbytes(void) static void atari_scsi_fetch_restbytes(void)
{ {
int nr; int nr;
...@@ -436,7 +420,6 @@ static void atari_scsi_fetch_restbytes(void) ...@@ -436,7 +420,6 @@ static void atari_scsi_fetch_restbytes(void)
*dst++ = *src++; *dst++ = *src++;
} }
} }
#endif /* REAL_DMA */
/* This function releases the lock on the DMA chip if there is no /* This function releases the lock on the DMA chip if there is no
...@@ -508,8 +491,6 @@ __setup("atascsi=", atari_scsi_setup); ...@@ -508,8 +491,6 @@ __setup("atascsi=", atari_scsi_setup);
#endif /* !MODULE */ #endif /* !MODULE */
#if defined(REAL_DMA)
static unsigned long atari_scsi_dma_setup(struct Scsi_Host *instance, static unsigned long atari_scsi_dma_setup(struct Scsi_Host *instance,
void *data, unsigned long count, void *data, unsigned long count,
int dir) int dir)
...@@ -703,9 +684,6 @@ static unsigned long atari_dma_xfer_len(unsigned long wanted_len, ...@@ -703,9 +684,6 @@ static unsigned long atari_dma_xfer_len(unsigned long wanted_len,
} }
#endif /* REAL_DMA */
/* NCR5380 register access functions /* NCR5380 register access functions
* *
* There are separate functions for TT and Falcon, because the access * There are separate functions for TT and Falcon, because the access
...@@ -745,7 +723,6 @@ static int atari_scsi_bus_reset(struct scsi_cmnd *cmd) ...@@ -745,7 +723,6 @@ static int atari_scsi_bus_reset(struct scsi_cmnd *cmd)
local_irq_save(flags); local_irq_save(flags);
#ifdef REAL_DMA
/* Abort a maybe active DMA transfer */ /* Abort a maybe active DMA transfer */
if (IS_A_TT()) { if (IS_A_TT()) {
tt_scsi_dma.dma_ctrl = 0; tt_scsi_dma.dma_ctrl = 0;
...@@ -754,7 +731,6 @@ static int atari_scsi_bus_reset(struct scsi_cmnd *cmd) ...@@ -754,7 +731,6 @@ static int atari_scsi_bus_reset(struct scsi_cmnd *cmd)
atari_dma_active = 0; atari_dma_active = 0;
atari_dma_orig_addr = NULL; atari_dma_orig_addr = NULL;
} }
#endif
rv = NCR5380_bus_reset(cmd); rv = NCR5380_bus_reset(cmd);
...@@ -850,8 +826,6 @@ static int __init atari_scsi_probe(struct platform_device *pdev) ...@@ -850,8 +826,6 @@ static int __init atari_scsi_probe(struct platform_device *pdev)
} }
} }
#ifdef REAL_DMA
/* If running on a Falcon and if there's TT-Ram (i.e., more than one /* If running on a Falcon and if there's TT-Ram (i.e., more than one
* memory block, since there's always ST-Ram in a Falcon), then * memory block, since there's always ST-Ram in a Falcon), then
* allocate a STRAM_BUFFER_SIZE byte dribble buffer for transfers * allocate a STRAM_BUFFER_SIZE byte dribble buffer for transfers
...@@ -867,7 +841,6 @@ static int __init atari_scsi_probe(struct platform_device *pdev) ...@@ -867,7 +841,6 @@ static int __init atari_scsi_probe(struct platform_device *pdev)
atari_dma_phys_buffer = atari_stram_to_phys(atari_dma_buffer); atari_dma_phys_buffer = atari_stram_to_phys(atari_dma_buffer);
atari_dma_orig_addr = 0; atari_dma_orig_addr = 0;
} }
#endif
instance = scsi_host_alloc(&atari_scsi_template, instance = scsi_host_alloc(&atari_scsi_template,
sizeof(struct NCR5380_hostdata)); sizeof(struct NCR5380_hostdata));
...@@ -897,7 +870,7 @@ static int __init atari_scsi_probe(struct platform_device *pdev) ...@@ -897,7 +870,7 @@ static int __init atari_scsi_probe(struct platform_device *pdev)
goto fail_irq; goto fail_irq;
} }
tt_mfp.active_edge |= 0x80; /* SCSI int on L->H */ tt_mfp.active_edge |= 0x80; /* SCSI int on L->H */
#ifdef REAL_DMA
tt_scsi_dma.dma_ctrl = 0; tt_scsi_dma.dma_ctrl = 0;
atari_dma_residual = 0; atari_dma_residual = 0;
...@@ -919,17 +892,14 @@ static int __init atari_scsi_probe(struct platform_device *pdev) ...@@ -919,17 +892,14 @@ static int __init atari_scsi_probe(struct platform_device *pdev)
hostdata->read_overruns = 4; hostdata->read_overruns = 4;
} }
#endif
} else { } else {
/* Nothing to do for the interrupt: the ST-DMA is initialized /* Nothing to do for the interrupt: the ST-DMA is initialized
* already. * already.
*/ */
#ifdef REAL_DMA
atari_dma_residual = 0; atari_dma_residual = 0;
atari_dma_active = 0; atari_dma_active = 0;
atari_dma_stram_mask = (ATARIHW_PRESENT(EXTD_DMA) ? 0x00000000 atari_dma_stram_mask = (ATARIHW_PRESENT(EXTD_DMA) ? 0x00000000
: 0xff000000); : 0xff000000);
#endif
} }
NCR5380_maybe_reset_bus(instance); NCR5380_maybe_reset_bus(instance);
......
drivers/scsi/sun3_scsi.c
View file @ e4dec680
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
/* Definitions for the core NCR5380 driver. */ /* Definitions for the core NCR5380 driver. */
#define REAL_DMA
/* #define SUPPORT_TAGS */ /* #define SUPPORT_TAGS */
/* minimum number of bytes to do dma on */ /* minimum number of bytes to do dma on */
#define DMA_MIN_SIZE 129 #define DMA_MIN_SIZE 129
...@@ -527,15 +526,9 @@ static int __init sun3_scsi_probe(struct platform_device *pdev) ...@@ -527,15 +526,9 @@ static int __init sun3_scsi_probe(struct platform_device *pdev)
error = request_irq(instance->irq, scsi_sun3_intr, 0, error = request_irq(instance->irq, scsi_sun3_intr, 0,
"NCR5380", instance); "NCR5380", instance);
if (error) { if (error) {
#ifdef REAL_DMA
pr_err(PFX "scsi%d: IRQ %d not free, bailing out\n", pr_err(PFX "scsi%d: IRQ %d not free, bailing out\n",
instance->host_no, instance->irq); instance->host_no, instance->irq);
goto fail_irq; goto fail_irq;
#else
pr_warn(PFX "scsi%d: IRQ %d not free, interrupts disabled\n",
instance->host_no, instance->irq);
instance->irq = NO_IRQ;
#endif
} }
dregs->csr = 0; dregs->csr = 0;
...@@ -565,7 +558,6 @@ static int __init sun3_scsi_probe(struct platform_device *pdev) ...@@ -565,7 +558,6 @@ static int __init sun3_scsi_probe(struct platform_device *pdev)
return 0; return 0;
fail_host: fail_host:
if (instance->irq != NO_IRQ)
free_irq(instance->irq, instance); free_irq(instance->irq, instance);
fail_irq: fail_irq:
NCR5380_exit(instance); NCR5380_exit(instance);
...@@ -583,7 +575,6 @@ static int __exit sun3_scsi_remove(struct platform_device *pdev) ...@@ -583,7 +575,6 @@ static int __exit sun3_scsi_remove(struct platform_device *pdev)
struct Scsi_Host *instance = platform_get_drvdata(pdev); struct Scsi_Host *instance = platform_get_drvdata(pdev);
scsi_remove_host(instance); scsi_remove_host(instance);
if (instance->irq != NO_IRQ)
free_irq(instance->irq, instance); free_irq(instance->irq, instance);
NCR5380_exit(instance); NCR5380_exit(instance);
scsi_host_put(instance); scsi_host_put(instance);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7