scsi: dpt_i2o: Do not process completions with invalid addresses

adpt_isr() reads reply addresses from a hardware register, which
should always be within the DMA address range of the device's pool of
reply address buffers.  In case the address is out of range, it tries
to muddle on, converting to a virtual address using bus_to_virt().

bus_to_virt() does not take DMA addresses, and it doesn't make sense
to try to handle the completion in this case.  Ignore it and continue
looping to service the interrupt.  If a completion has been lost then
the SCSI core should eventually time-out and trigger a reset.

There is no corresponding upstream commit, because this driver was
removed upstream.

Fixes: 67af2b060e02 ("[SCSI] dpt_i2o: move from virt_to_bus/bus_to_virt ...")
Signed-off-by: Ben Hutchings <benh@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 881906dc33b837324471e103f66d1a7037198540..ba1bfb30a27298842d4a1af5ccbf616e6e9f283b 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -480,7 +480,7 @@ config SCSI_MVUMI
 
 config SCSI_DPT_I2O
        tristate "Adaptec I2O RAID support "
-       depends on SCSI && PCI && VIRT_TO_BUS
+       depends on SCSI && PCI
        help
          This driver supports all of Adaptec's I2O based RAID controllers as 
          well as the DPT SmartRaid V cards.  This is an Adaptec maintained

diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 0773fde778b132cd506635cc9f0333c9dcfd5e38..bbd358993e5c0632d6c7fc9a2f9a20538d8139b3 100644 (file)
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -59,7 +59,7 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Driver");
 
 #include <asm/processor.h>     /* for boot_cpu_data */
 #include <asm/pgtable.h>
-#include <asm/io.h>            /* for virt_to_bus, etc. */
+#include <asm/io.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -1912,7 +1912,7 @@ static irqreturn_t adpt_isr(int irq, void *dev_id)
                } else {
                        /* Ick, we should *never* be here */
                        printk(KERN_ERR "dpti: reply frame not from pool\n");
-                       reply = (u8 *)bus_to_virt(m);
+                       continue;
                }
 
                if (readl(reply) & MSG_FAIL) {