mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
![Tejun Heo](/assets/img/avatar_default.png)
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>
341 lines
8.1 KiB
C
341 lines
8.1 KiB
C
/*
|
|
* PCMCIA socket code for the MyCable XXS1500 system.
|
|
*
|
|
* Copyright (c) 2009 Manuel Lauss <manuel.lauss@gmail.com>
|
|
*
|
|
*/
|
|
|
|
#include <linux/delay.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/io.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/pm.h>
|
|
#include <linux/resource.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/spinlock.h>
|
|
|
|
#include <pcmcia/cs_types.h>
|
|
#include <pcmcia/cs.h>
|
|
#include <pcmcia/ss.h>
|
|
#include <pcmcia/cistpl.h>
|
|
|
|
#include <asm/irq.h>
|
|
#include <asm/system.h>
|
|
#include <asm/mach-au1x00/au1000.h>
|
|
|
|
#define MEM_MAP_SIZE 0x400000
|
|
#define IO_MAP_SIZE 0x1000
|
|
|
|
|
|
/*
|
|
* 3.3V cards only; all interfacing is done via gpios:
|
|
*
|
|
* 0/1: carddetect (00 = card present, xx = huh)
|
|
* 4: card irq
|
|
* 204: reset (high-act)
|
|
* 205: buffer enable (low-act)
|
|
* 208/209: card voltage key (00,01,10,11)
|
|
* 210: battwarn
|
|
* 211: batdead
|
|
* 214: power (low-act)
|
|
*/
|
|
#define GPIO_CDA 0
|
|
#define GPIO_CDB 1
|
|
#define GPIO_CARDIRQ 4
|
|
#define GPIO_RESET 204
|
|
#define GPIO_OUTEN 205
|
|
#define GPIO_VSL 208
|
|
#define GPIO_VSH 209
|
|
#define GPIO_BATTDEAD 210
|
|
#define GPIO_BATTWARN 211
|
|
#define GPIO_POWER 214
|
|
|
|
struct xxs1500_pcmcia_sock {
|
|
struct pcmcia_socket socket;
|
|
void *virt_io;
|
|
|
|
phys_addr_t phys_io;
|
|
phys_addr_t phys_attr;
|
|
phys_addr_t phys_mem;
|
|
|
|
/* previous flags for set_socket() */
|
|
unsigned int old_flags;
|
|
};
|
|
|
|
#define to_xxs_socket(x) container_of(x, struct xxs1500_pcmcia_sock, socket)
|
|
|
|
static irqreturn_t cdirq(int irq, void *data)
|
|
{
|
|
struct xxs1500_pcmcia_sock *sock = data;
|
|
|
|
pcmcia_parse_events(&sock->socket, SS_DETECT);
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static int xxs1500_pcmcia_configure(struct pcmcia_socket *skt,
|
|
struct socket_state_t *state)
|
|
{
|
|
struct xxs1500_pcmcia_sock *sock = to_xxs_socket(skt);
|
|
unsigned int changed;
|
|
|
|
/* power control */
|
|
switch (state->Vcc) {
|
|
case 0:
|
|
gpio_set_value(GPIO_POWER, 1); /* power off */
|
|
break;
|
|
case 33:
|
|
gpio_set_value(GPIO_POWER, 0); /* power on */
|
|
break;
|
|
case 50:
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
changed = state->flags ^ sock->old_flags;
|
|
|
|
if (changed & SS_RESET) {
|
|
if (state->flags & SS_RESET) {
|
|
gpio_set_value(GPIO_RESET, 1); /* assert reset */
|
|
gpio_set_value(GPIO_OUTEN, 1); /* buffers off */
|
|
} else {
|
|
gpio_set_value(GPIO_RESET, 0); /* deassert reset */
|
|
gpio_set_value(GPIO_OUTEN, 0); /* buffers on */
|
|
msleep(500);
|
|
}
|
|
}
|
|
|
|
sock->old_flags = state->flags;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int xxs1500_pcmcia_get_status(struct pcmcia_socket *skt,
|
|
unsigned int *value)
|
|
{
|
|
unsigned int status;
|
|
int i;
|
|
|
|
status = 0;
|
|
|
|
/* check carddetects: GPIO[0:1] must both be low */
|
|
if (!gpio_get_value(GPIO_CDA) && !gpio_get_value(GPIO_CDB))
|
|
status |= SS_DETECT;
|
|
|
|
/* determine card voltage: GPIO[208:209] binary value */
|
|
i = (!!gpio_get_value(GPIO_VSL)) | ((!!gpio_get_value(GPIO_VSH)) << 1);
|
|
|
|
switch (i) {
|
|
case 0:
|
|
case 1:
|
|
case 2:
|
|
status |= SS_3VCARD; /* 3V card */
|
|
break;
|
|
case 3: /* 5V card, unsupported */
|
|
default:
|
|
status |= SS_XVCARD; /* treated as unsupported in core */
|
|
}
|
|
|
|
/* GPIO214: low active power switch */
|
|
status |= gpio_get_value(GPIO_POWER) ? 0 : SS_POWERON;
|
|
|
|
/* GPIO204: high-active reset line */
|
|
status |= gpio_get_value(GPIO_RESET) ? SS_RESET : SS_READY;
|
|
|
|
/* other stuff */
|
|
status |= gpio_get_value(GPIO_BATTDEAD) ? 0 : SS_BATDEAD;
|
|
status |= gpio_get_value(GPIO_BATTWARN) ? 0 : SS_BATWARN;
|
|
|
|
*value = status;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int xxs1500_pcmcia_sock_init(struct pcmcia_socket *skt)
|
|
{
|
|
gpio_direction_input(GPIO_CDA);
|
|
gpio_direction_input(GPIO_CDB);
|
|
gpio_direction_input(GPIO_VSL);
|
|
gpio_direction_input(GPIO_VSH);
|
|
gpio_direction_input(GPIO_BATTDEAD);
|
|
gpio_direction_input(GPIO_BATTWARN);
|
|
gpio_direction_output(GPIO_RESET, 1); /* assert reset */
|
|
gpio_direction_output(GPIO_OUTEN, 1); /* disable buffers */
|
|
gpio_direction_output(GPIO_POWER, 1); /* power off */
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int xxs1500_pcmcia_sock_suspend(struct pcmcia_socket *skt)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static int au1x00_pcmcia_set_io_map(struct pcmcia_socket *skt,
|
|
struct pccard_io_map *map)
|
|
{
|
|
struct xxs1500_pcmcia_sock *sock = to_xxs_socket(skt);
|
|
|
|
map->start = (u32)sock->virt_io;
|
|
map->stop = map->start + IO_MAP_SIZE;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int au1x00_pcmcia_set_mem_map(struct pcmcia_socket *skt,
|
|
struct pccard_mem_map *map)
|
|
{
|
|
struct xxs1500_pcmcia_sock *sock = to_xxs_socket(skt);
|
|
|
|
if (map->flags & MAP_ATTRIB)
|
|
map->static_start = sock->phys_attr + map->card_start;
|
|
else
|
|
map->static_start = sock->phys_mem + map->card_start;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct pccard_operations xxs1500_pcmcia_operations = {
|
|
.init = xxs1500_pcmcia_sock_init,
|
|
.suspend = xxs1500_pcmcia_sock_suspend,
|
|
.get_status = xxs1500_pcmcia_get_status,
|
|
.set_socket = xxs1500_pcmcia_configure,
|
|
.set_io_map = au1x00_pcmcia_set_io_map,
|
|
.set_mem_map = au1x00_pcmcia_set_mem_map,
|
|
};
|
|
|
|
static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev)
|
|
{
|
|
struct xxs1500_pcmcia_sock *sock;
|
|
struct resource *r;
|
|
int ret, irq;
|
|
|
|
sock = kzalloc(sizeof(struct xxs1500_pcmcia_sock), GFP_KERNEL);
|
|
if (!sock)
|
|
return -ENOMEM;
|
|
|
|
ret = -ENODEV;
|
|
|
|
/* 36bit PCMCIA Attribute area address */
|
|
r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-attr");
|
|
if (!r) {
|
|
dev_err(&pdev->dev, "missing 'pcmcia-attr' resource!\n");
|
|
goto out0;
|
|
}
|
|
sock->phys_attr = r->start;
|
|
|
|
/* 36bit PCMCIA Memory area address */
|
|
r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-mem");
|
|
if (!r) {
|
|
dev_err(&pdev->dev, "missing 'pcmcia-mem' resource!\n");
|
|
goto out0;
|
|
}
|
|
sock->phys_mem = r->start;
|
|
|
|
/* 36bit PCMCIA IO area address */
|
|
r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-io");
|
|
if (!r) {
|
|
dev_err(&pdev->dev, "missing 'pcmcia-io' resource!\n");
|
|
goto out0;
|
|
}
|
|
sock->phys_io = r->start;
|
|
|
|
|
|
/*
|
|
* PCMCIA client drivers use the inb/outb macros to access
|
|
* the IO registers. Since mips_io_port_base is added
|
|
* to the access address of the mips implementation of
|
|
* inb/outb, we need to subtract it here because we want
|
|
* to access the I/O or MEM address directly, without
|
|
* going through this "mips_io_port_base" mechanism.
|
|
*/
|
|
sock->virt_io = (void *)(ioremap(sock->phys_io, IO_MAP_SIZE) -
|
|
mips_io_port_base);
|
|
|
|
if (!sock->virt_io) {
|
|
dev_err(&pdev->dev, "cannot remap IO area\n");
|
|
ret = -ENOMEM;
|
|
goto out0;
|
|
}
|
|
|
|
sock->socket.ops = &xxs1500_pcmcia_operations;
|
|
sock->socket.owner = THIS_MODULE;
|
|
sock->socket.pci_irq = gpio_to_irq(GPIO_CARDIRQ);
|
|
sock->socket.features = SS_CAP_STATIC_MAP | SS_CAP_PCCARD;
|
|
sock->socket.map_size = MEM_MAP_SIZE;
|
|
sock->socket.io_offset = (unsigned long)sock->virt_io;
|
|
sock->socket.dev.parent = &pdev->dev;
|
|
sock->socket.resource_ops = &pccard_static_ops;
|
|
|
|
platform_set_drvdata(pdev, sock);
|
|
|
|
/* setup carddetect irq: use one of the 2 GPIOs as an
|
|
* edge detector.
|
|
*/
|
|
irq = gpio_to_irq(GPIO_CDA);
|
|
set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
|
|
ret = request_irq(irq, cdirq, 0, "pcmcia_carddetect", sock);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "cannot setup cd irq\n");
|
|
goto out1;
|
|
}
|
|
|
|
ret = pcmcia_register_socket(&sock->socket);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "failed to register\n");
|
|
goto out2;
|
|
}
|
|
|
|
printk(KERN_INFO "MyCable XXS1500 PCMCIA socket services\n");
|
|
|
|
return 0;
|
|
|
|
out2:
|
|
free_irq(gpio_to_irq(GPIO_CDA), sock);
|
|
out1:
|
|
iounmap((void *)(sock->virt_io + (u32)mips_io_port_base));
|
|
out0:
|
|
kfree(sock);
|
|
return ret;
|
|
}
|
|
|
|
static int __devexit xxs1500_pcmcia_remove(struct platform_device *pdev)
|
|
{
|
|
struct xxs1500_pcmcia_sock *sock = platform_get_drvdata(pdev);
|
|
|
|
pcmcia_unregister_socket(&sock->socket);
|
|
free_irq(gpio_to_irq(GPIO_CDA), sock);
|
|
iounmap((void *)(sock->virt_io + (u32)mips_io_port_base));
|
|
kfree(sock);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver xxs1500_pcmcia_socket_driver = {
|
|
.driver = {
|
|
.name = "xxs1500_pcmcia",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
.probe = xxs1500_pcmcia_probe,
|
|
.remove = __devexit_p(xxs1500_pcmcia_remove),
|
|
};
|
|
|
|
int __init xxs1500_pcmcia_socket_load(void)
|
|
{
|
|
return platform_driver_register(&xxs1500_pcmcia_socket_driver);
|
|
}
|
|
|
|
void __exit xxs1500_pcmcia_socket_unload(void)
|
|
{
|
|
platform_driver_unregister(&xxs1500_pcmcia_socket_driver);
|
|
}
|
|
|
|
module_init(xxs1500_pcmcia_socket_load);
|
|
module_exit(xxs1500_pcmcia_socket_unload);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_DESCRIPTION("PCMCIA Socket Services for MyCable XXS1500 systems");
|
|
MODULE_AUTHOR("Manuel Lauss");
|