mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 12:42:02 +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>
420 lines
10 KiB
C
420 lines
10 KiB
C
/*
|
|
* at91_cf.c -- AT91 CompactFlash controller driver
|
|
*
|
|
* Copyright (C) 2005 David Brownell
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/init.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <pcmcia/ss.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/io.h>
|
|
#include <asm/sizes.h>
|
|
#include <asm/gpio.h>
|
|
|
|
#include <mach/board.h>
|
|
#include <mach/at91rm9200_mc.h>
|
|
|
|
|
|
/*
|
|
* A0..A10 work in each range; A23 indicates I/O space; A25 is CFRNW;
|
|
* some other bit in {A24,A22..A11} is nREG to flag memory access
|
|
* (vs attributes). So more than 2KB/region would just be waste.
|
|
* Note: These are offsets from the physical base address.
|
|
*/
|
|
#define CF_ATTR_PHYS (0)
|
|
#define CF_IO_PHYS (1 << 23)
|
|
#define CF_MEM_PHYS (0x017ff800)
|
|
|
|
/*--------------------------------------------------------------------------*/
|
|
|
|
static const char driver_name[] = "at91_cf";
|
|
|
|
struct at91_cf_socket {
|
|
struct pcmcia_socket socket;
|
|
|
|
unsigned present:1;
|
|
|
|
struct platform_device *pdev;
|
|
struct at91_cf_data *board;
|
|
|
|
unsigned long phys_baseaddr;
|
|
};
|
|
|
|
static inline int at91_cf_present(struct at91_cf_socket *cf)
|
|
{
|
|
return !gpio_get_value(cf->board->det_pin);
|
|
}
|
|
|
|
/*--------------------------------------------------------------------------*/
|
|
|
|
static int at91_cf_ss_init(struct pcmcia_socket *s)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static irqreturn_t at91_cf_irq(int irq, void *_cf)
|
|
{
|
|
struct at91_cf_socket *cf = _cf;
|
|
|
|
if (irq == cf->board->det_pin) {
|
|
unsigned present = at91_cf_present(cf);
|
|
|
|
/* kick pccard as needed */
|
|
if (present != cf->present) {
|
|
cf->present = present;
|
|
pr_debug("%s: card %s\n", driver_name,
|
|
present ? "present" : "gone");
|
|
pcmcia_parse_events(&cf->socket, SS_DETECT);
|
|
}
|
|
}
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static int at91_cf_get_status(struct pcmcia_socket *s, u_int *sp)
|
|
{
|
|
struct at91_cf_socket *cf;
|
|
|
|
if (!sp)
|
|
return -EINVAL;
|
|
|
|
cf = container_of(s, struct at91_cf_socket, socket);
|
|
|
|
/* NOTE: CF is always 3VCARD */
|
|
if (at91_cf_present(cf)) {
|
|
int rdy = cf->board->irq_pin; /* RDY/nIRQ */
|
|
int vcc = cf->board->vcc_pin;
|
|
|
|
*sp = SS_DETECT | SS_3VCARD;
|
|
if (!rdy || gpio_get_value(rdy))
|
|
*sp |= SS_READY;
|
|
if (!vcc || gpio_get_value(vcc))
|
|
*sp |= SS_POWERON;
|
|
} else
|
|
*sp = 0;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
at91_cf_set_socket(struct pcmcia_socket *sock, struct socket_state_t *s)
|
|
{
|
|
struct at91_cf_socket *cf;
|
|
|
|
cf = container_of(sock, struct at91_cf_socket, socket);
|
|
|
|
/* switch Vcc if needed and possible */
|
|
if (cf->board->vcc_pin) {
|
|
switch (s->Vcc) {
|
|
case 0:
|
|
gpio_set_value(cf->board->vcc_pin, 0);
|
|
break;
|
|
case 33:
|
|
gpio_set_value(cf->board->vcc_pin, 1);
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
/* toggle reset if needed */
|
|
gpio_set_value(cf->board->rst_pin, s->flags & SS_RESET);
|
|
|
|
pr_debug("%s: Vcc %d, io_irq %d, flags %04x csc %04x\n",
|
|
driver_name, s->Vcc, s->io_irq, s->flags, s->csc_mask);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int at91_cf_ss_suspend(struct pcmcia_socket *s)
|
|
{
|
|
return at91_cf_set_socket(s, &dead_socket);
|
|
}
|
|
|
|
/* we already mapped the I/O region */
|
|
static int at91_cf_set_io_map(struct pcmcia_socket *s, struct pccard_io_map *io)
|
|
{
|
|
struct at91_cf_socket *cf;
|
|
u32 csr;
|
|
|
|
cf = container_of(s, struct at91_cf_socket, socket);
|
|
io->flags &= (MAP_ACTIVE | MAP_16BIT | MAP_AUTOSZ);
|
|
|
|
/*
|
|
* Use 16 bit accesses unless/until we need 8-bit i/o space.
|
|
*/
|
|
csr = at91_sys_read(AT91_SMC_CSR(cf->board->chipselect)) & ~AT91_SMC_DBW;
|
|
|
|
/*
|
|
* NOTE: this CF controller ignores IOIS16, so we can't really do
|
|
* MAP_AUTOSZ. The 16bit mode allows single byte access on either
|
|
* D0-D7 (even addr) or D8-D15 (odd), so it's close enough for many
|
|
* purposes (and handles ide-cs).
|
|
*
|
|
* The 8bit mode is needed for odd byte access on D0-D7. It seems
|
|
* some cards only like that way to get at the odd byte, despite
|
|
* CF 3.0 spec table 35 also giving the D8-D15 option.
|
|
*/
|
|
if (!(io->flags & (MAP_16BIT | MAP_AUTOSZ))) {
|
|
csr |= AT91_SMC_DBW_8;
|
|
pr_debug("%s: 8bit i/o bus\n", driver_name);
|
|
} else {
|
|
csr |= AT91_SMC_DBW_16;
|
|
pr_debug("%s: 16bit i/o bus\n", driver_name);
|
|
}
|
|
at91_sys_write(AT91_SMC_CSR(cf->board->chipselect), csr);
|
|
|
|
io->start = cf->socket.io_offset;
|
|
io->stop = io->start + SZ_2K - 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* pcmcia layer maps/unmaps mem regions */
|
|
static int
|
|
at91_cf_set_mem_map(struct pcmcia_socket *s, struct pccard_mem_map *map)
|
|
{
|
|
struct at91_cf_socket *cf;
|
|
|
|
if (map->card_start)
|
|
return -EINVAL;
|
|
|
|
cf = container_of(s, struct at91_cf_socket, socket);
|
|
|
|
map->flags &= (MAP_ACTIVE | MAP_ATTRIB | MAP_16BIT);
|
|
if (map->flags & MAP_ATTRIB)
|
|
map->static_start = cf->phys_baseaddr + CF_ATTR_PHYS;
|
|
else
|
|
map->static_start = cf->phys_baseaddr + CF_MEM_PHYS;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct pccard_operations at91_cf_ops = {
|
|
.init = at91_cf_ss_init,
|
|
.suspend = at91_cf_ss_suspend,
|
|
.get_status = at91_cf_get_status,
|
|
.set_socket = at91_cf_set_socket,
|
|
.set_io_map = at91_cf_set_io_map,
|
|
.set_mem_map = at91_cf_set_mem_map,
|
|
};
|
|
|
|
/*--------------------------------------------------------------------------*/
|
|
|
|
static int __init at91_cf_probe(struct platform_device *pdev)
|
|
{
|
|
struct at91_cf_socket *cf;
|
|
struct at91_cf_data *board = pdev->dev.platform_data;
|
|
struct resource *io;
|
|
int status;
|
|
|
|
if (!board || !board->det_pin || !board->rst_pin)
|
|
return -ENODEV;
|
|
|
|
io = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!io)
|
|
return -ENODEV;
|
|
|
|
cf = kzalloc(sizeof *cf, GFP_KERNEL);
|
|
if (!cf)
|
|
return -ENOMEM;
|
|
|
|
cf->board = board;
|
|
cf->pdev = pdev;
|
|
cf->phys_baseaddr = io->start;
|
|
platform_set_drvdata(pdev, cf);
|
|
|
|
/* must be a GPIO; ergo must trigger on both edges */
|
|
status = gpio_request(board->det_pin, "cf_det");
|
|
if (status < 0)
|
|
goto fail0;
|
|
status = request_irq(board->det_pin, at91_cf_irq, 0, driver_name, cf);
|
|
if (status < 0)
|
|
goto fail00;
|
|
device_init_wakeup(&pdev->dev, 1);
|
|
|
|
status = gpio_request(board->rst_pin, "cf_rst");
|
|
if (status < 0)
|
|
goto fail0a;
|
|
|
|
if (board->vcc_pin) {
|
|
status = gpio_request(board->vcc_pin, "cf_vcc");
|
|
if (status < 0)
|
|
goto fail0b;
|
|
}
|
|
|
|
/*
|
|
* The card driver will request this irq later as needed.
|
|
* but it causes lots of "irqNN: nobody cared" messages
|
|
* unless we report that we handle everything (sigh).
|
|
* (Note: DK board doesn't wire the IRQ pin...)
|
|
*/
|
|
if (board->irq_pin) {
|
|
status = gpio_request(board->irq_pin, "cf_irq");
|
|
if (status < 0)
|
|
goto fail0c;
|
|
status = request_irq(board->irq_pin, at91_cf_irq,
|
|
IRQF_SHARED, driver_name, cf);
|
|
if (status < 0)
|
|
goto fail0d;
|
|
cf->socket.pci_irq = board->irq_pin;
|
|
} else
|
|
cf->socket.pci_irq = nr_irqs + 1;
|
|
|
|
/* pcmcia layer only remaps "real" memory not iospace */
|
|
cf->socket.io_offset = (unsigned long)
|
|
ioremap(cf->phys_baseaddr + CF_IO_PHYS, SZ_2K);
|
|
if (!cf->socket.io_offset) {
|
|
status = -ENXIO;
|
|
goto fail1;
|
|
}
|
|
|
|
/* reserve chip-select regions */
|
|
if (!request_mem_region(io->start, io->end + 1 - io->start,
|
|
driver_name)) {
|
|
status = -ENXIO;
|
|
goto fail1;
|
|
}
|
|
|
|
pr_info("%s: irqs det #%d, io #%d\n", driver_name,
|
|
board->det_pin, board->irq_pin);
|
|
|
|
cf->socket.owner = THIS_MODULE;
|
|
cf->socket.dev.parent = &pdev->dev;
|
|
cf->socket.ops = &at91_cf_ops;
|
|
cf->socket.resource_ops = &pccard_static_ops;
|
|
cf->socket.features = SS_CAP_PCCARD | SS_CAP_STATIC_MAP
|
|
| SS_CAP_MEM_ALIGN;
|
|
cf->socket.map_size = SZ_2K;
|
|
cf->socket.io[0].res = io;
|
|
|
|
status = pcmcia_register_socket(&cf->socket);
|
|
if (status < 0)
|
|
goto fail2;
|
|
|
|
return 0;
|
|
|
|
fail2:
|
|
release_mem_region(io->start, io->end + 1 - io->start);
|
|
fail1:
|
|
if (cf->socket.io_offset)
|
|
iounmap((void __iomem *) cf->socket.io_offset);
|
|
if (board->irq_pin) {
|
|
free_irq(board->irq_pin, cf);
|
|
fail0d:
|
|
gpio_free(board->irq_pin);
|
|
}
|
|
fail0c:
|
|
if (board->vcc_pin)
|
|
gpio_free(board->vcc_pin);
|
|
fail0b:
|
|
gpio_free(board->rst_pin);
|
|
fail0a:
|
|
device_init_wakeup(&pdev->dev, 0);
|
|
free_irq(board->det_pin, cf);
|
|
fail00:
|
|
gpio_free(board->det_pin);
|
|
fail0:
|
|
kfree(cf);
|
|
return status;
|
|
}
|
|
|
|
static int __exit at91_cf_remove(struct platform_device *pdev)
|
|
{
|
|
struct at91_cf_socket *cf = platform_get_drvdata(pdev);
|
|
struct at91_cf_data *board = cf->board;
|
|
struct resource *io = cf->socket.io[0].res;
|
|
|
|
pcmcia_unregister_socket(&cf->socket);
|
|
release_mem_region(io->start, io->end + 1 - io->start);
|
|
iounmap((void __iomem *) cf->socket.io_offset);
|
|
if (board->irq_pin) {
|
|
free_irq(board->irq_pin, cf);
|
|
gpio_free(board->irq_pin);
|
|
}
|
|
if (board->vcc_pin)
|
|
gpio_free(board->vcc_pin);
|
|
gpio_free(board->rst_pin);
|
|
device_init_wakeup(&pdev->dev, 0);
|
|
free_irq(board->det_pin, cf);
|
|
gpio_free(board->det_pin);
|
|
kfree(cf);
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
static int at91_cf_suspend(struct platform_device *pdev, pm_message_t mesg)
|
|
{
|
|
struct at91_cf_socket *cf = platform_get_drvdata(pdev);
|
|
struct at91_cf_data *board = cf->board;
|
|
|
|
if (device_may_wakeup(&pdev->dev)) {
|
|
enable_irq_wake(board->det_pin);
|
|
if (board->irq_pin)
|
|
enable_irq_wake(board->irq_pin);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int at91_cf_resume(struct platform_device *pdev)
|
|
{
|
|
struct at91_cf_socket *cf = platform_get_drvdata(pdev);
|
|
struct at91_cf_data *board = cf->board;
|
|
|
|
if (device_may_wakeup(&pdev->dev)) {
|
|
disable_irq_wake(board->det_pin);
|
|
if (board->irq_pin)
|
|
disable_irq_wake(board->irq_pin);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#else
|
|
#define at91_cf_suspend NULL
|
|
#define at91_cf_resume NULL
|
|
#endif
|
|
|
|
static struct platform_driver at91_cf_driver = {
|
|
.driver = {
|
|
.name = (char *) driver_name,
|
|
.owner = THIS_MODULE,
|
|
},
|
|
.remove = __exit_p(at91_cf_remove),
|
|
.suspend = at91_cf_suspend,
|
|
.resume = at91_cf_resume,
|
|
};
|
|
|
|
/*--------------------------------------------------------------------------*/
|
|
|
|
static int __init at91_cf_init(void)
|
|
{
|
|
return platform_driver_probe(&at91_cf_driver, at91_cf_probe);
|
|
}
|
|
module_init(at91_cf_init);
|
|
|
|
static void __exit at91_cf_exit(void)
|
|
{
|
|
platform_driver_unregister(&at91_cf_driver);
|
|
}
|
|
module_exit(at91_cf_exit);
|
|
|
|
MODULE_DESCRIPTION("AT91 Compact Flash Driver");
|
|
MODULE_AUTHOR("David Brownell");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("platform:at91_cf");
|