genirq: Make nr_irqs runtime expandable

We face more and more the requirement to expand nr_irqs at
runtime. The reason are irq expanders which can not be detected in the
early boot stage. So we speculate nr_irqs to have enough room. Further
Xen needs extra irq numbers and we really want to avoid adding more
"detection" code into the early boot. There is no real good reason why
we need to limit nr_irqs at early boot.

Allow the allocation code to expand nr_irqs. We have already 8k extra
number space in the allocation bitmap, so lets use it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index a250d3a0af12bd593cfaec77b33c0944dc9a0fe7..6f6644f819dd9607b8d28a59856d9234bba0c8eb 100644 (file)
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -206,6 +206,14 @@ struct irq_desc * __ref irq_to_desc_alloc_node(unsigned int irq, int node)
        return NULL;
 }
 
+static int irq_expand_nr_irqs(unsigned int cnt)
+{
+       if (nr_irqs + cnt > IRQ_BITMAP_BITS)
+               return -ENOMEM;
+       nr_irqs += cnt;
+       return 0;
+}
+
 int __init early_irq_init(void)
 {
        int i, initcnt, node = first_online_node;
@@ -287,6 +295,12 @@ static inline int alloc_descs(unsigned int start, unsigned int cnt, int node)
 {
        return start;
 }
+
+static int irq_expand_nr_irqs(unsigned int cnt)
+{
+       return -ENOMEM;
+}
+
 #endif /* !CONFIG_SPARSE_IRQ */
 
 /* Dynamic interrupt handling */
@@ -335,9 +349,11 @@ irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node)
        if (irq >=0 && start != irq)
                goto err;
 
-       ret = -ENOMEM;
-       if (start >= nr_irqs)
-               goto err;
+       if (start >= nr_irqs) {
+               ret = irq_expand_nr_irqs(cnt);
+               if (ret)
+                       goto err;
+       }
 
        bitmap_set(allocated_irqs, start, cnt);
        mutex_unlock(&sparse_irq_lock);