mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +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>
261 lines
5.9 KiB
C
261 lines
5.9 KiB
C
/*
|
|
* Interrupt management for most GSC and related devices.
|
|
*
|
|
* (c) Copyright 1999 Alex deVries for The Puffin Group
|
|
* (c) Copyright 1999 Grant Grundler for Hewlett-Packard
|
|
* (c) Copyright 1999 Matthew Wilcox
|
|
* (c) Copyright 2000 Helge Deller
|
|
* (c) Copyright 2001 Matthew Wilcox for Hewlett-Packard
|
|
*
|
|
* 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/bitops.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/init.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/module.h>
|
|
#include <linux/types.h>
|
|
|
|
#include <asm/hardware.h>
|
|
#include <asm/io.h>
|
|
|
|
#include "gsc.h"
|
|
|
|
#undef DEBUG
|
|
|
|
#ifdef DEBUG
|
|
#define DEBPRINTK printk
|
|
#else
|
|
#define DEBPRINTK(x,...)
|
|
#endif
|
|
|
|
int gsc_alloc_irq(struct gsc_irq *i)
|
|
{
|
|
int irq = txn_alloc_irq(GSC_EIM_WIDTH);
|
|
if (irq < 0) {
|
|
printk("cannot get irq\n");
|
|
return irq;
|
|
}
|
|
|
|
i->txn_addr = txn_alloc_addr(irq);
|
|
i->txn_data = txn_alloc_data(irq);
|
|
i->irq = irq;
|
|
|
|
return irq;
|
|
}
|
|
|
|
int gsc_claim_irq(struct gsc_irq *i, int irq)
|
|
{
|
|
int c = irq;
|
|
|
|
irq += CPU_IRQ_BASE; /* virtualize the IRQ first */
|
|
|
|
irq = txn_claim_irq(irq);
|
|
if (irq < 0) {
|
|
printk("cannot claim irq %d\n", c);
|
|
return irq;
|
|
}
|
|
|
|
i->txn_addr = txn_alloc_addr(irq);
|
|
i->txn_data = txn_alloc_data(irq);
|
|
i->irq = irq;
|
|
|
|
return irq;
|
|
}
|
|
|
|
EXPORT_SYMBOL(gsc_alloc_irq);
|
|
EXPORT_SYMBOL(gsc_claim_irq);
|
|
|
|
/* Common interrupt demultiplexer used by Asp, Lasi & Wax. */
|
|
irqreturn_t gsc_asic_intr(int gsc_asic_irq, void *dev)
|
|
{
|
|
unsigned long irr;
|
|
struct gsc_asic *gsc_asic = dev;
|
|
|
|
irr = gsc_readl(gsc_asic->hpa + OFFSET_IRR);
|
|
if (irr == 0)
|
|
return IRQ_NONE;
|
|
|
|
DEBPRINTK("%s intr, mask=0x%x\n", gsc_asic->name, irr);
|
|
|
|
do {
|
|
int local_irq = __ffs(irr);
|
|
unsigned int irq = gsc_asic->global_irq[local_irq];
|
|
__do_IRQ(irq);
|
|
irr &= ~(1 << local_irq);
|
|
} while (irr);
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
int gsc_find_local_irq(unsigned int irq, int *global_irqs, int limit)
|
|
{
|
|
int local_irq;
|
|
|
|
for (local_irq = 0; local_irq < limit; local_irq++) {
|
|
if (global_irqs[local_irq] == irq)
|
|
return local_irq;
|
|
}
|
|
|
|
return NO_IRQ;
|
|
}
|
|
|
|
static void gsc_asic_disable_irq(unsigned int irq)
|
|
{
|
|
struct irq_desc *desc = irq_to_desc(irq);
|
|
struct gsc_asic *irq_dev = desc->chip_data;
|
|
int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
|
|
u32 imr;
|
|
|
|
DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __func__, irq,
|
|
irq_dev->name, imr);
|
|
|
|
/* Disable the IRQ line by clearing the bit in the IMR */
|
|
imr = gsc_readl(irq_dev->hpa + OFFSET_IMR);
|
|
imr &= ~(1 << local_irq);
|
|
gsc_writel(imr, irq_dev->hpa + OFFSET_IMR);
|
|
}
|
|
|
|
static void gsc_asic_enable_irq(unsigned int irq)
|
|
{
|
|
struct irq_desc *desc = irq_to_desc(irq);
|
|
struct gsc_asic *irq_dev = desc->chip_data;
|
|
int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
|
|
u32 imr;
|
|
|
|
DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __func__, irq,
|
|
irq_dev->name, imr);
|
|
|
|
/* Enable the IRQ line by setting the bit in the IMR */
|
|
imr = gsc_readl(irq_dev->hpa + OFFSET_IMR);
|
|
imr |= 1 << local_irq;
|
|
gsc_writel(imr, irq_dev->hpa + OFFSET_IMR);
|
|
/*
|
|
* FIXME: read IPR to make sure the IRQ isn't already pending.
|
|
* If so, we need to read IRR and manually call do_irq().
|
|
*/
|
|
}
|
|
|
|
static unsigned int gsc_asic_startup_irq(unsigned int irq)
|
|
{
|
|
gsc_asic_enable_irq(irq);
|
|
return 0;
|
|
}
|
|
|
|
static struct irq_chip gsc_asic_interrupt_type = {
|
|
.name = "GSC-ASIC",
|
|
.startup = gsc_asic_startup_irq,
|
|
.shutdown = gsc_asic_disable_irq,
|
|
.enable = gsc_asic_enable_irq,
|
|
.disable = gsc_asic_disable_irq,
|
|
.ack = no_ack_irq,
|
|
.end = no_end_irq,
|
|
};
|
|
|
|
int gsc_assign_irq(struct irq_chip *type, void *data)
|
|
{
|
|
static int irq = GSC_IRQ_BASE;
|
|
struct irq_desc *desc;
|
|
|
|
if (irq > GSC_IRQ_MAX)
|
|
return NO_IRQ;
|
|
|
|
desc = irq_to_desc(irq);
|
|
desc->chip = type;
|
|
desc->chip_data = data;
|
|
return irq++;
|
|
}
|
|
|
|
void gsc_asic_assign_irq(struct gsc_asic *asic, int local_irq, int *irqp)
|
|
{
|
|
int irq = asic->global_irq[local_irq];
|
|
|
|
if (irq <= 0) {
|
|
irq = gsc_assign_irq(&gsc_asic_interrupt_type, asic);
|
|
if (irq == NO_IRQ)
|
|
return;
|
|
|
|
asic->global_irq[local_irq] = irq;
|
|
}
|
|
*irqp = irq;
|
|
}
|
|
|
|
struct gsc_fixup_struct {
|
|
void (*choose_irq)(struct parisc_device *, void *);
|
|
void *ctrl;
|
|
};
|
|
|
|
static int gsc_fixup_irqs_callback(struct device *dev, void *data)
|
|
{
|
|
struct parisc_device *padev = to_parisc_device(dev);
|
|
struct gsc_fixup_struct *gf = data;
|
|
|
|
/* work-around for 715/64 and others which have parent
|
|
at path [5] and children at path [5/0/x] */
|
|
if (padev->id.hw_type == HPHW_FAULTY)
|
|
gsc_fixup_irqs(padev, gf->ctrl, gf->choose_irq);
|
|
gf->choose_irq(padev, gf->ctrl);
|
|
|
|
return 0;
|
|
}
|
|
|
|
void gsc_fixup_irqs(struct parisc_device *parent, void *ctrl,
|
|
void (*choose_irq)(struct parisc_device *, void *))
|
|
{
|
|
struct gsc_fixup_struct data = {
|
|
.choose_irq = choose_irq,
|
|
.ctrl = ctrl,
|
|
};
|
|
|
|
device_for_each_child(&parent->dev, &data, gsc_fixup_irqs_callback);
|
|
}
|
|
|
|
int gsc_common_setup(struct parisc_device *parent, struct gsc_asic *gsc_asic)
|
|
{
|
|
struct resource *res;
|
|
int i;
|
|
|
|
gsc_asic->gsc = parent;
|
|
|
|
/* Initialise local irq -> global irq mapping */
|
|
for (i = 0; i < 32; i++) {
|
|
gsc_asic->global_irq[i] = NO_IRQ;
|
|
}
|
|
|
|
/* allocate resource region */
|
|
res = request_mem_region(gsc_asic->hpa, 0x100000, gsc_asic->name);
|
|
if (res) {
|
|
res->flags = IORESOURCE_MEM; /* do not mark it busy ! */
|
|
}
|
|
|
|
#if 0
|
|
printk(KERN_WARNING "%s IRQ %d EIM 0x%x", gsc_asic->name,
|
|
parent->irq, gsc_asic->eim);
|
|
if (gsc_readl(gsc_asic->hpa + OFFSET_IMR))
|
|
printk(" IMR is non-zero! (0x%x)",
|
|
gsc_readl(gsc_asic->hpa + OFFSET_IMR));
|
|
printk("\n");
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
|
|
extern struct parisc_driver lasi_driver;
|
|
extern struct parisc_driver asp_driver;
|
|
extern struct parisc_driver wax_driver;
|
|
|
|
void __init gsc_init(void)
|
|
{
|
|
#ifdef CONFIG_GSC_LASI
|
|
register_parisc_driver(&lasi_driver);
|
|
register_parisc_driver(&asp_driver);
|
|
#endif
|
|
#ifdef CONFIG_GSC_WAX
|
|
register_parisc_driver(&wax_driver);
|
|
#endif
|
|
}
|