mirror of
https://github.com/torvalds/linux.git
synced 2024-12-04 18:13:04 +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>
347 lines
7.4 KiB
C
347 lines
7.4 KiB
C
/*
|
|
* linux/arch/arm/mach-sa1100/neponset.c
|
|
*
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/tty.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/serial_core.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/irq.h>
|
|
#include <asm/mach/serial_sa1100.h>
|
|
#include <mach/assabet.h>
|
|
#include <mach/neponset.h>
|
|
#include <asm/hardware/sa1111.h>
|
|
#include <asm/sizes.h>
|
|
|
|
/*
|
|
* Install handler for Neponset IRQ. Note that we have to loop here
|
|
* since the ETHERNET and USAR IRQs are level based, and we need to
|
|
* ensure that the IRQ signal is deasserted before returning. This
|
|
* is rather unfortunate.
|
|
*/
|
|
static void
|
|
neponset_irq_handler(unsigned int irq, struct irq_desc *desc)
|
|
{
|
|
unsigned int irr;
|
|
|
|
while (1) {
|
|
/*
|
|
* Acknowledge the parent IRQ.
|
|
*/
|
|
desc->chip->ack(irq);
|
|
|
|
/*
|
|
* Read the interrupt reason register. Let's have all
|
|
* active IRQ bits high. Note: there is a typo in the
|
|
* Neponset user's guide for the SA1111 IRR level.
|
|
*/
|
|
irr = IRR ^ (IRR_ETHERNET | IRR_USAR);
|
|
|
|
if ((irr & (IRR_ETHERNET | IRR_USAR | IRR_SA1111)) == 0)
|
|
break;
|
|
|
|
/*
|
|
* Since there is no individual mask, we have to
|
|
* mask the parent IRQ. This is safe, since we'll
|
|
* recheck the register for any pending IRQs.
|
|
*/
|
|
if (irr & (IRR_ETHERNET | IRR_USAR)) {
|
|
desc->chip->mask(irq);
|
|
|
|
/*
|
|
* Ack the interrupt now to prevent re-entering
|
|
* this neponset handler. Again, this is safe
|
|
* since we'll check the IRR register prior to
|
|
* leaving.
|
|
*/
|
|
desc->chip->ack(irq);
|
|
|
|
if (irr & IRR_ETHERNET) {
|
|
generic_handle_irq(IRQ_NEPONSET_SMC9196);
|
|
}
|
|
|
|
if (irr & IRR_USAR) {
|
|
generic_handle_irq(IRQ_NEPONSET_USAR);
|
|
}
|
|
|
|
desc->chip->unmask(irq);
|
|
}
|
|
|
|
if (irr & IRR_SA1111) {
|
|
generic_handle_irq(IRQ_NEPONSET_SA1111);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void neponset_set_mctrl(struct uart_port *port, u_int mctrl)
|
|
{
|
|
u_int mdm_ctl0 = MDM_CTL_0;
|
|
|
|
if (port->mapbase == _Ser1UTCR0) {
|
|
if (mctrl & TIOCM_RTS)
|
|
mdm_ctl0 &= ~MDM_CTL0_RTS2;
|
|
else
|
|
mdm_ctl0 |= MDM_CTL0_RTS2;
|
|
|
|
if (mctrl & TIOCM_DTR)
|
|
mdm_ctl0 &= ~MDM_CTL0_DTR2;
|
|
else
|
|
mdm_ctl0 |= MDM_CTL0_DTR2;
|
|
} else if (port->mapbase == _Ser3UTCR0) {
|
|
if (mctrl & TIOCM_RTS)
|
|
mdm_ctl0 &= ~MDM_CTL0_RTS1;
|
|
else
|
|
mdm_ctl0 |= MDM_CTL0_RTS1;
|
|
|
|
if (mctrl & TIOCM_DTR)
|
|
mdm_ctl0 &= ~MDM_CTL0_DTR1;
|
|
else
|
|
mdm_ctl0 |= MDM_CTL0_DTR1;
|
|
}
|
|
|
|
MDM_CTL_0 = mdm_ctl0;
|
|
}
|
|
|
|
static u_int neponset_get_mctrl(struct uart_port *port)
|
|
{
|
|
u_int ret = TIOCM_CD | TIOCM_CTS | TIOCM_DSR;
|
|
u_int mdm_ctl1 = MDM_CTL_1;
|
|
|
|
if (port->mapbase == _Ser1UTCR0) {
|
|
if (mdm_ctl1 & MDM_CTL1_DCD2)
|
|
ret &= ~TIOCM_CD;
|
|
if (mdm_ctl1 & MDM_CTL1_CTS2)
|
|
ret &= ~TIOCM_CTS;
|
|
if (mdm_ctl1 & MDM_CTL1_DSR2)
|
|
ret &= ~TIOCM_DSR;
|
|
} else if (port->mapbase == _Ser3UTCR0) {
|
|
if (mdm_ctl1 & MDM_CTL1_DCD1)
|
|
ret &= ~TIOCM_CD;
|
|
if (mdm_ctl1 & MDM_CTL1_CTS1)
|
|
ret &= ~TIOCM_CTS;
|
|
if (mdm_ctl1 & MDM_CTL1_DSR1)
|
|
ret &= ~TIOCM_DSR;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static struct sa1100_port_fns neponset_port_fns __devinitdata = {
|
|
.set_mctrl = neponset_set_mctrl,
|
|
.get_mctrl = neponset_get_mctrl,
|
|
};
|
|
|
|
static int __devinit neponset_probe(struct platform_device *dev)
|
|
{
|
|
sa1100_register_uart_fns(&neponset_port_fns);
|
|
|
|
/*
|
|
* Install handler for GPIO25.
|
|
*/
|
|
set_irq_type(IRQ_GPIO25, IRQ_TYPE_EDGE_RISING);
|
|
set_irq_chained_handler(IRQ_GPIO25, neponset_irq_handler);
|
|
|
|
/*
|
|
* We would set IRQ_GPIO25 to be a wake-up IRQ, but
|
|
* unfortunately something on the Neponset activates
|
|
* this IRQ on sleep (ethernet?)
|
|
*/
|
|
#if 0
|
|
enable_irq_wake(IRQ_GPIO25);
|
|
#endif
|
|
|
|
/*
|
|
* Setup other Neponset IRQs. SA1111 will be done by the
|
|
* generic SA1111 code.
|
|
*/
|
|
set_irq_handler(IRQ_NEPONSET_SMC9196, handle_simple_irq);
|
|
set_irq_flags(IRQ_NEPONSET_SMC9196, IRQF_VALID | IRQF_PROBE);
|
|
set_irq_handler(IRQ_NEPONSET_USAR, handle_simple_irq);
|
|
set_irq_flags(IRQ_NEPONSET_USAR, IRQF_VALID | IRQF_PROBE);
|
|
|
|
/*
|
|
* Disable GPIO 0/1 drivers so the buttons work on the module.
|
|
*/
|
|
NCR_0 = NCR_GP01_OFF;
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
/*
|
|
* LDM power management.
|
|
*/
|
|
static unsigned int neponset_saved_state;
|
|
|
|
static int neponset_suspend(struct platform_device *dev, pm_message_t state)
|
|
{
|
|
/*
|
|
* Save state.
|
|
*/
|
|
neponset_saved_state = NCR_0;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int neponset_resume(struct platform_device *dev)
|
|
{
|
|
NCR_0 = neponset_saved_state;
|
|
|
|
return 0;
|
|
}
|
|
|
|
#else
|
|
#define neponset_suspend NULL
|
|
#define neponset_resume NULL
|
|
#endif
|
|
|
|
static struct platform_driver neponset_device_driver = {
|
|
.probe = neponset_probe,
|
|
.suspend = neponset_suspend,
|
|
.resume = neponset_resume,
|
|
.driver = {
|
|
.name = "neponset",
|
|
},
|
|
};
|
|
|
|
static struct resource neponset_resources[] = {
|
|
[0] = {
|
|
.start = 0x10000000,
|
|
.end = 0x17ffffff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct platform_device neponset_device = {
|
|
.name = "neponset",
|
|
.id = 0,
|
|
.num_resources = ARRAY_SIZE(neponset_resources),
|
|
.resource = neponset_resources,
|
|
};
|
|
|
|
static struct resource sa1111_resources[] = {
|
|
[0] = {
|
|
.start = 0x40000000,
|
|
.end = 0x40001fff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = IRQ_NEPONSET_SA1111,
|
|
.end = IRQ_NEPONSET_SA1111,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct sa1111_platform_data sa1111_info = {
|
|
.irq_base = IRQ_BOARD_END,
|
|
};
|
|
|
|
static u64 sa1111_dmamask = 0xffffffffUL;
|
|
|
|
static struct platform_device sa1111_device = {
|
|
.name = "sa1111",
|
|
.id = 0,
|
|
.dev = {
|
|
.dma_mask = &sa1111_dmamask,
|
|
.coherent_dma_mask = 0xffffffff,
|
|
.platform_data = &sa1111_info,
|
|
},
|
|
.num_resources = ARRAY_SIZE(sa1111_resources),
|
|
.resource = sa1111_resources,
|
|
};
|
|
|
|
static struct resource smc91x_resources[] = {
|
|
[0] = {
|
|
.name = "smc91x-regs",
|
|
.start = SA1100_CS3_PHYS,
|
|
.end = SA1100_CS3_PHYS + 0x01ffffff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = IRQ_NEPONSET_SMC9196,
|
|
.end = IRQ_NEPONSET_SMC9196,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
[2] = {
|
|
.name = "smc91x-attrib",
|
|
.start = SA1100_CS3_PHYS + 0x02000000,
|
|
.end = SA1100_CS3_PHYS + 0x03ffffff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct platform_device smc91x_device = {
|
|
.name = "smc91x",
|
|
.id = 0,
|
|
.num_resources = ARRAY_SIZE(smc91x_resources),
|
|
.resource = smc91x_resources,
|
|
};
|
|
|
|
static struct platform_device *devices[] __initdata = {
|
|
&neponset_device,
|
|
&sa1111_device,
|
|
&smc91x_device,
|
|
};
|
|
|
|
extern void sa1110_mb_disable(void);
|
|
|
|
static int __init neponset_init(void)
|
|
{
|
|
platform_driver_register(&neponset_device_driver);
|
|
|
|
/*
|
|
* The Neponset is only present on the Assabet machine type.
|
|
*/
|
|
if (!machine_is_assabet())
|
|
return -ENODEV;
|
|
|
|
/*
|
|
* Ensure that the memory bus request/grant signals are setup,
|
|
* and the grant is held in its inactive state, whether or not
|
|
* we actually have a Neponset attached.
|
|
*/
|
|
sa1110_mb_disable();
|
|
|
|
if (!machine_has_neponset()) {
|
|
printk(KERN_DEBUG "Neponset expansion board not present\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
if (WHOAMI != 0x11) {
|
|
printk(KERN_WARNING "Neponset board detected, but "
|
|
"wrong ID: %02x\n", WHOAMI);
|
|
return -ENODEV;
|
|
}
|
|
|
|
return platform_add_devices(devices, ARRAY_SIZE(devices));
|
|
}
|
|
|
|
subsys_initcall(neponset_init);
|
|
|
|
static struct map_desc neponset_io_desc[] __initdata = {
|
|
{ /* System Registers */
|
|
.virtual = 0xf3000000,
|
|
.pfn = __phys_to_pfn(0x10000000),
|
|
.length = SZ_1M,
|
|
.type = MT_DEVICE
|
|
}, { /* SA-1111 */
|
|
.virtual = 0xf4000000,
|
|
.pfn = __phys_to_pfn(0x40000000),
|
|
.length = SZ_1M,
|
|
.type = MT_DEVICE
|
|
}
|
|
};
|
|
|
|
void __init neponset_map_io(void)
|
|
{
|
|
iotable_init(neponset_io_desc, ARRAY_SIZE(neponset_io_desc));
|
|
}
|