#include "internals.h"
-#ifdef CONFIG_TRACE_IRQFLAGS
-
-/*
- * lockdep: we want to handle all irq_desc locks as a single lock-class:
- */
-static struct lock_class_key irq_desc_lock_class;
-#endif
-
/**
* handle_bad_irq - handle spurious and unhandled irqs
* @irq: the interrupt number
*
* Handles spurious and unhandled IRQ's. It also prints a debugmessage.
*/
-void
-handle_bad_irq(unsigned int irq, struct irq_desc *desc)
+void handle_bad_irq(unsigned int irq, struct irq_desc *desc)
{
print_irq_desc(irq, desc);
- kstat_irqs_this_cpu(desc)++;
+ kstat_incr_irqs_this_cpu(irq, desc);
ack_bad_irq(irq);
}
int nr_irqs = NR_IRQS;
EXPORT_SYMBOL_GPL(nr_irqs);
-#ifdef CONFIG_HAVE_DYN_ARRAY
-static struct irq_desc irq_desc_init = {
- .irq = -1U,
- .status = IRQ_DISABLED,
- .chip = &no_irq_chip,
- .handle_irq = handle_bad_irq,
- .depth = 1,
- .lock = __SPIN_LOCK_UNLOCKED(irq_desc_init.lock),
-#ifdef CONFIG_SMP
- .affinity = CPU_MASK_ALL
-#endif
-};
-
-
-static void init_one_irq_desc(struct irq_desc *desc)
-{
- memcpy(desc, &irq_desc_init, sizeof(struct irq_desc));
-#ifdef CONFIG_TRACE_IRQFLAGS
- lockdep_set_class(&desc->lock, &irq_desc_lock_class);
-#endif
-}
-
-extern int after_bootmem;
-extern void *__alloc_bootmem_nopanic(unsigned long size,
- unsigned long align,
- unsigned long goal);
-
-static void init_kstat_irqs(struct irq_desc *desc, int nr_desc, int nr)
-{
- unsigned long bytes, total_bytes;
- char *ptr;
- int i;
- unsigned long phys;
-
- /* Compute how many bytes we need per irq and allocate them */
- bytes = nr * sizeof(unsigned int);
- total_bytes = bytes * nr_desc;
- if (after_bootmem)
- ptr = kzalloc(total_bytes, GFP_ATOMIC);
- else
- ptr = __alloc_bootmem_nopanic(total_bytes, PAGE_SIZE, 0);
-
- if (!ptr)
- panic(" can not allocate kstat_irqs\n");
-
- phys = __pa(ptr);
- printk(KERN_DEBUG "kstat_irqs ==> [%#lx - %#lx]\n", phys, phys + total_bytes);
-
- for (i = 0; i < nr_desc; i++) {
- desc[i].kstat_irqs = (unsigned int *)ptr;
- ptr += bytes;
- }
-}
-
-static void __init init_work(void *data)
-{
- struct dyn_array *da = data;
- int i;
- struct irq_desc *desc;
-
- desc = *da->name;
-
- for (i = 0; i < *da->nr; i++) {
- init_one_irq_desc(&desc[i]);
-#ifndef CONFIG_HAVE_SPARSE_IRQ
- desc[i].irq = i;
-#endif
- }
-
-#ifdef CONFIG_HAVE_SPARSE_IRQ
- for (i = 1; i < *da->nr; i++)
- desc[i-1].next = &desc[i];
-#endif
-
- /* init kstat_irqs, nr_cpu_ids is ready already */
- init_kstat_irqs(desc, *da->nr, nr_cpu_ids);
-}
-
-#ifdef CONFIG_HAVE_SPARSE_IRQ
-static int nr_irq_desc = 32;
-
-static int __init parse_nr_irq_desc(char *arg)
-{
- if (arg)
- nr_irq_desc = simple_strtoul(arg, NULL, 0);
- return 0;
-}
-
-early_param("nr_irq_desc", parse_nr_irq_desc);
-
-struct irq_desc *sparse_irqs;
-DEFINE_DYN_ARRAY(sparse_irqs, sizeof(struct irq_desc), nr_irq_desc, PAGE_SIZE, init_work);
-
-struct irq_desc *__irq_to_desc(unsigned int irq)
-{
- struct irq_desc *desc;
-
- BUG_ON(irq == -1U);
-
- desc = &sparse_irqs[0];
- while (desc) {
- if (desc->irq == irq)
- return desc;
-
- if (desc->irq == -1U)
- return NULL;
-
- desc = desc->next;
- }
- return NULL;
-}
-struct irq_desc *irq_to_desc(unsigned int irq)
-{
- struct irq_desc *desc, *desc_pri;
- int i;
- int count = 0;
- unsigned long phys;
- unsigned long total_bytes;
-
- BUG_ON(irq == -1U);
-
- desc_pri = desc = &sparse_irqs[0];
- while (desc) {
- if (desc->irq == irq)
- return desc;
-
- if (desc->irq == -1U) {
- desc->irq = irq;
- return desc;
- }
- desc_pri = desc;
- desc = desc->next;
- count++;
- }
-
- /*
- * we run out of pre-allocate ones, allocate more
- */
- printk(KERN_DEBUG "try to get more irq_desc %d\n", nr_irq_desc);
-
- total_bytes = sizeof(struct irq_desc) * nr_irq_desc;
- if (after_bootmem)
- desc = kzalloc(total_bytes, GFP_ATOMIC);
- else
- desc = __alloc_bootmem_nopanic(total_bytes, PAGE_SIZE, 0);
-
- if (!desc)
- panic("please boot with nr_irq_desc= %d\n", count * 2);
-
- phys = __pa(desc);
- printk(KERN_DEBUG "irq_desc ==> [%#lx - %#lx]\n", phys, phys + total_bytes);
-
- for (i = 0; i < nr_irq_desc; i++)
- init_one_irq_desc(&desc[i]);
-
- for (i = 1; i < nr_irq_desc; i++)
- desc[i-1].next = &desc[i];
-
- /* init kstat_irqs, nr_cpu_ids is ready already */
- init_kstat_irqs(desc, nr_irq_desc, nr_cpu_ids);
-
- desc->irq = irq;
- desc_pri->next = desc;
-
- return desc;
-}
-#else
-struct irq_desc *irq_desc;
-DEFINE_DYN_ARRAY(irq_desc, sizeof(struct irq_desc), nr_irqs, PAGE_SIZE, init_work);
-
-#endif
-
-#else
-
struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned_in_smp = {
[0 ... NR_IRQS-1] = {
.status = IRQ_DISABLED,
.chip = &no_irq_chip,
.handle_irq = handle_bad_irq,
.depth = 1,
- .lock = __SPIN_LOCK_UNLOCKED(sparse_irqs->lock),
+ .lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock),
#ifdef CONFIG_SMP
.affinity = CPU_MASK_ALL
#endif
}
};
-#endif
-
-#ifndef CONFIG_HAVE_SPARSE_IRQ
-struct irq_desc *irq_to_desc(unsigned int irq)
-{
- if (irq < nr_irqs)
- return &irq_desc[irq];
-
- return NULL;
-}
-struct irq_desc *__irq_to_desc(unsigned int irq)
-{
- return irq_to_desc(irq);
-}
-#endif
-
/*
* What should we do if we get a hw irq event on an illegal vector?
* Each architecture has to answer this themself.
*/
static void ack_bad(unsigned int irq)
{
- struct irq_desc *desc;
+ struct irq_desc *desc = irq_to_desc(irq);
- desc = irq_to_desc(irq);
print_irq_desc(irq, desc);
ack_bad_irq(irq);
}
struct irqaction *action;
unsigned int status;
- kstat_irqs_this_cpu(desc)++;
+ kstat_incr_irqs_this_cpu(irq, desc);
+
if (CHECK_IRQ_PER_CPU(desc->status)) {
irqreturn_t action_ret;
#ifdef CONFIG_TRACE_IRQFLAGS
+/*
+ * lockdep: we want to handle all irq_desc locks as a single lock-class:
+ */
+static struct lock_class_key irq_desc_lock_class;
+
void early_init_irq_lock_class(void)
{
-#ifndef CONFIG_HAVE_DYN_ARRAY
int i;
for (i = 0; i < nr_irqs; i++)
lockdep_set_class(&irq_desc[i].lock, &irq_desc_lock_class);
-#endif
}
#endif
-
-unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)
-{
- struct irq_desc *desc = irq_to_desc(irq);
- return desc->kstat_irqs[cpu];
-}
-EXPORT_SYMBOL(kstat_irqs_cpu);
-