Commit 12866b99 authored by Finn Thain's avatar Finn Thain Committed by Martin K. Petersen

ncr5380: Fix register decoding for debugging

Decode all bits in the chip registers. They are all useful at times.
Fix printk severity so that this output can be suppressed along with
the other debugging output.
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 4712bd8d
...@@ -256,12 +256,20 @@ static struct { ...@@ -256,12 +256,20 @@ static struct {
{0, NULL} {0, NULL}
}, },
basrs[] = { basrs[] = {
{BASR_END_DMA_TRANSFER, "END OF DMA"},
{BASR_DRQ, "DRQ"},
{BASR_PARITY_ERROR, "PARITY ERROR"},
{BASR_IRQ, "IRQ"},
{BASR_PHASE_MATCH, "PHASE MATCH"},
{BASR_BUSY_ERROR, "BUSY ERROR"},
{BASR_ATN, "ATN"}, {BASR_ATN, "ATN"},
{BASR_ACK, "ACK"}, {BASR_ACK, "ACK"},
{0, NULL} {0, NULL}
}, },
icrs[] = { icrs[] = {
{ICR_ASSERT_RST, "ASSERT RST"}, {ICR_ASSERT_RST, "ASSERT RST"},
{ICR_ARBITRATION_PROGRESS, "ARB. IN PROGRESS"},
{ICR_ARBITRATION_LOST, "LOST ARB."},
{ICR_ASSERT_ACK, "ASSERT ACK"}, {ICR_ASSERT_ACK, "ASSERT ACK"},
{ICR_ASSERT_BSY, "ASSERT BSY"}, {ICR_ASSERT_BSY, "ASSERT BSY"},
{ICR_ASSERT_SEL, "ASSERT SEL"}, {ICR_ASSERT_SEL, "ASSERT SEL"},
...@@ -270,14 +278,14 @@ icrs[] = { ...@@ -270,14 +278,14 @@ icrs[] = {
{0, NULL} {0, NULL}
}, },
mrs[] = { mrs[] = {
{MR_BLOCK_DMA_MODE, "MODE BLOCK DMA"}, {MR_BLOCK_DMA_MODE, "BLOCK DMA MODE"},
{MR_TARGET, "MODE TARGET"}, {MR_TARGET, "TARGET"},
{MR_ENABLE_PAR_CHECK, "MODE PARITY CHECK"}, {MR_ENABLE_PAR_CHECK, "PARITY CHECK"},
{MR_ENABLE_PAR_INTR, "MODE PARITY INTR"}, {MR_ENABLE_PAR_INTR, "PARITY INTR"},
{MR_ENABLE_EOP_INTR, "MODE EOP INTR"}, {MR_ENABLE_EOP_INTR, "EOP INTR"},
{MR_MONITOR_BSY, "MODE MONITOR BSY"}, {MR_MONITOR_BSY, "MONITOR BSY"},
{MR_DMA_MODE, "MODE DMA"}, {MR_DMA_MODE, "DMA MODE"},
{MR_ARBITRATE, "MODE ARBITRATION"}, {MR_ARBITRATE, "ARBITRATE"},
{0, NULL} {0, NULL}
}; };
...@@ -298,23 +306,23 @@ static void NCR5380_print(struct Scsi_Host *instance) ...@@ -298,23 +306,23 @@ static void NCR5380_print(struct Scsi_Host *instance)
icr = NCR5380_read(INITIATOR_COMMAND_REG); icr = NCR5380_read(INITIATOR_COMMAND_REG);
basr = NCR5380_read(BUS_AND_STATUS_REG); basr = NCR5380_read(BUS_AND_STATUS_REG);
printk("STATUS_REG: %02x ", status); printk(KERN_DEBUG "SR = 0x%02x : ", status);
for (i = 0; signals[i].mask; ++i) for (i = 0; signals[i].mask; ++i)
if (status & signals[i].mask) if (status & signals[i].mask)
printk(",%s", signals[i].name); printk(KERN_CONT "%s, ", signals[i].name);
printk("\nBASR: %02x ", basr); printk(KERN_CONT "\nBASR = 0x%02x : ", basr);
for (i = 0; basrs[i].mask; ++i) for (i = 0; basrs[i].mask; ++i)
if (basr & basrs[i].mask) if (basr & basrs[i].mask)
printk(",%s", basrs[i].name); printk(KERN_CONT "%s, ", basrs[i].name);
printk("\nICR: %02x ", icr); printk(KERN_CONT "\nICR = 0x%02x : ", icr);
for (i = 0; icrs[i].mask; ++i) for (i = 0; icrs[i].mask; ++i)
if (icr & icrs[i].mask) if (icr & icrs[i].mask)
printk(",%s", icrs[i].name); printk(KERN_CONT "%s, ", icrs[i].name);
printk("\nMODE: %02x ", mr); printk(KERN_CONT "\nMR = 0x%02x : ", mr);
for (i = 0; mrs[i].mask; ++i) for (i = 0; mrs[i].mask; ++i)
if (mr & mrs[i].mask) if (mr & mrs[i].mask)
printk(",%s", mrs[i].name); printk(KERN_CONT "%s, ", mrs[i].name);
printk("\n"); printk(KERN_CONT "\n");
} }
static struct { static struct {
......
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