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>
230 lines
5.8 KiB
C
230 lines
5.8 KiB
C
/*
|
|
* drivers/mtd/maps/bfin-async-flash.c
|
|
*
|
|
* Handle the case where flash memory and ethernet mac/phy are
|
|
* mapped onto the same async bank. The BF533-STAMP does this
|
|
* for example. All board-specific configuration goes in your
|
|
* board resources file.
|
|
*
|
|
* Copyright 2000 Nicolas Pitre <nico@fluxnic.net>
|
|
* Copyright 2005-2008 Analog Devices Inc.
|
|
*
|
|
* Enter bugs at http://blackfin.uclinux.org/
|
|
*
|
|
* Licensed under the GPL-2 or later.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/map.h>
|
|
#include <linux/mtd/partitions.h>
|
|
#include <linux/mtd/physmap.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/types.h>
|
|
|
|
#include <asm/blackfin.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/io.h>
|
|
#include <asm/unaligned.h>
|
|
|
|
#define pr_devinit(fmt, args...) ({ static const __devinitconst char __fmt[] = fmt; printk(__fmt, ## args); })
|
|
|
|
#define DRIVER_NAME "bfin-async-flash"
|
|
|
|
struct async_state {
|
|
struct mtd_info *mtd;
|
|
struct map_info map;
|
|
int enet_flash_pin;
|
|
uint32_t flash_ambctl0, flash_ambctl1;
|
|
uint32_t save_ambctl0, save_ambctl1;
|
|
unsigned long irq_flags;
|
|
#ifdef CONFIG_MTD_PARTITIONS
|
|
struct mtd_partition *parts;
|
|
#endif
|
|
};
|
|
|
|
static void switch_to_flash(struct async_state *state)
|
|
{
|
|
local_irq_save(state->irq_flags);
|
|
|
|
gpio_set_value(state->enet_flash_pin, 0);
|
|
|
|
state->save_ambctl0 = bfin_read_EBIU_AMBCTL0();
|
|
state->save_ambctl1 = bfin_read_EBIU_AMBCTL1();
|
|
bfin_write_EBIU_AMBCTL0(state->flash_ambctl0);
|
|
bfin_write_EBIU_AMBCTL1(state->flash_ambctl1);
|
|
SSYNC();
|
|
}
|
|
|
|
static void switch_back(struct async_state *state)
|
|
{
|
|
bfin_write_EBIU_AMBCTL0(state->save_ambctl0);
|
|
bfin_write_EBIU_AMBCTL1(state->save_ambctl1);
|
|
SSYNC();
|
|
|
|
gpio_set_value(state->enet_flash_pin, 1);
|
|
|
|
local_irq_restore(state->irq_flags);
|
|
}
|
|
|
|
static map_word bfin_read(struct map_info *map, unsigned long ofs)
|
|
{
|
|
struct async_state *state = (struct async_state *)map->map_priv_1;
|
|
uint16_t word;
|
|
map_word test;
|
|
|
|
switch_to_flash(state);
|
|
|
|
word = readw(map->virt + ofs);
|
|
|
|
switch_back(state);
|
|
|
|
test.x[0] = word;
|
|
return test;
|
|
}
|
|
|
|
static void bfin_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
|
|
{
|
|
struct async_state *state = (struct async_state *)map->map_priv_1;
|
|
|
|
switch_to_flash(state);
|
|
|
|
memcpy(to, map->virt + from, len);
|
|
|
|
switch_back(state);
|
|
}
|
|
|
|
static void bfin_write(struct map_info *map, map_word d1, unsigned long ofs)
|
|
{
|
|
struct async_state *state = (struct async_state *)map->map_priv_1;
|
|
uint16_t d;
|
|
|
|
d = d1.x[0];
|
|
|
|
switch_to_flash(state);
|
|
|
|
writew(d, map->virt + ofs);
|
|
SSYNC();
|
|
|
|
switch_back(state);
|
|
}
|
|
|
|
static void bfin_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
|
|
{
|
|
struct async_state *state = (struct async_state *)map->map_priv_1;
|
|
|
|
switch_to_flash(state);
|
|
|
|
memcpy(map->virt + to, from, len);
|
|
SSYNC();
|
|
|
|
switch_back(state);
|
|
}
|
|
|
|
#ifdef CONFIG_MTD_PARTITIONS
|
|
static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
|
|
#endif
|
|
|
|
static int __devinit bfin_flash_probe(struct platform_device *pdev)
|
|
{
|
|
int ret;
|
|
struct physmap_flash_data *pdata = pdev->dev.platform_data;
|
|
struct resource *memory = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
struct resource *flash_ambctl = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
|
struct async_state *state;
|
|
|
|
state = kzalloc(sizeof(*state), GFP_KERNEL);
|
|
if (!state)
|
|
return -ENOMEM;
|
|
|
|
state->map.name = DRIVER_NAME;
|
|
state->map.read = bfin_read;
|
|
state->map.copy_from = bfin_copy_from;
|
|
state->map.write = bfin_write;
|
|
state->map.copy_to = bfin_copy_to;
|
|
state->map.bankwidth = pdata->width;
|
|
state->map.size = memory->end - memory->start + 1;
|
|
state->map.virt = (void __iomem *)memory->start;
|
|
state->map.phys = memory->start;
|
|
state->map.map_priv_1 = (unsigned long)state;
|
|
state->enet_flash_pin = platform_get_irq(pdev, 0);
|
|
state->flash_ambctl0 = flash_ambctl->start;
|
|
state->flash_ambctl1 = flash_ambctl->end;
|
|
|
|
if (gpio_request(state->enet_flash_pin, DRIVER_NAME)) {
|
|
pr_devinit(KERN_ERR DRIVER_NAME ": Failed to request gpio %d\n", state->enet_flash_pin);
|
|
kfree(state);
|
|
return -EBUSY;
|
|
}
|
|
gpio_direction_output(state->enet_flash_pin, 1);
|
|
|
|
pr_devinit(KERN_NOTICE DRIVER_NAME ": probing %d-bit flash bus\n", state->map.bankwidth * 8);
|
|
state->mtd = do_map_probe(memory->name, &state->map);
|
|
if (!state->mtd) {
|
|
gpio_free(state->enet_flash_pin);
|
|
kfree(state);
|
|
return -ENXIO;
|
|
}
|
|
|
|
#ifdef CONFIG_MTD_PARTITIONS
|
|
ret = parse_mtd_partitions(state->mtd, part_probe_types, &pdata->parts, 0);
|
|
if (ret > 0) {
|
|
pr_devinit(KERN_NOTICE DRIVER_NAME ": Using commandline partition definition\n");
|
|
add_mtd_partitions(state->mtd, pdata->parts, ret);
|
|
state->parts = pdata->parts;
|
|
|
|
} else if (pdata->nr_parts) {
|
|
pr_devinit(KERN_NOTICE DRIVER_NAME ": Using board partition definition\n");
|
|
add_mtd_partitions(state->mtd, pdata->parts, pdata->nr_parts);
|
|
|
|
} else
|
|
#endif
|
|
{
|
|
pr_devinit(KERN_NOTICE DRIVER_NAME ": no partition info available, registering whole flash at once\n");
|
|
add_mtd_device(state->mtd);
|
|
}
|
|
|
|
platform_set_drvdata(pdev, state);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __devexit bfin_flash_remove(struct platform_device *pdev)
|
|
{
|
|
struct async_state *state = platform_get_drvdata(pdev);
|
|
gpio_free(state->enet_flash_pin);
|
|
#ifdef CONFIG_MTD_PARTITIONS
|
|
del_mtd_partitions(state->mtd);
|
|
kfree(state->parts);
|
|
#endif
|
|
map_destroy(state->mtd);
|
|
kfree(state);
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver bfin_flash_driver = {
|
|
.probe = bfin_flash_probe,
|
|
.remove = __devexit_p(bfin_flash_remove),
|
|
.driver = {
|
|
.name = DRIVER_NAME,
|
|
},
|
|
};
|
|
|
|
static int __init bfin_flash_init(void)
|
|
{
|
|
return platform_driver_register(&bfin_flash_driver);
|
|
}
|
|
module_init(bfin_flash_init);
|
|
|
|
static void __exit bfin_flash_exit(void)
|
|
{
|
|
platform_driver_unregister(&bfin_flash_driver);
|
|
}
|
|
module_exit(bfin_flash_exit);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_DESCRIPTION("MTD map driver for Blackfins with flash/ethernet on same async bank");
|