Skip to content

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

atari_NCR5380: Eliminate HOSTNO macro 

Keep the two core driver forks in sync.
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 6a6ff4ac
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 89 deletions
drivers/scsi/NCR5380.c
View file @ b746545f
...@@ -926,9 +926,8 @@ static void NCR5380_main(struct work_struct *work) ...@@ -926,9 +926,8 @@ static void NCR5380_main(struct work_struct *work)
&& !hostdata->dmalen && !hostdata->dmalen
#endif #endif
) { ) {
dprintk(NDEBUG_MAIN, "scsi%d : main() : performing information transfer\n", instance->host_no); dsprintk(NDEBUG_MAIN, instance, "main: performing information transfer\n");
NCR5380_information_transfer(instance); NCR5380_information_transfer(instance);
dprintk(NDEBUG_MAIN, "scsi%d : main() : done set false\n", instance->host_no);
done = 0; done = 0;
} }
} while (!done); } while (!done);
...@@ -986,8 +985,8 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id) ...@@ -986,8 +985,8 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id)
unsigned char mr = NCR5380_read(MODE_REG); unsigned char mr = NCR5380_read(MODE_REG);
unsigned char sr = NCR5380_read(STATUS_REG); unsigned char sr = NCR5380_read(STATUS_REG);
dprintk(NDEBUG_INTR, "scsi%d: 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",
instance->host_no, irq, basr, sr, mr); irq, basr, sr, mr);
#if defined(REAL_DMA) #if defined(REAL_DMA)
if ((mr & MR_DMA_MODE) || (mr & MR_MONITOR_BSY)) { if ((mr & MR_DMA_MODE) || (mr & MR_MONITOR_BSY)) {
...@@ -996,7 +995,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id) ...@@ -996,7 +995,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id)
* for End of DMA errata need to happen in DMA Mode. * for End of DMA errata need to happen in DMA Mode.
*/ */
dprintk(NDEBUG_INTR, "scsi%d: interrupt in DMA mode\n", intance->host_no); dsprintk(NDEBUG_INTR, instance, "interrupt in DMA mode\n");
int transferred; int transferred;
...@@ -1023,8 +1022,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id) ...@@ -1023,8 +1022,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id)
NCR5380_write(SELECT_ENABLE_REG, 0); NCR5380_write(SELECT_ENABLE_REG, 0);
NCR5380_read(RESET_PARITY_INTERRUPT_REG); NCR5380_read(RESET_PARITY_INTERRUPT_REG);
dprintk(NDEBUG_INTR, "scsi%d: interrupt with SEL and IO\n", dsprintk(NDEBUG_INTR, instance, "interrupt with SEL and IO\n");
instance->host_no);
if (!hostdata->connected) { if (!hostdata->connected) {
NCR5380_reselect(instance); NCR5380_reselect(instance);
...@@ -1036,7 +1034,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id) ...@@ -1036,7 +1034,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id)
/* Probably Bus Reset */ /* Probably Bus Reset */
NCR5380_read(RESET_PARITY_INTERRUPT_REG); NCR5380_read(RESET_PARITY_INTERRUPT_REG);
dprintk(NDEBUG_INTR, "scsi%d: unknown interrupt\n", instance->host_no); dsprintk(NDEBUG_INTR, instance, "unknown interrupt\n");
} }
handled = 1; handled = 1;
} else { } else {
...@@ -1091,7 +1089,8 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance, ...@@ -1091,7 +1089,8 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
int err; int err;
NCR5380_dprint(NDEBUG_ARBITRATION, instance); NCR5380_dprint(NDEBUG_ARBITRATION, instance);
dprintk(NDEBUG_ARBITRATION, "scsi%d : starting arbitration, id = %d\n", instance->host_no, instance->this_id); dsprintk(NDEBUG_ARBITRATION, instance, "starting arbitration, id = %d\n",
instance->this_id);
/* /*
* Arbitration and selection phases are slow and involve dropping the * Arbitration and selection phases are slow and involve dropping the
...@@ -1143,7 +1142,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance, ...@@ -1143,7 +1142,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
/* Check for lost arbitration */ /* Check for lost arbitration */
if ((NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_LOST) || (NCR5380_read(CURRENT_SCSI_DATA_REG) & hostdata->id_higher_mask) || (NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_LOST)) { if ((NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_LOST) || (NCR5380_read(CURRENT_SCSI_DATA_REG) & hostdata->id_higher_mask) || (NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_LOST)) {
NCR5380_write(MODE_REG, MR_BASE); NCR5380_write(MODE_REG, MR_BASE);
dprintk(NDEBUG_ARBITRATION, "scsi%d : lost arbitration, deasserting MR_ARBITRATE\n", instance->host_no); dsprintk(NDEBUG_ARBITRATION, instance, "lost arbitration, deasserting MR_ARBITRATE\n");
spin_lock_irq(&hostdata->lock); spin_lock_irq(&hostdata->lock);
goto out; goto out;
} }
...@@ -1177,7 +1176,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance, ...@@ -1177,7 +1176,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
goto out; goto out;
} }
dprintk(NDEBUG_ARBITRATION, "scsi%d : won arbitration\n", instance->host_no); dsprintk(NDEBUG_ARBITRATION, instance, "won arbitration\n");
/* /*
* Now that we have won arbitration, start Selection process, asserting * Now that we have won arbitration, start Selection process, asserting
...@@ -1231,7 +1230,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance, ...@@ -1231,7 +1230,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
udelay(1); udelay(1);
dprintk(NDEBUG_SELECTION, "scsi%d : selecting target %d\n", instance->host_no, scmd_id(cmd)); dsprintk(NDEBUG_SELECTION, instance, "selecting target %d\n", scmd_id(cmd));
/* /*
* The SCSI specification calls for a 250 ms timeout for the actual * The SCSI specification calls for a 250 ms timeout for the actual
...@@ -1305,7 +1304,8 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance, ...@@ -1305,7 +1304,8 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
goto out; goto out;
} }
dprintk(NDEBUG_SELECTION, "scsi%d : target %d selected, going into MESSAGE OUT phase.\n", instance->host_no, cmd->device->id); dsprintk(NDEBUG_SELECTION, instance, "target %d selected, going into MESSAGE OUT phase.\n",
scmd_id(cmd));
tmp[0] = IDENTIFY(((instance->irq == NO_IRQ) ? 0 : 1), cmd->device->lun); tmp[0] = IDENTIFY(((instance->irq == NO_IRQ) ? 0 : 1), cmd->device->lun);
len = 1; len = 1;
...@@ -1315,7 +1315,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance, ...@@ -1315,7 +1315,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
data = tmp; data = tmp;
phase = PHASE_MSGOUT; phase = PHASE_MSGOUT;
NCR5380_transfer_pio(instance, &phase, &len, &data); NCR5380_transfer_pio(instance, &phase, &len, &data);
dprintk(NDEBUG_SELECTION, "scsi%d : nexus established.\n", instance->host_no); dsprintk(NDEBUG_SELECTION, instance, "nexus established.\n");
/* XXX need to handle errors here */ /* XXX need to handle errors here */
hostdata->connected = cmd; hostdata->connected = cmd;
...@@ -1362,11 +1362,6 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, unsigned char *phase ...@@ -1362,11 +1362,6 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, unsigned char *phase
int c = *count; int c = *count;
unsigned char *d = *data; unsigned char *d = *data;
if (!(p & SR_IO))
dprintk(NDEBUG_PIO, "scsi%d : pio write %d bytes\n", instance->host_no, c);
else
dprintk(NDEBUG_PIO, "scsi%d : pio read %d bytes\n", instance->host_no, c);
/* /*
* The NCR5380 chip will only drive the SCSI bus when the * The NCR5380 chip will only drive the SCSI bus when the
* phase specified in the appropriate bits of the TARGET COMMAND * phase specified in the appropriate bits of the TARGET COMMAND
...@@ -1384,12 +1379,12 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, unsigned char *phase ...@@ -1384,12 +1379,12 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, unsigned char *phase
if (NCR5380_poll_politely(instance, STATUS_REG, SR_REQ, SR_REQ, HZ) < 0) if (NCR5380_poll_politely(instance, STATUS_REG, SR_REQ, SR_REQ, HZ) < 0)
break; break;
dprintk(NDEBUG_HANDSHAKE, "scsi%d : REQ detected\n", instance->host_no); dsprintk(NDEBUG_HANDSHAKE, instance, "REQ asserted\n");
/* Check for phase mismatch */ /* Check for phase mismatch */
if ((NCR5380_read(STATUS_REG) & PHASE_MASK) != p) { if ((NCR5380_read(STATUS_REG) & PHASE_MASK) != p) {
dprintk(NDEBUG_HANDSHAKE, "scsi%d : phase mismatch\n", instance->host_no); dsprintk(NDEBUG_PIO, instance, "phase mismatch\n");
NCR5380_dprint_phase(NDEBUG_HANDSHAKE, instance); NCR5380_dprint_phase(NDEBUG_PIO, instance);
break; break;
} }
/* Do actual transfer from SCSI bus to / from memory */ /* Do actual transfer from SCSI bus to / from memory */
...@@ -1426,7 +1421,7 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, unsigned char *phase ...@@ -1426,7 +1421,7 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, unsigned char *phase
STATUS_REG, SR_REQ, 0, 5 * HZ) < 0) STATUS_REG, SR_REQ, 0, 5 * HZ) < 0)
break; break;
dprintk(NDEBUG_HANDSHAKE, "scsi%d : req false, handshake complete\n", instance->host_no); dsprintk(NDEBUG_HANDSHAKE, instance, "REQ negated, handshake complete\n");
/* /*
* We have several special cases to consider during REQ/ACK handshaking : * We have several special cases to consider during REQ/ACK handshaking :
...@@ -1447,7 +1442,7 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, unsigned char *phase ...@@ -1447,7 +1442,7 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, unsigned char *phase
} }
} while (--c); } while (--c);
dprintk(NDEBUG_PIO, "scsi%d : residual %d\n", instance->host_no, c); dsprintk(NDEBUG_PIO, instance, "residual %d\n", c);
*count = c; *count = c;
*data = d; *data = d;
...@@ -1597,8 +1592,10 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase ...@@ -1597,8 +1592,10 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase
if (!(hostdata->flags & FLAG_NO_DMA_FIXUPS)) if (!(hostdata->flags & FLAG_NO_DMA_FIXUPS))
c -= 2; c -= 2;
} }
dprintk(NDEBUG_DMA, "scsi%d : initializing DMA channel %d for %s, %d bytes %s %0x\n", instance->host_no, instance->dma_channel, (p & SR_IO) ? "reading" : "writing", c, (p & SR_IO) ? "to" : "from", (unsigned) d);
hostdata->dma_len = (p & SR_IO) ? NCR5380_dma_read_setup(instance, d, c) : NCR5380_dma_write_setup(instance, d, c); hostdata->dma_len = (p & SR_IO) ? NCR5380_dma_read_setup(instance, d, c) : NCR5380_dma_write_setup(instance, d, c);
dsprintk(NDEBUG_DMA, instance, "initializing DMA %s: length %d, address %p\n",
(p & SR_IO) ? "receive" : "send", c, *data);
#endif #endif
NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(p)); NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(p));
...@@ -1700,7 +1697,8 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase ...@@ -1700,7 +1697,8 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase
} }
} }
dprintk(NDEBUG_DMA, "scsi%d : polled DMA transfer complete, basr 0x%X, sr 0x%X\n", instance->host_no, tmp, NCR5380_read(STATUS_REG)); dsprintk(NDEBUG_DMA, "polled DMA transfer complete, basr 0x%02x, sr 0x%02x\n",
tmp, NCR5380_read(STATUS_REG));
NCR5380_write(MODE_REG, MR_BASE); NCR5380_write(MODE_REG, MR_BASE);
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE); NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
...@@ -1870,7 +1868,9 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { ...@@ -1870,7 +1868,9 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
--cmd->SCp.buffers_residual; --cmd->SCp.buffers_residual;
cmd->SCp.this_residual = cmd->SCp.buffer->length; cmd->SCp.this_residual = cmd->SCp.buffer->length;
cmd->SCp.ptr = sg_virt(cmd->SCp.buffer); cmd->SCp.ptr = sg_virt(cmd->SCp.buffer);
dprintk(NDEBUG_INFORMATION, "scsi%d : %d bytes and %d buffers left\n", instance->host_no, cmd->SCp.this_residual, cmd->SCp.buffers_residual); dsprintk(NDEBUG_INFORMATION, instance, "%d bytes and %d buffers left\n",
cmd->SCp.this_residual,
cmd->SCp.buffers_residual);
} }
/* /*
* The preferred transfer method is going to be * The preferred transfer method is going to be
...@@ -2025,14 +2025,15 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { ...@@ -2025,14 +2025,15 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
spin_unlock_irq(&hostdata->lock); spin_unlock_irq(&hostdata->lock);
dprintk(NDEBUG_EXTENDED, "scsi%d : receiving extended message\n", instance->host_no); dsprintk(NDEBUG_EXTENDED, instance, "receiving extended message\n");
len = 2; len = 2;
data = extended_msg + 1; data = extended_msg + 1;
phase = PHASE_MSGIN; phase = PHASE_MSGIN;
NCR5380_transfer_pio(instance, &phase, &len, &data); NCR5380_transfer_pio(instance, &phase, &len, &data);
dsprintk(NDEBUG_EXTENDED, instance, "length %d, code 0x%02x\n",
dprintk(NDEBUG_EXTENDED, "scsi%d : length=%d, code=0x%02x\n", instance->host_no, (int) extended_msg[1], (int) extended_msg[2]); (int)extended_msg[1],
(int)extended_msg[2]);
if (!len && extended_msg[1] > 0 && if (!len && extended_msg[1] > 0 &&
extended_msg[1] <= sizeof(extended_msg) - 2) { extended_msg[1] <= sizeof(extended_msg) - 2) {
...@@ -2043,7 +2044,8 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { ...@@ -2043,7 +2044,8 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
phase = PHASE_MSGIN; phase = PHASE_MSGIN;
NCR5380_transfer_pio(instance, &phase, &len, &data); NCR5380_transfer_pio(instance, &phase, &len, &data);
dprintk(NDEBUG_EXTENDED, "scsi%d : message received, residual %d\n", instance->host_no, len); dsprintk(NDEBUG_EXTENDED, instance, "message received, residual %d\n",
len);
switch (extended_msg[2]) { switch (extended_msg[2]) {
case EXTENDED_SDTR: case EXTENDED_SDTR:
...@@ -2160,7 +2162,8 @@ static void NCR5380_reselect(struct Scsi_Host *instance) { ...@@ -2160,7 +2162,8 @@ static void NCR5380_reselect(struct Scsi_Host *instance) {
NCR5380_write(MODE_REG, MR_BASE); NCR5380_write(MODE_REG, MR_BASE);
target_mask = NCR5380_read(CURRENT_SCSI_DATA_REG) & ~(hostdata->id_mask); target_mask = NCR5380_read(CURRENT_SCSI_DATA_REG) & ~(hostdata->id_mask);
dprintk(NDEBUG_RESELECTION, "scsi%d : reselect\n", instance->host_no);
dsprintk(NDEBUG_RESELECTION, instance, "reselect\n");
/* /*
* At this point, we have detected that our SCSI ID is on the bus, * At this point, we have detected that our SCSI ID is on the bus,
...@@ -2249,8 +2252,8 @@ static void NCR5380_reselect(struct Scsi_Host *instance) { ...@@ -2249,8 +2252,8 @@ static void NCR5380_reselect(struct Scsi_Host *instance) {
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE); NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
hostdata->connected = tmp; hostdata->connected = tmp;
dprintk(NDEBUG_RESELECTION, "scsi%d : nexus established, target = %d, lun = %llu, tag = %d\n", dsprintk(NDEBUG_RESELECTION, instance, "nexus established, target %d, lun %llu, tag %d\n",
instance->host_no, tmp->device->id, tmp->device->lun, tmp->tag); scmd_id(tmp), tmp->device->lun, tmp->tag);
} }
/* /*
......
drivers/scsi/atari_NCR5380.c
View file @ b746545f
...@@ -175,8 +175,6 @@ ...@@ -175,8 +175,6 @@
* possible) function may be used. * possible) function may be used.
*/ */
#define HOSTNO instance->host_no
static int do_abort(struct Scsi_Host *); static int do_abort(struct Scsi_Host *);
static void do_reset(struct Scsi_Host *); static void do_reset(struct Scsi_Host *);
...@@ -1024,10 +1022,8 @@ static void NCR5380_main(struct work_struct *work) ...@@ -1024,10 +1022,8 @@ static void NCR5380_main(struct work_struct *work)
&& !hostdata->dma_len && !hostdata->dma_len
#endif #endif
) { ) {
dprintk(NDEBUG_MAIN, "scsi%d: main: performing information transfer\n", dsprintk(NDEBUG_MAIN, instance, "main: performing information transfer\n");
HOSTNO);
NCR5380_information_transfer(instance); NCR5380_information_transfer(instance);
dprintk(NDEBUG_MAIN, "scsi%d: main: done set false\n", HOSTNO);
done = 0; done = 0;
} }
} while (!done); } while (!done);
...@@ -1064,7 +1060,7 @@ static void NCR5380_dma_complete(struct Scsi_Host *instance) ...@@ -1064,7 +1060,7 @@ static void NCR5380_dma_complete(struct Scsi_Host *instance)
(BASR_PHASE_MATCH|BASR_ACK)) { (BASR_PHASE_MATCH|BASR_ACK)) {
saved_data = NCR5380_read(INPUT_DATA_REG); saved_data = NCR5380_read(INPUT_DATA_REG);
overrun = 1; overrun = 1;
dprintk(NDEBUG_DMA, "scsi%d: read overrun handled\n", HOSTNO); dsprintk(NDEBUG_DMA, instance, "read overrun handled\n");
} }
} }
} }
...@@ -1169,8 +1165,8 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id) ...@@ -1169,8 +1165,8 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id)
unsigned char mr = NCR5380_read(MODE_REG); unsigned char mr = NCR5380_read(MODE_REG);
unsigned char sr = NCR5380_read(STATUS_REG); unsigned char sr = NCR5380_read(STATUS_REG);
dprintk(NDEBUG_INTR, "scsi%d: 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",
HOSTNO, irq, basr, sr, mr); irq, basr, sr, mr);
#if defined(REAL_DMA) #if defined(REAL_DMA)
if ((mr & MR_DMA_MODE) || (mr & MR_MONITOR_BSY)) { if ((mr & MR_DMA_MODE) || (mr & MR_MONITOR_BSY)) {
...@@ -1179,7 +1175,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id) ...@@ -1179,7 +1175,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id)
* for End of DMA errata need to happen in DMA Mode. * for End of DMA errata need to happen in DMA Mode.
*/ */
dprintk(NDEBUG_INTR, "scsi%d: interrupt in DMA mode\n", HOSTNO); dsprintk(NDEBUG_INTR, instance, "interrupt in DMA mode\n");
if (hostdata->connected) { if (hostdata->connected) {
NCR5380_dma_complete(instance); NCR5380_dma_complete(instance);
...@@ -1196,8 +1192,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id) ...@@ -1196,8 +1192,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id)
NCR5380_write(SELECT_ENABLE_REG, 0); NCR5380_write(SELECT_ENABLE_REG, 0);
NCR5380_read(RESET_PARITY_INTERRUPT_REG); NCR5380_read(RESET_PARITY_INTERRUPT_REG);
dprintk(NDEBUG_INTR, "scsi%d: interrupt with SEL and IO\n", dsprintk(NDEBUG_INTR, instance, "interrupt with SEL and IO\n");
HOSTNO);
if (!hostdata->connected) { if (!hostdata->connected) {
NCR5380_reselect(instance); NCR5380_reselect(instance);
...@@ -1209,7 +1204,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id) ...@@ -1209,7 +1204,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id)
/* Probably Bus Reset */ /* Probably Bus Reset */
NCR5380_read(RESET_PARITY_INTERRUPT_REG); NCR5380_read(RESET_PARITY_INTERRUPT_REG);
dprintk(NDEBUG_INTR, "scsi%d: unknown interrupt\n", HOSTNO); dsprintk(NDEBUG_INTR, instance, "unknown interrupt\n");
#ifdef SUN3_SCSI_VME #ifdef SUN3_SCSI_VME
dregs->csr |= CSR_DMA_ENABLE; dregs->csr |= CSR_DMA_ENABLE;
#endif #endif
...@@ -1266,8 +1261,8 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance, ...@@ -1266,8 +1261,8 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
int err; int err;
NCR5380_dprint(NDEBUG_ARBITRATION, instance); NCR5380_dprint(NDEBUG_ARBITRATION, instance);
dprintk(NDEBUG_ARBITRATION, "scsi%d: starting arbitration, id = %d\n", HOSTNO, dsprintk(NDEBUG_ARBITRATION, instance, "starting arbitration, id = %d\n",
instance->this_id); instance->this_id);
/* /*
* Arbitration and selection phases are slow and involve dropping the * Arbitration and selection phases are slow and involve dropping the
...@@ -1321,8 +1316,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance, ...@@ -1321,8 +1316,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
(NCR5380_read(CURRENT_SCSI_DATA_REG) & hostdata->id_higher_mask) || (NCR5380_read(CURRENT_SCSI_DATA_REG) & hostdata->id_higher_mask) ||
(NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_LOST)) { (NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_LOST)) {
NCR5380_write(MODE_REG, MR_BASE); NCR5380_write(MODE_REG, MR_BASE);
dprintk(NDEBUG_ARBITRATION, "scsi%d: lost arbitration, deasserting MR_ARBITRATE\n", dsprintk(NDEBUG_ARBITRATION, instance, "lost arbitration, deasserting MR_ARBITRATE\n");
HOSTNO);
spin_lock_irq(&hostdata->lock); spin_lock_irq(&hostdata->lock);
goto out; goto out;
} }
...@@ -1356,7 +1350,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance, ...@@ -1356,7 +1350,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
goto out; goto out;
} }
dprintk(NDEBUG_ARBITRATION, "scsi%d: won arbitration\n", HOSTNO); dsprintk(NDEBUG_ARBITRATION, instance, "won arbitration\n");
/* /*
* Now that we have won arbitration, start Selection process, asserting * Now that we have won arbitration, start Selection process, asserting
...@@ -1412,7 +1406,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance, ...@@ -1412,7 +1406,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
udelay(1); udelay(1);
dprintk(NDEBUG_SELECTION, "scsi%d: selecting target %d\n", HOSTNO, cmd->device->id); dsprintk(NDEBUG_SELECTION, instance, "selecting target %d\n", scmd_id(cmd));
/* /*
* The SCSI specification calls for a 250 ms timeout for the actual * The SCSI specification calls for a 250 ms timeout for the actual
...@@ -1486,8 +1480,8 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance, ...@@ -1486,8 +1480,8 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
goto out; goto out;
} }
dprintk(NDEBUG_SELECTION, "scsi%d: target %d selected, going into MESSAGE OUT phase.\n", dsprintk(NDEBUG_SELECTION, instance, "target %d selected, going into MESSAGE OUT phase.\n",
HOSTNO, cmd->device->id); scmd_id(cmd));
tmp[0] = IDENTIFY(1, cmd->device->lun); tmp[0] = IDENTIFY(1, cmd->device->lun);
#ifdef SUPPORT_TAGS #ifdef SUPPORT_TAGS
...@@ -1506,7 +1500,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance, ...@@ -1506,7 +1500,7 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
data = tmp; data = tmp;
phase = PHASE_MSGOUT; phase = PHASE_MSGOUT;
NCR5380_transfer_pio(instance, &phase, &len, &data); NCR5380_transfer_pio(instance, &phase, &len, &data);
dprintk(NDEBUG_SELECTION, "scsi%d: nexus established.\n", HOSTNO); dsprintk(NDEBUG_SELECTION, instance, "nexus established.\n");
/* XXX need to handle errors here */ /* XXX need to handle errors here */
hostdata->connected = cmd; hostdata->connected = cmd;
...@@ -1578,11 +1572,11 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, ...@@ -1578,11 +1572,11 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance,
if (NCR5380_poll_politely(instance, STATUS_REG, SR_REQ, SR_REQ, HZ) < 0) if (NCR5380_poll_politely(instance, STATUS_REG, SR_REQ, SR_REQ, HZ) < 0)
break; break;
dprintk(NDEBUG_HANDSHAKE, "scsi%d: REQ detected\n", HOSTNO); dsprintk(NDEBUG_HANDSHAKE, instance, "REQ asserted\n");
/* Check for phase mismatch */ /* Check for phase mismatch */
if ((NCR5380_read(STATUS_REG) & PHASE_MASK) != p) { if ((NCR5380_read(STATUS_REG) & PHASE_MASK) != p) {
dprintk(NDEBUG_PIO, "scsi%d: phase mismatch\n", HOSTNO); dsprintk(NDEBUG_PIO, instance, "phase mismatch\n");
NCR5380_dprint_phase(NDEBUG_PIO, instance); NCR5380_dprint_phase(NDEBUG_PIO, instance);
break; break;
} }
...@@ -1624,7 +1618,7 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, ...@@ -1624,7 +1618,7 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance,
STATUS_REG, SR_REQ, 0, 5 * HZ) < 0) STATUS_REG, SR_REQ, 0, 5 * HZ) < 0)
break; break;
dprintk(NDEBUG_HANDSHAKE, "scsi%d: req false, handshake complete\n", HOSTNO); dsprintk(NDEBUG_HANDSHAKE, instance, "REQ negated, handshake complete\n");
/* /*
* We have several special cases to consider during REQ/ACK handshaking : * We have several special cases to consider during REQ/ACK handshaking :
...@@ -1645,7 +1639,7 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, ...@@ -1645,7 +1639,7 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance,
} }
} while (--c); } while (--c);
dprintk(NDEBUG_PIO, "scsi%d: residual %d\n", HOSTNO, c); dsprintk(NDEBUG_PIO, instance, "residual %d\n", c);
*count = c; *count = c;
*data = d; *data = d;
...@@ -1791,9 +1785,8 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, ...@@ -1791,9 +1785,8 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance,
} }
hostdata->dma_len = c; hostdata->dma_len = c;
dprintk(NDEBUG_DMA, "scsi%d: initializing DMA for %s, %d bytes %s %p\n", dsprintk(NDEBUG_DMA, instance, "initializing DMA %s: length %d, address %p\n",
instance->host_no, (p & SR_IO) ? "reading" : "writing", (p & SR_IO) ? "receive" : "send", c, *data);
c, (p & SR_IO) ? "to" : "from", *data);
/* netbsd turns off ints here, why not be safe and do it too */ /* netbsd turns off ints here, why not be safe and do it too */
...@@ -1829,9 +1822,8 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, ...@@ -1829,9 +1822,8 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance,
if (hostdata->read_overruns && (p & SR_IO)) if (hostdata->read_overruns && (p & SR_IO))
c -= hostdata->read_overruns; c -= hostdata->read_overruns;
dprintk(NDEBUG_DMA, "scsi%d: initializing DMA for %s, %d bytes %s %p\n", dsprintk(NDEBUG_DMA, instance, "initializing DMA %s: length %d, address %p\n",
HOSTNO, (p & SR_IO) ? "reading" : "writing", (p & SR_IO) ? "receive" : "send", c, d);
c, (p & SR_IO) ? "to" : "from", d);
NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(p)); NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(p));
NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE | MR_MONITOR_BSY | NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE | MR_MONITOR_BSY |
...@@ -1978,9 +1970,9 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) ...@@ -1978,9 +1970,9 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
* they are at contiguous physical addresses. * they are at contiguous physical addresses.
*/ */
merge_contiguous_buffers(cmd); merge_contiguous_buffers(cmd);
dprintk(NDEBUG_INFORMATION, "scsi%d: %d bytes and %d buffers left\n", dsprintk(NDEBUG_INFORMATION, instance, "%d bytes and %d buffers left\n",
HOSTNO, cmd->SCp.this_residual, cmd->SCp.this_residual,
cmd->SCp.buffers_residual); cmd->SCp.buffers_residual);
} }
/* /*
...@@ -2068,11 +2060,12 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) ...@@ -2068,11 +2060,12 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
#ifdef SUPPORT_TAGS #ifdef SUPPORT_TAGS
cmd_free_tag(cmd); cmd_free_tag(cmd);
if (status_byte(cmd->SCp.Status) == QUEUE_FULL) { if (status_byte(cmd->SCp.Status) == QUEUE_FULL) {
struct tag_alloc *ta = &hostdata->TagAlloc[scmd_id(cmd)][cmd->device->lun]; u8 lun = cmd->device->lun;
dprintk(NDEBUG_TAGS, "scsi%d: target %d lun %llu returned " struct tag_alloc *ta = &hostdata->TagAlloc[scmd_id(cmd)][lun];
"QUEUE_FULL after %d commands\n",
HOSTNO, cmd->device->id, cmd->device->lun, dsprintk(NDEBUG_TAGS, instance,
ta->nr_allocated); "QUEUE_FULL %p target %d lun %d nr_allocated %d\n",
cmd, scmd_id(cmd), lun, ta->nr_allocated);
if (ta->queue_size > ta->nr_allocated) if (ta->queue_size > ta->nr_allocated)
ta->queue_size = ta->nr_allocated; ta->queue_size = ta->nr_allocated;
} }
...@@ -2126,10 +2119,8 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) ...@@ -2126,10 +2119,8 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
cmd->device->tagged_supported = 0; cmd->device->tagged_supported = 0;
hostdata->busy[cmd->device->id] |= (1 << cmd->device->lun); hostdata->busy[cmd->device->id] |= (1 << cmd->device->lun);
cmd->tag = TAG_NONE; cmd->tag = TAG_NONE;
dprintk(NDEBUG_TAGS, "scsi%d: target %d lun %llu rejected " dsprintk(NDEBUG_TAGS, instance, "target %d lun %llu rejected QUEUE_TAG message; tagged queuing disabled\n",
"QUEUE_TAG message; tagged queuing " scmd_id(cmd), cmd->device->lun);
"disabled\n",
HOSTNO, cmd->device->id, cmd->device->lun);
break; break;
} }
break; break;
...@@ -2188,14 +2179,15 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) ...@@ -2188,14 +2179,15 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
spin_unlock_irq(&hostdata->lock); spin_unlock_irq(&hostdata->lock);
dprintk(NDEBUG_EXTENDED, "scsi%d: receiving extended message\n", HOSTNO); dsprintk(NDEBUG_EXTENDED, instance, "receiving extended message\n");
len = 2; len = 2;
data = extended_msg + 1; data = extended_msg + 1;
phase = PHASE_MSGIN; phase = PHASE_MSGIN;
NCR5380_transfer_pio(instance, &phase, &len, &data); NCR5380_transfer_pio(instance, &phase, &len, &data);
dprintk(NDEBUG_EXTENDED, "scsi%d: length=%d, code=0x%02x\n", HOSTNO, dsprintk(NDEBUG_EXTENDED, instance, "length %d, code 0x%02x\n",
(int)extended_msg[1], (int)extended_msg[2]); (int)extended_msg[1],
(int)extended_msg[2]);
if (!len && extended_msg[1] > 0 && if (!len && extended_msg[1] > 0 &&
extended_msg[1] <= sizeof(extended_msg) - 2) { extended_msg[1] <= sizeof(extended_msg) - 2) {
...@@ -2206,8 +2198,8 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) ...@@ -2206,8 +2198,8 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
phase = PHASE_MSGIN; phase = PHASE_MSGIN;
NCR5380_transfer_pio(instance, &phase, &len, &data); NCR5380_transfer_pio(instance, &phase, &len, &data);
dprintk(NDEBUG_EXTENDED, "scsi%d: message received, residual %d\n", dsprintk(NDEBUG_EXTENDED, instance, "message received, residual %d\n",
HOSTNO, len); len);
switch (extended_msg[2]) { switch (extended_msg[2]) {
case EXTENDED_SDTR: case EXTENDED_SDTR:
...@@ -2335,7 +2327,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) ...@@ -2335,7 +2327,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance)
target_mask = NCR5380_read(CURRENT_SCSI_DATA_REG) & ~(hostdata->id_mask); target_mask = NCR5380_read(CURRENT_SCSI_DATA_REG) & ~(hostdata->id_mask);
dprintk(NDEBUG_RESELECTION, "scsi%d: reselect\n", HOSTNO); dsprintk(NDEBUG_RESELECTION, instance, "reselect\n");
/* /*
* At this point, we have detected that our SCSI ID is on the bus, * At this point, we have detected that our SCSI ID is on the bus,
...@@ -2405,8 +2397,8 @@ static void NCR5380_reselect(struct Scsi_Host *instance) ...@@ -2405,8 +2397,8 @@ static void NCR5380_reselect(struct Scsi_Host *instance)
if (!NCR5380_transfer_pio(instance, &phase, &len, &data) && if (!NCR5380_transfer_pio(instance, &phase, &len, &data) &&
msg[1] == SIMPLE_QUEUE_TAG) msg[1] == SIMPLE_QUEUE_TAG)
tag = msg[2]; tag = msg[2];
dprintk(NDEBUG_TAGS, "scsi%d: target mask %02x, lun %d sent tag %d at " dsprintk(NDEBUG_TAGS, instance, "reselect: target mask %02x, lun %d sent tag %d\n",
"reselection\n", HOSTNO, target_mask, lun, tag); target_mask, lun, tag);
} }
#endif #endif
...@@ -2491,14 +2483,14 @@ static void NCR5380_reselect(struct Scsi_Host *instance) ...@@ -2491,14 +2483,14 @@ static void NCR5380_reselect(struct Scsi_Host *instance)
if (!NCR5380_transfer_pio(instance, &phase, &len, &data) && if (!NCR5380_transfer_pio(instance, &phase, &len, &data) &&
msg[1] == SIMPLE_QUEUE_TAG) msg[1] == SIMPLE_QUEUE_TAG)
tag = msg[2]; tag = msg[2];
dprintk(NDEBUG_TAGS, "scsi%d: target mask %02x, lun %d sent tag %d at reselection\n" dsprintk(NDEBUG_TAGS, instance, "reselect: target mask %02x, lun %d sent tag %d\n"
HOSTNO, target_mask, lun, tag); target_mask, lun, tag);
} }
#endif #endif
hostdata->connected = tmp; hostdata->connected = tmp;
dprintk(NDEBUG_RESELECTION, "scsi%d: nexus established, target = %d, lun = %llu, tag = %d\n", dsprintk(NDEBUG_RESELECTION, instance, "nexus established, target %d, lun %llu, tag %d\n",
HOSTNO, tmp->device->id, tmp->device->lun, tmp->tag); scmd_id(tmp), tmp->device->lun, tmp->tag);
} }
......
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