Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull irq core updates from Thomas Gleixner:
 "A rather large update for the interrupt core code and the irq chip drivers:

   - Add a new bitmap matrix allocator and supporting changes, which is
     used to replace the x86 vector allocator which comes with separate
     pull request. This allows to replace the convoluted nested loop
     allocation function in x86 with a facility which supports the
     recently added property of managed interrupts proper and allows to
     switch to a best effort vector reservation scheme, which addresses
     problems with vector exhaustion.

   - A large update to the ARM GIC-V3-ITS driver adding support for
     range selectors.

   - New interrupt controllers:
       - Meson and Meson8 GPIO
       - BCM7271 L2
       - Socionext EXIU

     If you expected that this will stop at some point, I have to
     disappoint you. There are new ones posted already. Sigh!

   - STM32 interrupt controller support for new platforms.

   - A pile of fixes, cleanups and updates to the MIPS GIC driver

   - The usual small fixes, cleanups and updates all over the place.
     Most visible one is to move the irq chip drivers Kconfig switches
     into a separate Kconfig menu"

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (70 commits)
  genirq: Fix type of shifting literal 1 in __setup_irq()
  irqdomain: Drop pointless NULL check in virq_debug_show_one
  genirq/proc: Return proper error code when irq_set_affinity() fails
  irq/work: Use llist_for_each_entry_safe
  irqchip: mips-gic: Print warning if inherited GIC base is used
  irqchip/mips-gic: Add pr_fmt and reword pr_* messages
  irqchip/stm32: Move the wakeup on interrupt mask
  irqchip/stm32: Fix initial values
  irqchip/stm32: Add stm32h7 support
  dt-bindings/interrupt-controllers: Add compatible string for stm32h7
  irqchip/stm32: Add multi-bank management
  irqchip/stm32: Select GENERIC_IRQ_CHIP
  irqchip/exiu: Add support for Socionext Synquacer EXIU controller
  dt-bindings: Add description of Socionext EXIU interrupt controller
  irqchip/gic-v3-its: Fix VPE activate callback return value
  irqchip: mips-gic: Make IPI bitmaps static
  irqchip: mips-gic: Share register writes in gic_set_type()
  irqchip: mips-gic: Remove gic_vpes variable
  irqchip: mips-gic: Use num_possible_cpus() to reserve IPIs
  irqchip: mips-gic: Configure EIC when CPUs come online
  ...

1 files changed, 29 insertions, 6 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 5a2ef92c2782..043bfc35b353 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -207,20 +207,24 @@ __irq_startup_managed(struct irq_desc *desc, struct cpumask *aff, bool force)
                  * Catch code which fiddles with enable_irq() on a managed
                  * and potentially shutdown IRQ. Chained interrupt
                  * installment or irq auto probing should not happen on
-                 * managed irqs either. Emit a warning, break the affinity
-                 * and start it up as a normal interrupt.
+                 * managed irqs either.
                  */
                 if (WARN_ON_ONCE(force))
-                        return IRQ_STARTUP_NORMAL;
+                        return IRQ_STARTUP_ABORT;
                 /*
                  * The interrupt was requested, but there is no online CPU
                  * in it's affinity mask. Put it into managed shutdown
                  * state and let the cpu hotplug mechanism start it up once
                  * a CPU in the mask becomes available.
                  */
-                irqd_set_managed_shutdown(d);
                 return IRQ_STARTUP_ABORT;
         }
+        /*
+         * Managed interrupts have reserved resources, so this should not
+         * happen.
+         */
+        if (WARN_ON(irq_domain_activate_irq(d, false)))
+                return IRQ_STARTUP_ABORT;
         return IRQ_STARTUP_MANAGED;
 }
 #else
@@ -236,7 +240,9 @@ static int __irq_startup(struct irq_desc *desc)
         struct irq_data *d = irq_desc_get_irq_data(desc);
         int ret = 0;
 
-        irq_domain_activate_irq(d);
+        /* Warn if this interrupt is not activated but try nevertheless */
+        WARN_ON_ONCE(!irqd_is_activated(d));
+
         if (d->chip->irq_startup) {
                 ret = d->chip->irq_startup(d);
                 irq_state_clr_disabled(desc);
@@ -269,6 +275,7 @@ int irq_startup(struct irq_desc *desc, bool resend, bool force)
                         ret = __irq_startup(desc);
                         break;
                 case IRQ_STARTUP_ABORT:
+                        irqd_set_managed_shutdown(d);
                         return 0;
                 }
         }
@@ -278,6 +285,22 @@ int irq_startup(struct irq_desc *desc, bool resend, bool force)
         return ret;
 }
 
+int irq_activate(struct irq_desc *desc)
+{
+        struct irq_data *d = irq_desc_get_irq_data(desc);
+
+        if (!irqd_affinity_is_managed(d))
+                return irq_domain_activate_irq(d, false);
+        return 0;
+}
+
+void irq_activate_and_startup(struct irq_desc *desc, bool resend)
+{
+        if (WARN_ON(irq_activate(desc)))
+                return;
+        irq_startup(desc, resend, IRQ_START_FORCE);
+}
+
 static void __irq_disable(struct irq_desc *desc, bool mask);
 
 void irq_shutdown(struct irq_desc *desc)
@@ -953,7 +976,7 @@ __irq_do_set_handler(struct irq_desc *desc, irq_flow_handler_t handle,
                 irq_settings_set_norequest(desc);
                 irq_settings_set_nothread(desc);
                 desc->action = &chained_action;
-                irq_startup(desc, IRQ_RESEND, IRQ_START_FORCE);
+                irq_activate_and_startup(desc, IRQ_RESEND);
         }
 }