mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 08:31:55 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
184 lines
4.4 KiB
C
184 lines
4.4 KiB
C
/*
|
|
* 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 <alanh@fairlite.demon.co.uk>
|
|
* plus modifications of the 53c7xx.c driver to support the Amiga.
|
|
*
|
|
* Rewritten to use 53c700.c by Kars de Jong <jongk@linux-m68k.org>
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/zorro.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <asm/amigahw.h>
|
|
#include <asm/amigaints.h>
|
|
|
|
#include <scsi/scsi_host.h>
|
|
#include <scsi/scsi_transport_spi.h>
|
|
|
|
#include "53c700.h"
|
|
|
|
MODULE_AUTHOR("Alan Hourihane <alanh@fairlite.demon.co.uk> / Kars de Jong <jongk@linux-m68k.org>");
|
|
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;
|
|
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 = kzalloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL);
|
|
if (!hostdata) {
|
|
printk(KERN_ERR "zorro7xx: Failed to allocate host data\n");
|
|
goto out_release;
|
|
}
|
|
|
|
/* 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;
|
|
}
|
|
|
|
zorro_set_drvdata(z, 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 = zorro_get_drvdata(z);
|
|
struct NCR_700_Host_Parameters *hostdata = shost_priv(host);
|
|
|
|
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);
|