The startup vs. setaffinity ordering of interrupts depends on the
IRQF_NOAUTOEN flag. Chained interrupts are not getting any affinity
assignment at all.
A regular interrupt is started up and then the affinity is set. A
IRQF_NOAUTOEN marked interrupt is not started up, but the affinity is set
nevertheless.
Move the affinity setup to startup_irq() so the ordering is always the same
and chained interrupts get the proper default affinity assigned as well.
Signed-off-by: Thomas Gleixner <t...@linutronix.de>
---
kernel/irq/chip.c | 2 ++
kernel/irq/manage.c | 15 ++++++---------
2 files changed, 8 insertions(+), 9 deletions(-)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -213,6 +213,8 @@ int irq_startup(struct irq_desc *desc, b
irq_enable(desc);
}
irq_state_set_started(desc);
+ /* Set default affinity mask once everything is setup */
+ irq_setup_affinity(desc);
}
if (resend)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1325,6 +1325,12 @@ static int
if (new->flags & IRQF_ONESHOT)
desc->istate |= IRQS_ONESHOT;
+ /* Exclude IRQ from balancing if requested */
+ if (new->flags & IRQF_NOBALANCING) {
+ irq_settings_set_no_balancing(desc);
+ irqd_set(&desc->irq_data, IRQD_NO_BALANCING);
+ }
+
if (irq_settings_can_autoenable(desc)) {
irq_startup(desc, true);
} else {
@@ -1339,15 +1345,6 @@ static int
desc->depth = 1;
}
- /* Exclude IRQ from balancing if requested */
- if (new->flags & IRQF_NOBALANCING) {
- irq_settings_set_no_balancing(desc);
- irqd_set(&desc->irq_data, IRQD_NO_BALANCING);
- }
-
- /* Set default affinity mask once everything is setup */
- irq_setup_affinity(desc);
-
} else if (new->flags & IRQF_TRIGGER_MASK) {
unsigned int nmsk = new->flags & IRQF_TRIGGER_MASK;
unsigned int omsk = irqd_get_trigger_type(&desc->irq_data);
