]> Pileus Git - ~andy/linux/blobdiff - drivers/scsi/a3000.c
Merge branch 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[~andy/linux] / drivers / scsi / a3000.c
index 79a4a3c97474f98856d260fd5670d250d6a49965..d9468027fb6150caed5a9854623b5673ddff58a4 100644 (file)
@@ -1,34 +1,32 @@
 #include <linux/types.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/blkdev.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
+#include <linux/platform_device.h>
 
-#include <asm/setup.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/amigaints.h>
 #include <asm/amigahw.h>
-#include <asm/irq.h>
 
 #include "scsi.h"
-#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "a3000.h"
 
-#include <linux/stat.h>
-
 
-static int a3000_release(struct Scsi_Host *instance);
+struct a3000_hostdata {
+       struct WD33C93_hostdata wh;
+       struct a3000_scsiregs *regs;
+};
 
 static irqreturn_t a3000_intr(int irq, void *data)
 {
        struct Scsi_Host *instance = data;
-       struct a3000_scsiregs *regs = (struct a3000_scsiregs *)(instance->base);
-       unsigned int status = regs->ISTR;
+       struct a3000_hostdata *hdata = shost_priv(instance);
+       unsigned int status = hdata->regs->ISTR;
        unsigned long flags;
 
        if (!(status & ISTR_INT_P))
@@ -39,15 +37,16 @@ static irqreturn_t a3000_intr(int irq, void *data)
                spin_unlock_irqrestore(instance->host_lock, flags);
                return IRQ_HANDLED;
        }
