irq: separate sparse_irqs from sparse_irqs_free

so later don't need compare with -1U

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/include/linux/irq.h b/include/linux/irq.h
index 5fe1b01c11fe60a5869db763f7aac4bbe6275774..d5749852ee695603e3b0dd9a8a21ae5efd393633 100644 (file)
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -211,7 +211,7 @@ extern struct irq_desc *irq_desc;
 
 extern struct irq_desc *sparse_irqs;
 #define for_each_irq_desc(irqX, desc)          \
-       for (desc = sparse_irqs, irqX = desc->irq; desc && irqX != -1U; desc = desc->next, irqX = desc ? desc->irq : -1U)
+       for (desc = sparse_irqs, irqX = desc->irq; desc; desc = desc->next, irqX = desc ? desc->irq : -1U)
 
 #endif
 

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index d44e3515eae155c8240adce229928bc9f21dc931..6d174390f3a039eed8a95bcd9e47dd32fbe0890c 100644 (file)
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -112,6 +112,11 @@ static void init_kstat_irqs(struct irq_desc *desc, int nr_desc, int nr)
        }
 }
 
+#ifdef CONFIG_HAVE_SPARSE_IRQ
+static struct irq_desc *sparse_irqs_free;
+struct irq_desc *sparse_irqs;
+#endif
+
 static void __init init_work(void *data)
 {
        struct dyn_array *da = data;
@@ -127,13 +132,16 @@ static void __init init_work(void *data)
 #endif
        }
 
+       /* init kstat_irqs, nr_cpu_ids is ready already */
+       init_kstat_irqs(desc, *da->nr, nr_cpu_ids);
+
 #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);
+       sparse_irqs_free = sparse_irqs;
+       sparse_irqs = NULL;
+#endif
 }
 
 #ifdef CONFIG_HAVE_SPARSE_IRQ
@@ -148,23 +156,17 @@ static int __init parse_nr_irq_desc(char *arg)
 
 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];
+       desc = sparse_irqs;
        while (desc) {
                if (desc->irq == irq)
                        return desc;
 
-               if (desc->irq == -1U)
-                       return NULL;
-
                desc = desc->next;
        }
        return NULL;
@@ -174,21 +176,12 @@ struct irq_desc *irq_to_desc_alloc(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];
+       desc_pri = desc = sparse_irqs;
        while (desc) {
                if (desc->irq == irq)
                        return desc;
 
-               if (desc->irq == -1U) {
-                       desc->irq = irq;
-                       printk(KERN_DEBUG "found new irq_desc for irq %d\n", desc->irq);
-                       return desc;
-               }
                desc_pri = desc;
                desc = desc->next;
                count++;
@@ -197,48 +190,62 @@ struct irq_desc *irq_to_desc_alloc(unsigned int irq)
        /*
         *  we run out of pre-allocate ones, allocate more
         */
-       printk(KERN_DEBUG "try to get more irq_desc %d\n", nr_irq_desc);
-       {
-               /* double check if some one mess up the list */
-               struct irq_desc *desc;
-               int count = 0;
-
-               desc = &sparse_irqs[0];
-               while (desc) {
-                       printk(KERN_DEBUG "found irq_desc for irq %d\n", desc->irq);
-                       if (desc->next)
-                               printk(KERN_DEBUG "found irq_desc for irq %d and next will be irq %d\n", desc->irq, desc->next->irq);
-                       desc = desc->next;
-                       count++;
-               }
-               printk(KERN_DEBUG "all preallocted %d\n", count);
-       }
+       if (!sparse_irqs_free) {
+               unsigned long phys;
+               unsigned long total_bytes;
 
-       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);
+               printk(KERN_DEBUG "try to get more irq_desc %d\n", nr_irq_desc);
 
-       if (!desc)
-               panic("please boot with nr_irq_desc= %d\n", count * 2);
+               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);
 
-       phys = __pa(desc);
-       printk(KERN_DEBUG "irq_desc ==> [%#lx - %#lx]\n", phys, phys + total_bytes);
+               if (!desc)
+                       panic("please boot with nr_irq_desc= %d\n", count * 2);
 
-       for (i = 0; i < nr_irq_desc; i++)
-               init_one_irq_desc(&desc[i]);
+               phys = __pa(desc);
+               printk(KERN_DEBUG "irq_desc ==> [%#lx - %#lx]\n", phys, phys + total_bytes);
 
-       for (i = 1; i < nr_irq_desc; i++)
-               desc[i-1].next = &desc[i];
+               for (i = 0; i < nr_irq_desc; i++)
+                       init_one_irq_desc(&desc[i]);
 
-       /* init kstat_irqs, nr_cpu_ids is ready already */
-       init_kstat_irqs(desc, nr_irq_desc, nr_cpu_ids);
+               for (i = 1; i < nr_irq_desc; i++)
+                       desc[i-1].next = &desc[i];
 
-       desc->irq = irq;
-       desc_pri->next = desc;
-       printk(KERN_DEBUG "1 found new irq_desc for irq %d and pri will be irq %d\n", desc->irq, desc_pri->irq);
+               /* init kstat_irqs, nr_cpu_ids is ready already */
+               init_kstat_irqs(desc, nr_irq_desc, nr_cpu_ids);
 
+               sparse_irqs_free = desc;
+       }
+
+       desc = sparse_irqs_free;
+       sparse_irqs_free = sparse_irqs_free->next;
+       desc->next = NULL;
+       if (desc_pri)
+               desc_pri->next = desc;
+       else
+               sparse_irqs = desc;
+       desc->irq = irq;
+       printk(KERN_DEBUG "found new irq_desc for irq %d\n", desc->irq);
+#ifdef CONFIG_HAVE_SPARSE_IRQ_DEBUG
+       {
+               /* dump the results */
+               struct irq_desc *desc;
+               unsigned long phys;
+               unsigned long bytes = sizeof(struct irq_desc);
+               unsigned int irqx;
+
+               printk(KERN_DEBUG "=========================== %d\n", irq);
+               printk(KERN_DEBUG "irq_desc dump after get that for %d\n", irq);
+               for_each_irq_desc(irqx, desc) {
+                       phys = __pa(desc);
+                       printk(KERN_DEBUG "irq_desc %d ==> [%#lx - %#lx]\n", irqx, phys, phys + bytes);
+               }
+               printk(KERN_DEBUG "===========================\n");
+       }
+#endif
        return desc;
 }
 #else