Subject: [PATCH] m68k: split amiga7xx.c into a4000t.c and zorro7xx.c Split drivers/scsi/amiga7xx.c into drivers/scsi/a4000t.c (A4000T built-in) and drivers/scsi/zorro7xx.c (Zorro boards) Signed-off-by: Geert Uytterhoeven --- drivers/scsi/Kconfig | 25 ++-- drivers/scsi/Makefile | 3 drivers/scsi/a4000t.c | 143 +++++++++++++++++++++++ drivers/scsi/amiga7xx.c | 297 ------------------------------------------------ drivers/scsi/zorro7xx.c | 181 +++++++++++++++++++++++++++++ 5 files changed, 342 insertions(+), 307 deletions(-) --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -1002,7 +1002,7 @@ config SCSI_STEX config 53C700_BE_BUS bool - depends on SCSI_AMIGA7XX || MVME16x_SCSI || BVME6000_SCSI + depends on SCSI_A4000T || SCSI_ZORRO7XX || MVME16x_SCSI || BVME6000_SCSI default y config SCSI_SYM53C8XX_2 @@ -1624,14 +1624,25 @@ config FASTLANE_SCSI If you have the Phase5 Fastlane Z3 SCSI controller, or plan to use one in the near future, say Y to this question. Otherwise, say N. -config SCSI_AMIGA7XX - tristate "Amiga NCR53c710 SCSI support (EXPERIMENTAL)" +config SCSI_A4000T + tristate "A4000T NCR53c710 SCSI support (EXPERIMENTAL)" depends on AMIGA && SCSI && EXPERIMENTAL select SCSI_SPI_ATTRS help - Support for various NCR53c710-based SCSI controllers on the Amiga. + If you have an Amiga 4000T and have SCSI devices connected to the + built-in SCSI controller, say Y. Otherwise, say N. + + To compile this driver as a module, choose M here: the + module will be called a4000t. + +config SCSI_ZORRO7XX + tristate "Zorro NCR53c710 SCSI support (EXPERIMENTAL)" + depends on ZORRO && SCSI && EXPERIMENTAL + select SCSI_SPI_ATTRS + help + Support for various NCR53c710-based SCSI controllers on Zorro + expansion boards for the Amiga. This includes: - - the builtin SCSI controller on the Amiga 4000T, - the Amiga 4091 Zorro III SCSI-2 controller, - the MacroSystem Development's WarpEngine Amiga SCSI-2 controller (info at @@ -1639,10 +1650,6 @@ config SCSI_AMIGA7XX - the SCSI controller on the Phase5 Blizzard PowerUP 603e+ accelerator card for the Amiga 1200, - the SCSI controller on the GVP Turbo 040/060 accelerator. - Note that all of the above SCSI controllers, except for the builtin - SCSI controller on the Amiga 4000T, reside on the Zorro expansion - bus, so you also have to enable Zorro bus support if you want to use - them. config OKTAGON_SCSI tristate "BSC Oktagon SCSI support (EXPERIMENTAL)" --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -37,7 +37,8 @@ obj-$(CONFIG_SCSI_SAS_LIBSAS) += libsas/ obj-$(CONFIG_ISCSI_TCP) += libiscsi.o iscsi_tcp.o obj-$(CONFIG_INFINIBAND_ISER) += libiscsi.o -obj-$(CONFIG_SCSI_AMIGA7XX) += 53c700.o amiga7xx.o +obj-$(CONFIG_SCSI_A4000T) += 53c700.o a4000t.o +obj-$(CONFIG_SCSI_ZORRO7XX) += 53c700.o zorro7xx.o obj-$(CONFIG_A3000_SCSI) += a3000.o wd33c93.o obj-$(CONFIG_A2091_SCSI) += a2091.o wd33c93.o obj-$(CONFIG_GVP11_SCSI) += gvp11.o wd33c93.o --- /dev/null +++ b/drivers/scsi/a4000t.c @@ -0,0 +1,143 @@ +/* + * Detection routine for the NCR53c710 based Amiga SCSI Controllers for Linux. + * Amiga Technologies A4000T SCSI controller. + * + * Written 1997 by Alan Hourihane + * plus modifications of the 53c7xx.c driver to support the Amiga. + * + * Rewritten to use 53c700.c by Kars de Jong + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "53c700.h" + +MODULE_AUTHOR("Alan Hourihane / Kars de Jong "); +MODULE_DESCRIPTION("Amiga A4000T NCR53C710 driver"); +MODULE_LICENSE("GPL"); + + +static struct scsi_host_template a4000t_scsi_driver_template = { + .name = "A4000T builtin SCSI", + .proc_name = "A4000t", + .this_id = 7, + .module = THIS_MODULE, +}; + +static struct platform_device *a4000t_scsi_device; + +#define A4000T_SCSI_ADDR 0xdd0040 + +static int __devinit a4000t_probe(struct device *dev) +{ + struct Scsi_Host * host = NULL; + struct NCR_700_Host_Parameters *hostdata; + + if (!(MACH_IS_AMIGA && AMIGAHW_PRESENT(A4000_SCSI))) + goto out; + + if (!request_mem_region(A4000T_SCSI_ADDR, 0x1000, + "A4000T builtin SCSI")) + goto out; + + hostdata = kmalloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL); + if (hostdata == NULL) { + printk(KERN_ERR "a4000t-scsi: Failed to allocate host data\n"); + goto out_release; + } + memset(hostdata, 0, sizeof(struct NCR_700_Host_Parameters)); + + /* Fill in the required pieces of hostdata */ + hostdata->base = (void __iomem *)ZTWO_VADDR(A4000T_SCSI_ADDR); + hostdata->clock = 50; + hostdata->chip710 = 1; + hostdata->dmode_extra = DMODE_FC2; + hostdata->dcntl_extra = EA_710; + + /* and register the chip */ + host = NCR_700_detect(&a4000t_scsi_driver_template, hostdata, dev); + if (!host) { + printk(KERN_ERR "a4000t-scsi: No host detected; " + "board configuration problem?\n"); + goto out_free; + } + + host->this_id = 7; + host->base = A4000T_SCSI_ADDR; + host->irq = IRQ_AMIGA_PORTS; + + if (request_irq(host->irq, NCR_700_intr, IRQF_SHARED, "a4000t-scsi", + host)) { + printk(KERN_ERR "a4000t-scsi: request_irq failed\n"); + goto out_put_host; + } + + scsi_scan_host(host); + + return 0; + + out_put_host: + scsi_host_put(host); + out_free: + kfree(hostdata); + out_release: + release_mem_region(A4000T_SCSI_ADDR, 0x1000); + out: + return -ENODEV; +} + +static __devexit int a4000t_device_remove(struct device *dev) +{ + struct Scsi_Host *host = dev_to_shost(dev); + struct NCR_700_Host_Parameters *hostdata = + (struct NCR_700_Host_Parameters *)host->hostdata[0]; + + scsi_remove_host(host); + + NCR_700_release(host); + kfree(hostdata); + free_irq(host->irq, host); + release_mem_region(A4000T_SCSI_ADDR, 0x1000); + + return 0; +} + +static struct device_driver a4000t_scsi_driver = { + .name = "a4000t-scsi", + .bus = &platform_bus_type, + .probe = a4000t_probe, + .remove = __devexit_p(a4000t_device_remove), +}; + +static int __init a4000t_scsi_init(void) +{ + int err; + + err = driver_register(&a4000t_scsi_driver); + if (err) + return err; + + a4000t_scsi_device = platform_device_register_simple("a4000t-scsi", + -1, NULL, 0); + if (IS_ERR(a4000t_scsi_device)) { + driver_unregister(&a4000t_scsi_driver); + return PTR_ERR(a4000t_scsi_device); + } + + return err; +} + +static void __exit a4000t_scsi_exit(void) +{ + platform_device_unregister(a4000t_scsi_device); + driver_unregister(&a4000t_scsi_driver); +} + +module_init(a4000t_scsi_init); +module_exit(a4000t_scsi_exit); --- a/drivers/scsi/amiga7xx.c +++ /dev/null @@ -1,297 +0,0 @@ -/* - * Detection routine for the NCR53c710 based Amiga SCSI Controllers for Linux. - * Amiga MacroSystemUS WarpEngine SCSI controller. - * Amiga Technologies A4000T SCSI controller. - * Amiga Technologies/DKB A4091 SCSI controller. - * - * Written 1997 by Alan Hourihane - * plus modifications of the 53c7xx.c driver to support the Amiga. - * - * Rewritten to use 53c700.c by Kars de Jong - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "53c700.h" - -MODULE_AUTHOR("Alan Hourihane / Kars de Jong "); -MODULE_DESCRIPTION("Amiga NCR53C710 driver"); -MODULE_LICENSE("GPL"); - -static struct scsi_host_template amiga7xx_scsi_driver_template = { - .name = "A4000T builtin SCSI", - .proc_name = "Amiga7xx", - .this_id = 7, - .module = THIS_MODULE, -}; - -static struct platform_device *a4000t_scsi_device; - -#ifdef CONFIG_ZORRO - -static struct zorro_driver_data { - const char *name; - unsigned long offset; - int absolute; /* offset is absolute address */ -} amiga7xx_driver_data[] __devinitdata = { - { .name = "PowerUP 603e+", .offset = 0xf40000, .absolute = 1 }, - { .name = "WarpEngine 40xx", .offset = 0x40000 }, - { .name = "A4091", .offset = 0x800000 }, - { .name = "GForce 040/060", .offset = 0x40000 }, - { 0 } -}; - -static struct zorro_device_id amiga7xx_zorro_tbl[] __devinitdata = { - { - .id = ZORRO_PROD_PHASE5_BLIZZARD_603E_PLUS, - .driver_data = (unsigned long)&amiga7xx_driver_data[0], - }, - { - .id = ZORRO_PROD_MACROSYSTEMS_WARP_ENGINE_40xx, - .driver_data = (unsigned long)&amiga7xx_driver_data[1], - }, - { - .id = ZORRO_PROD_CBM_A4091_1, - .driver_data = (unsigned long)&amiga7xx_driver_data[2], - }, - { - .id = ZORRO_PROD_CBM_A4091_2, - .driver_data = (unsigned long)&amiga7xx_driver_data[2], - }, - { - .id = ZORRO_PROD_GVP_GFORCE_040_060, - .driver_data = (unsigned long)&amiga7xx_driver_data[3], - }, - { 0 } -}; - -static int __devinit amiga7xx_init_one(struct zorro_dev *z, - const struct zorro_device_id *ent) -{ - struct Scsi_Host * host = NULL; - struct NCR_700_Host_Parameters *hostdata; - struct zorro_driver_data *zdd; - unsigned long board, ioaddr; - - board = zorro_resource_start(z); - zdd = (struct zorro_driver_data *)ent->driver_data; - - if (zdd->absolute) { - ioaddr = zdd->offset; - } else { - ioaddr = board + zdd->offset; - } - - if (!zorro_request_device(z, zdd->name)) { - printk(KERN_ERR "amiga7xx: cannot reserve region 0x%lx, abort\n", - board); - return -EBUSY; - } - - hostdata = kmalloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL); - if (hostdata == NULL) { - printk(KERN_ERR "amiga7xx: Failed to allocate host data\n"); - goto out_release; - } - - memset(hostdata, 0, sizeof(struct NCR_700_Host_Parameters)); - - /* Fill in the required pieces of hostdata */ - if (ioaddr > 0x01000000) - hostdata->base = ioremap(ioaddr, zorro_resource_len(z)); - else - hostdata->base = (void __iomem *)ZTWO_VADDR(ioaddr); - - hostdata->clock = 50; - hostdata->chip710 = 1; - - /* Settings for at least WarpEngine 40xx */ - hostdata->ctest7_extra = CTEST7_TT1; - - amiga7xx_scsi_driver_template.name = zdd->name; - - /* and register the chip */ - host = NCR_700_detect(&amiga7xx_scsi_driver_template, - hostdata, &z->dev); - if (!host) { - printk(KERN_ERR "amiga7xx-scsi: No host detected; " - "board configuration problem?\n"); - goto out_free; - } - - host->this_id = 7; - host->base = ioaddr; - host->irq = IRQ_AMIGA_PORTS; - - if (request_irq(host->irq, NCR_700_intr, IRQF_SHARED, - "amiga7xx-scsi", host)) { - printk(KERN_ERR "amiga7xx-scsi: request_irq failed\n"); - goto out_put_host; - } - - scsi_scan_host(host); - - return 0; - - out_put_host: - scsi_host_put(host); - out_free: - if (ioaddr > 0x01000000) - iounmap(hostdata->base); - kfree(hostdata); - out_release: - zorro_release_device(z); - - return -ENODEV; -} - -static __devexit void amiga7xx_remove_one(struct zorro_dev *z) -{ - struct Scsi_Host *host = dev_to_shost(&z->dev); - struct NCR_700_Host_Parameters *hostdata = - (struct NCR_700_Host_Parameters *)host->hostdata[0]; - - scsi_remove_host(host); - - NCR_700_release(host); - kfree(hostdata); - free_irq(host->irq, host); - zorro_release_device(z); -} - -static struct zorro_driver amiga7xx_driver = { - .name = "amiga7xx-scsi", - .id_table = amiga7xx_zorro_tbl, - .probe = amiga7xx_init_one, - .remove = __devexit_p(amiga7xx_remove_one), -}; - -#endif /* CONFIG_ZORRO */ - -#define A4000T_SCSI_ADDR 0xdd0040 - -static int __devinit a4000t_probe(struct device *dev) -{ - struct Scsi_Host * host = NULL; - struct NCR_700_Host_Parameters *hostdata; - - if (!(MACH_IS_AMIGA && AMIGAHW_PRESENT(A4000_SCSI))) - goto out; - - if (!request_mem_region(A4000T_SCSI_ADDR, 0x1000, - "A4000T builtin SCSI")) - goto out; - - hostdata = kmalloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL); - if (hostdata == NULL) { - printk(KERN_ERR "a4000t-scsi: Failed to allocate host data\n"); - goto out_release; - } - memset(hostdata, 0, sizeof(struct NCR_700_Host_Parameters)); - - /* Fill in the required pieces of hostdata */ - hostdata->base = (void __iomem *)ZTWO_VADDR(A4000T_SCSI_ADDR); - hostdata->clock = 50; - hostdata->chip710 = 1; - hostdata->dmode_extra = DMODE_FC2; - hostdata->dcntl_extra = EA_710; - - /* and register the chip */ - host = NCR_700_detect(&amiga7xx_scsi_driver_template, hostdata, dev); - if (!host) { - printk(KERN_ERR "a4000t-scsi: No host detected; " - "board configuration problem?\n"); - goto out_free; - } - - host->this_id = 7; - host->base = A4000T_SCSI_ADDR; - host->irq = IRQ_AMIGA_PORTS; - - if (request_irq(host->irq, NCR_700_intr, IRQF_SHARED, "a4000t-scsi", host)) { - printk(KERN_ERR "a4000t-scsi: request_irq failed\n"); - goto out_put_host; - } - - scsi_scan_host(host); - - return 0; - - out_put_host: - scsi_host_put(host); - out_free: - kfree(hostdata); - out_release: - release_mem_region(A4000T_SCSI_ADDR, 0x1000); - out: - return -ENODEV; -} - -static __devexit int a4000t_device_remove(struct device *dev) -{ - struct Scsi_Host *host = dev_to_shost(dev); - struct NCR_700_Host_Parameters *hostdata = - (struct NCR_700_Host_Parameters *)host->hostdata[0]; - - scsi_remove_host(host); - - NCR_700_release(host); - kfree(hostdata); - free_irq(host->irq, host); - release_mem_region(A4000T_SCSI_ADDR, 0x1000); - - return 0; -} - -static struct device_driver a4000t_scsi_driver = { - .name = "a4000t-scsi", - .bus = &platform_bus_type, - .probe = a4000t_probe, - .remove = __devexit_p(a4000t_device_remove), -}; - -static int __init amiga7xx_scsi_init(void) -{ - int err; - - err = driver_register(&a4000t_scsi_driver); - if (err) - return err; - - a4000t_scsi_device = platform_device_register_simple("a4000t-scsi", - -1, NULL, 0); - if (IS_ERR(a4000t_scsi_device)) { - driver_unregister(&a4000t_scsi_driver); - return PTR_ERR(a4000t_scsi_device); - } - -#ifdef CONFIG_ZORRO - err = zorro_register_driver(&amiga7xx_driver); -#endif - - return err; -} - -static void __exit amiga7xx_scsi_exit(void) -{ - platform_device_unregister(a4000t_scsi_device); - driver_unregister(&a4000t_scsi_driver); -#ifdef CONFIG_ZORRO - zorro_unregister_driver(&amiga7xx_driver); -#endif -} - -module_init(amiga7xx_scsi_init); -module_exit(amiga7xx_scsi_exit); --- /dev/null +++ b/drivers/scsi/zorro7xx.c @@ -0,0 +1,181 @@ +/* + * Detection routine for the NCR53c710 based Amiga SCSI Controllers for Linux. + * Amiga MacroSystemUS WarpEngine SCSI controller. + * Amiga Technologies/DKB A4091 SCSI controller. + * + * Written 1997 by Alan Hourihane + * plus modifications of the 53c7xx.c driver to support the Amiga. + * + * Rewritten to use 53c700.c by Kars de Jong + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "53c700.h" + +MODULE_AUTHOR("Alan Hourihane / Kars de Jong "); +MODULE_DESCRIPTION("Amiga Zorro NCR53C710 driver"); +MODULE_LICENSE("GPL"); + + +static struct scsi_host_template zorro7xx_scsi_driver_template = { + .proc_name = "zorro7xx", + .this_id = 7, + .module = THIS_MODULE, +}; + +static struct zorro_driver_data { + const char *name; + unsigned long offset; + int absolute; /* offset is absolute address */ +} zorro7xx_driver_data[] __devinitdata = { + { .name = "PowerUP 603e+", .offset = 0xf40000, .absolute = 1 }, + { .name = "WarpEngine 40xx", .offset = 0x40000 }, + { .name = "A4091", .offset = 0x800000 }, + { .name = "GForce 040/060", .offset = 0x40000 }, + { 0 } +}; + +static struct zorro_device_id zorro7xx_zorro_tbl[] __devinitdata = { + { + .id = ZORRO_PROD_PHASE5_BLIZZARD_603E_PLUS, + .driver_data = (unsigned long)&zorro7xx_driver_data[0], + }, + { + .id = ZORRO_PROD_MACROSYSTEMS_WARP_ENGINE_40xx, + .driver_data = (unsigned long)&zorro7xx_driver_data[1], + }, + { + .id = ZORRO_PROD_CBM_A4091_1, + .driver_data = (unsigned long)&zorro7xx_driver_data[2], + }, + { + .id = ZORRO_PROD_CBM_A4091_2, + .driver_data = (unsigned long)&zorro7xx_driver_data[2], + }, + { + .id = ZORRO_PROD_GVP_GFORCE_040_060, + .driver_data = (unsigned long)&zorro7xx_driver_data[3], + }, + { 0 } +}; + +static int __devinit zorro7xx_init_one(struct zorro_dev *z, + const struct zorro_device_id *ent) +{ + struct Scsi_Host * host = NULL; + struct NCR_700_Host_Parameters *hostdata; + struct zorro_driver_data *zdd; + unsigned long board, ioaddr; + + board = zorro_resource_start(z); + zdd = (struct zorro_driver_data *)ent->driver_data; + + if (zdd->absolute) { + ioaddr = zdd->offset; + } else { + ioaddr = board + zdd->offset; + } + + if (!zorro_request_device(z, zdd->name)) { + printk(KERN_ERR "zorro7xx: cannot reserve region 0x%lx, abort\n", + board); + return -EBUSY; + } + + hostdata = kmalloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL); + if (hostdata == NULL) { + printk(KERN_ERR "zorro7xx: Failed to allocate host data\n"); + goto out_release; + } + + memset(hostdata, 0, sizeof(struct NCR_700_Host_Parameters)); + + /* Fill in the required pieces of hostdata */ + if (ioaddr > 0x01000000) + hostdata->base = ioremap(ioaddr, zorro_resource_len(z)); + else + hostdata->base = (void __iomem *)ZTWO_VADDR(ioaddr); + + hostdata->clock = 50; + hostdata->chip710 = 1; + + /* Settings for at least WarpEngine 40xx */ + hostdata->ctest7_extra = CTEST7_TT1; + + zorro7xx_scsi_driver_template.name = zdd->name; + + /* and register the chip */ + host = NCR_700_detect(&zorro7xx_scsi_driver_template, hostdata, + &z->dev); + if (!host) { + printk(KERN_ERR "zorro7xx: No host detected; " + "board configuration problem?\n"); + goto out_free; + } + + host->this_id = 7; + host->base = ioaddr; + host->irq = IRQ_AMIGA_PORTS; + + if (request_irq(host->irq, NCR_700_intr, IRQF_SHARED, "zorro7xx-scsi", + host)) { + printk(KERN_ERR "zorro7xx: request_irq failed\n"); + goto out_put_host; + } + + scsi_scan_host(host); + + return 0; + + out_put_host: + scsi_host_put(host); + out_free: + if (ioaddr > 0x01000000) + iounmap(hostdata->base); + kfree(hostdata); + out_release: + zorro_release_device(z); + + return -ENODEV; +} + +static __devexit void zorro7xx_remove_one(struct zorro_dev *z) +{ + struct Scsi_Host *host = dev_to_shost(&z->dev); + struct NCR_700_Host_Parameters *hostdata = + (struct NCR_700_Host_Parameters *)host->hostdata[0]; + + scsi_remove_host(host); + + NCR_700_release(host); + kfree(hostdata); + free_irq(host->irq, host); + zorro_release_device(z); +} + +static struct zorro_driver zorro7xx_driver = { + .name = "zorro7xx-scsi", + .id_table = zorro7xx_zorro_tbl, + .probe = zorro7xx_init_one, + .remove = __devexit_p(zorro7xx_remove_one), +}; + +static int __init zorro7xx_scsi_init(void) +{ + return zorro_register_driver(&zorro7xx_driver); +} + +static void __exit zorro7xx_scsi_exit(void) +{ + zorro_unregister_driver(&zorro7xx_driver); +} + +module_init(zorro7xx_scsi_init); +module_exit(zorro7xx_scsi_exit);