-       printk("Non-serviced A3000 SCSI-interrupt? ISTR = %02x\n", status);
+       pr_warning("Non-serviced A3000 SCSI-interrupt? ISTR = %02x\n", status);
        return IRQ_NONE;
 }
 
 static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
 {
        struct Scsi_Host *instance = cmd->device->host;
-       struct WD33C93_hostdata *hdata = shost_priv(instance);
-       struct a3000_scsiregs *regs = (struct a3000_scsiregs *)(instance->base);
+       struct a3000_hostdata *hdata = shost_priv(instance);
+       struct WD33C93_hostdata *wh = &hdata->wh;
+       struct a3000_scsiregs *regs = hdata->regs;
        unsigned short cntr = CNTR_PDMD | CNTR_INTEN;
        unsigned long addr = virt_to_bus(cmd->SCp.ptr);
 
@@ -58,23 +57,23 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
         * buffer
         */
        if (addr & A3000_XFER_MASK) {
-               hdata->dma_bounce_len = (cmd->SCp.this_residual + 511) & ~0x1ff;
-               hdata->dma_bounce_buffer = kmalloc(hdata->dma_bounce_len,
-                                                  GFP_KERNEL);
+               wh->dma_bounce_len = (cmd->SCp.this_residual + 511) & ~0x1ff;
+               wh->dma_bounce_buffer = kmalloc(wh->dma_bounce_len,
+                                               GFP_KERNEL);
 
                /* can't allocate memory; use PIO */
-               if (!hdata->dma_bounce_buffer) {
-                       hdata->dma_bounce_len = 0;
+               if (!wh->dma_bounce_buffer) {
+                       wh->dma_bounce_len = 0;
                        return 1;
                }
 
                if (!dir_in) {
                        /* copy to bounce buffer for a write */
-                       memcpy(hdata->dma_bounce_buffer, cmd->SCp.ptr,
+                       memcpy(wh->dma_bounce_buffer, cmd->SCp.ptr,
                               cmd->SCp.this_residual);
                }
 
-               addr = virt_to_bus(hdata->dma_bounce_buffer);
+               addr = virt_to_bus(wh->dma_bounce_buffer);
        }
 
        /* setup dma direction */
@@ -82,7 +81,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
                cntr |= CNTR_DDIR;
 
        /* remember direction */
-       hdata->dma_dir = dir_in;
+       wh->dma_dir = dir_in;
 
        regs->CNTR = cntr;
 
@@ -109,20 +108,21 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
 static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
                     int status)
 {
-       struct WD33C93_hostdata *hdata = shost_priv(instance);
-       struct a3000_scsiregs *regs = (struct a3000_scsiregs *)(instance->base);
+       struct a3000_hostdata *hdata = shost_priv(instance);
+       struct WD33C93_hostdata *wh = &hdata->wh;
+       struct a3000_scsiregs *regs = hdata->regs;
 
        /* disable SCSI interrupts */
        unsigned short cntr = CNTR_PDMD;
 
-       if (!hdata->dma_dir)
+       if (!wh->dma_dir)
                cntr |= CNTR_DDIR;
 
        regs->CNTR = cntr;
        mb();                   /* make sure CNTR is updated before next IO */
 
        /* flush if we were reading */
-       if (hdata->dma_dir) {
+       if (wh->dma_dir) {
                regs->FLUSH = 1;
                mb();           /* don't allow prefetch */
                while (!(regs->ISTR & ISTR_FE_FLG))
@@ -145,88 +145,43 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
        mb();                   /* make sure CNTR is updated before next IO */
 
        /* copy from a bounce buffer, if necessary */
-       if (status && hdata->dma_bounce_buffer) {
+       if (status && wh->dma_bounce_buffer) {
                if (SCpnt) {
-                       if (hdata->dma_dir && SCpnt)
-                               memcpy(SCpnt->SCp.ptr,
-                                      hdata->dma_bounce_buffer,
+                       if (wh->dma_dir && SCpnt)
+                               memcpy(SCpnt->SCp.ptr, wh->dma_bounce_buffer,
                                       SCpnt->SCp.this_residual);
-                       kfree(hdata->dma_bounce_buffer);
-                       hdata->dma_bounce_buffer = NULL;
-                       hdata->dma_bounce_len = 0;
+                       kfree(wh->dma_bounce_buffer);
+                       wh->dma_bounce_buffer = NULL;
+                       wh->dma_bounce_len = 0;
                } else {
-                       kfree(hdata->dma_bounce_buffer);
-                       hdata->dma_bounce_buffer = NULL;
-                       hdata->dma_bounce_len = 0;
+                       kfree(wh->dma_bounce_buffer);
+                       wh->dma_bounce_buffer = NULL;
+                       wh->dma_bounce_len = 0;
                }
        }
 }
 
-static int __init a3000_detect(struct scsi_host_template *tpnt)
-{
-       struct Scsi_Host *instance;
-       wd33c93_regs wdregs;
-       struct a3000_scsiregs *regs;
-       struct WD33C93_hostdata *hdata;
-
-       if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(A3000_SCSI))
-               return 0;
-       if (!request_mem_region(0xDD0000, 256, "wd33c93"))
-               return 0;
-
-       tpnt->proc_name = "A3000";
-       tpnt->proc_info = &wd33c93_proc_info;
-
-       instance = scsi_register(tpnt, sizeof(struct WD33C93_hostdata));
-       if (instance == NULL)
-               goto fail_register;
-
-       instance->base = ZTWO_VADDR(0xDD0000);
-       instance->irq = IRQ_AMIGA_PORTS;
-       regs = (struct a3000_scsiregs *)(instance->base);
-       regs->DAWR = DAWR_A3000;
-       wdregs.SASR = &regs->SASR;
-       wdregs.SCMD = &regs->SCMD;
-       hdata = shost_priv(instance);
-       hdata->no_sync = 0xff;
-       hdata->fast = 0;
-       hdata->dma_mode = CTRL_DMA;
-       wd33c93_init(instance, wdregs, dma_setup, dma_stop, WD33C93_FS_12_15);
-       if (request_irq(IRQ_AMIGA_PORTS, a3000_intr, IRQF_SHARED, "A3000 SCSI",
-                       instance))
-               goto fail_irq;
-       regs->CNTR = CNTR_PDMD | CNTR_INTEN;
-
-       return 1;
-
-fail_irq:
-       scsi_unregister(instance);
-fail_register:
-       release_mem_region(0xDD0000, 256);
-       return 0;
-}
-
 static int a3000_bus_reset(struct scsi_cmnd *cmd)
 {
+       struct Scsi_Host *instance = cmd->device->host;
+
        /* FIXME perform bus-specific reset */
 
        /* FIXME 2: kill this entire function, which should
           cause mid-layer to call wd33c93_host_reset anyway? */
 
-       spin_lock_irq(cmd->device->host->host_lock);
+       spin_lock_irq(instance->host_lock);
        wd33c93_host_reset(cmd);
-       spin_unlock_irq(cmd->device->host->host_lock);
+       spin_unlock_irq(instance->host_lock);
 
        return SUCCESS;
 }
 
-#define HOSTS_C
-
-static struct scsi_host_template driver_template = {
-       .proc_name              = "A3000",
+static struct scsi_host_template amiga_a3000_scsi_template = {
+       .module                 = THIS_MODULE,
        .name                   = "Amiga 3000 built-in SCSI",
-       .detect                 = a3000_detect,
-       .release                = a3000_release,
+       .proc_info              = wd33c93_proc_info,
+       .proc_name              = "A3000",
        .queuecommand           = wd33c93_queuecommand,
        .eh_abort_handler       = wd33c93_abort,
        .eh_bus_reset_handler   = a3000_bus_reset,
@@ -238,17 +193,104 @@ static struct scsi_host_template driver_template = {
        .use_clustering         = ENABLE_CLUSTERING
 };
 
+static int __init amiga_a3000_scsi_probe(struct platform_device *pdev)
+{
+       struct resource *res;
+       struct Scsi_Host *instance;
+       int error;
+       struct a3000_scsiregs *regs;
+       wd33c93_regs wdregs;
+       struct a3000_hostdata *hdata;
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res)
+               return -ENODEV;
+
+       if (!request_mem_region(res->start, resource_size(res), "wd33c93"))
+               return -EBUSY;
+
+       instance = scsi_host_alloc(&amiga_a3000_scsi_template,
+                                  sizeof(struct a3000_hostdata));
+       if (!instance) {
+               error = -ENOMEM;
+               goto fail_alloc;
+       }
+
+       instance->irq = IRQ_AMIGA_PORTS;
+
+       regs = (struct a3000_scsiregs *)ZTWO_VADDR(res->start);
+       regs->DAWR = DAWR_A3000;
+
+       wdregs.SASR = &regs->SASR;
+       wdregs.SCMD = &regs->SCMD;
+
+       hdata = shost_priv(instance);
+       hdata->wh.no_sync = 0xff;
+       hdata->wh.fast = 0;
+       hdata->wh.dma_mode = CTRL_DMA;
+       hdata->regs = regs;
+
+       wd33c93_init(instance, wdregs, dma_setup, dma_stop, WD33C93_FS_12_15);
+       error = request_irq(IRQ_AMIGA_PORTS, a3000_intr, IRQF_SHARED,
+                           "A3000 SCSI", instance);
+       if (error)
+               goto fail_irq;
+
+       regs->CNTR = CNTR_PDMD | CNTR_INTEN;
+
+       error = scsi_add_host(instance, NULL);
+       if (error)
+               goto fail_host;
+
+       platform_set_drvdata(pdev, instance);
 
-#include "scsi_module.c"
+       scsi_scan_host(instance);
+       return 0;
+
+fail_host:
+       free_irq(IRQ_AMIGA_PORTS, instance);
+fail_irq:
+       scsi_host_put(instance);
+fail_alloc:
+       release_mem_region(res->start, resource_size(res));
+       return error;
+}
 
-static int a3000_release(struct Scsi_Host *instance)
+static int __exit amiga_a3000_scsi_remove(struct platform_device *pdev)
 {
-       struct a3000_scsiregs *regs = (struct a3000_scsiregs *)(instance->base);
+       struct Scsi_Host *instance = platform_get_drvdata(pdev);
+       struct a3000_hostdata *hdata = shost_priv(instance);
+       struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+       hdata->regs->CNTR = 0;
+       scsi_remove_host(instance);
+       free_irq(IRQ_AMIGA_PORTS, instance);
+       scsi_host_put(instance);
+       release_mem_region(res->start, resource_size(res));
+       return 0;
+}
+
+static struct platform_driver amiga_a3000_scsi_driver = {
+       .remove = __exit_p(amiga_a3000_scsi_remove),
+       .driver   = {
+               .name   = "amiga-a3000-scsi",
+               .owner  = THIS_MODULE,
+       },
+};
 
-       regs->CNTR = 0;
-       release_mem_region(0xDD0000, 256);
-       free_irq(IRQ_AMIGA_PORTS, a3000_intr);
-       return 1;
+static int __init amiga_a3000_scsi_init(void)
+{
+       return platform_driver_probe(&amiga_a3000_scsi_driver,
+                                    amiga_a3000_scsi_probe);
+}
+module_init(amiga_a3000_scsi_init);
+
+static void __exit amiga_a3000_scsi_exit(void)
+{
+       platform_driver_unregister(&amiga_a3000_scsi_driver);
 }
+module_exit(amiga_a3000_scsi_exit);
 
+MODULE_DESCRIPTION("Amiga 3000 built-in SCSI");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:amiga-a3000-scsi");