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>
169 lines
3.7 KiB
C
169 lines
3.7 KiB
C
/* sun_uflash.c - Driver for user-programmable flash on
|
|
* Sun Microsystems SME boardsets.
|
|
*
|
|
* This driver does NOT provide access to the OBP-flash for
|
|
* safety reasons-- use <linux>/drivers/sbus/char/flash.c instead.
|
|
*
|
|
* Copyright (c) 2001 Eric Brower (ebrower@usa.net)
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/init.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/slab.h>
|
|
#include <asm/prom.h>
|
|
#include <asm/uaccess.h>
|
|
#include <asm/io.h>
|
|
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/map.h>
|
|
|
|
#define UFLASH_OBPNAME "flashprom"
|
|
#define DRIVER_NAME "sun_uflash"
|
|
#define PFX DRIVER_NAME ": "
|
|
|
|
#define UFLASH_WINDOW_SIZE 0x200000
|
|
#define UFLASH_BUSWIDTH 1 /* EBus is 8-bit */
|
|
|
|
MODULE_AUTHOR("Eric Brower <ebrower@usa.net>");
|
|
MODULE_DESCRIPTION("User-programmable flash device on Sun Microsystems boardsets");
|
|
MODULE_SUPPORTED_DEVICE(DRIVER_NAME);
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_VERSION("2.1");
|
|
|
|
struct uflash_dev {
|
|
const char *name; /* device name */
|
|
struct map_info map; /* mtd map info */
|
|
struct mtd_info *mtd; /* mtd info */
|
|
};
|
|
|
|
struct map_info uflash_map_templ = {
|
|
.name = "SUNW,???-????",
|
|
.size = UFLASH_WINDOW_SIZE,
|
|
.bankwidth = UFLASH_BUSWIDTH,
|
|
};
|
|
|
|
int uflash_devinit(struct of_device *op, struct device_node *dp)
|
|
{
|
|
struct uflash_dev *up;
|
|
|
|
if (op->resource[1].flags) {
|
|
/* Non-CFI userflash device-- once I find one we
|
|
* can work on supporting it.
|
|
*/
|
|
printk(KERN_ERR PFX "Unsupported device at %s, 0x%llx\n",
|
|
dp->full_name, (unsigned long long)op->resource[0].start);
|
|
|
|
return -ENODEV;
|
|
}
|
|
|
|
up = kzalloc(sizeof(struct uflash_dev), GFP_KERNEL);
|
|
if (!up) {
|
|
printk(KERN_ERR PFX "Cannot allocate struct uflash_dev\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
/* copy defaults and tweak parameters */
|
|
memcpy(&up->map, &uflash_map_templ, sizeof(uflash_map_templ));
|
|
|
|
up->map.size = resource_size(&op->resource[0]);
|
|
|
|
up->name = of_get_property(dp, "model", NULL);
|
|
if (up->name && 0 < strlen(up->name))
|
|
up->map.name = (char *)up->name;
|
|
|
|
up->map.phys = op->resource[0].start;
|
|
|
|
up->map.virt = of_ioremap(&op->resource[0], 0, up->map.size,
|
|
DRIVER_NAME);
|
|
if (!up->map.virt) {
|
|
printk(KERN_ERR PFX "Failed to map device.\n");
|
|
kfree(up);
|
|
|
|
return -EINVAL;
|
|
}
|
|
|
|
simple_map_init(&up->map);
|
|
|
|
/* MTD registration */
|
|
up->mtd = do_map_probe("cfi_probe", &up->map);
|
|
if (!up->mtd) {
|
|
of_iounmap(&op->resource[0], up->map.virt, up->map.size);
|
|
kfree(up);
|
|
|
|
return -ENXIO;
|
|
}
|
|
|
|
up->mtd->owner = THIS_MODULE;
|
|
|
|
add_mtd_device(up->mtd);
|
|
|
|
dev_set_drvdata(&op->dev, up);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __devinit uflash_probe(struct of_device *op, const struct of_device_id *match)
|
|
{
|
|
struct device_node *dp = op->node;
|
|
|
|
/* Flashprom must have the "user" property in order to
|
|
* be used by this driver.
|
|
*/
|
|
if (!of_find_property(dp, "user", NULL))
|
|
return -ENODEV;
|
|
|
|
return uflash_devinit(op, dp);
|
|
}
|
|
|
|
static int __devexit uflash_remove(struct of_device *op)
|
|
{
|
|
struct uflash_dev *up = dev_get_drvdata(&op->dev);
|
|
|
|
if (up->mtd) {
|
|
del_mtd_device(up->mtd);
|
|
map_destroy(up->mtd);
|
|
}
|
|
if (up->map.virt) {
|
|
of_iounmap(&op->resource[0], up->map.virt, up->map.size);
|
|
up->map.virt = NULL;
|
|
}
|
|
|
|
kfree(up);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id uflash_match[] = {
|
|
{
|
|
.name = UFLASH_OBPNAME,
|
|
},
|
|
{},
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(of, uflash_match);
|
|
|
|
static struct of_platform_driver uflash_driver = {
|
|
.name = DRIVER_NAME,
|
|
.match_table = uflash_match,
|
|
.probe = uflash_probe,
|
|
.remove = __devexit_p(uflash_remove),
|
|
};
|
|
|
|
static int __init uflash_init(void)
|
|
{
|
|
return of_register_driver(&uflash_driver, &of_bus_type);
|
|
}
|
|
|
|
static void __exit uflash_exit(void)
|
|
{
|
|
of_unregister_driver(&uflash_driver);
|
|
}
|
|
|
|
module_init(uflash_init);
|
|
module_exit(uflash_exit);
|