vserver 2.0 rc7

[linux-2.6.git] / drivers / scsi / zalon.c

diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c
index 31ba6a9..5a51051 100644 (file)
--- a/drivers/scsi/zalon.c
+++ b/drivers/scsi/zalon.c
@@ -88,31 +88,30 @@ zalon_probe(struct parisc_device *dev)
        struct gsc_irq gsc_irq;
        u32 zalon_vers;
        int error = -ENODEV;
-       unsigned long zalon = dev->hpa;
-       unsigned long io_port = zalon + GSC_SCSI_ZALON_OFFSET;
+       void __iomem *zalon = ioremap(dev->hpa, 4096);
+       void __iomem *io_port = zalon + GSC_SCSI_ZALON_OFFSET;
        static int unit = 0;
        struct Scsi_Host *host;
        struct ncr_device device;
 
        __raw_writel(CMD_RESET, zalon + IO_MODULE_IO_COMMAND);
        while (!(__raw_readl(zalon + IO_MODULE_IO_STATUS) & IOSTATUS_RY))
-               ;
+               cpu_relax();
        __raw_writel(IOIIDATA_MINT5EN | IOIIDATA_PACKEN | IOIIDATA_PREFETCHEN,
                zalon + IO_MODULE_II_CDATA);
 
        /* XXX: Save the Zalon version for bug workarounds? */
-       zalon_vers = __raw_readl(dev->hpa + IO_MODULE_II_CDATA) & 0x07000000;
-       zalon_vers >>= 24;
+       zalon_vers = (__raw_readl(zalon + IO_MODULE_II_CDATA) >> 24) & 0x07;
 
        /* Setup the interrupts first.
        ** Later on request_irq() will register the handler.
        */
        dev->irq = gsc_alloc_irq(&gsc_irq);
 
-       printk("%s: Zalon vers field is 0x%x, IRQ %d\n", __FUNCTION__,
+       printk(KERN_INFO "%s: Zalon version %d, IRQ %d\n", __FUNCTION__,
                zalon_vers, dev->irq);
 
-       __raw_writel(gsc_irq.txn_addr | gsc_irq.txn_data, dev->hpa + IO_MODULE_EIM);
+       __raw_writel(gsc_irq.txn_addr | gsc_irq.txn_data, zalon + IO_MODULE_EIM);
 
        if (zalon_vers == 0)
                printk(KERN_WARNING "%s: Zalon 1.1 or earlier\n", __FUNCTION__);
@@ -120,16 +119,16 @@ zalon_probe(struct parisc_device *dev)
        memset(&device, 0, sizeof(struct ncr_device));
 
        /* The following three are needed before any other access. */
-       writeb(0x20, io_port + 0x38); /* DCNTL_REG,  EA  */
-       writeb(0x04, io_port + 0x1b); /* CTEST0_REG, EHP */
-       writeb(0x80, io_port + 0x22); /* CTEST4_REG, MUX */
+       __raw_writeb(0x20, io_port + 0x38); /* DCNTL_REG,  EA  */
+       __raw_writeb(0x04, io_port + 0x1b); /* CTEST0_REG, EHP */
+       __raw_writeb(0x80, io_port + 0x22); /* CTEST4_REG, MUX */
 
        /* Initialise ncr_device structure with items required by ncr_attach. */
        device.chip             = zalon720_chip;
        device.host_id          = 7;
        device.dev              = &dev->dev;
-       device.slot.base        = (u_long)io_port;
-       device.slot.base_c      = (u_long)io_port;
+       device.slot.base        = dev->hpa + GSC_SCSI_ZALON_OFFSET;
+       device.slot.base_v      = io_port;
        device.slot.irq         = dev->irq;
        device.differential     = 2;