2014-02-23 21:40:11

by Thomas Gleixner

Subject: [patch 04/26] xtensa: Use irq_set_affinity instead of homebrewn code

There is no point in having an incomplete copy of irq_set_affinity()
for the hotplug irq migration code.

Use the core function instead and while at it switch to
for_each_active_irq()

Signed-off-by: Thomas Gleixner <[email protected]>
Cc: Chris Zankel <[email protected]>
Cc: xtensa <[email protected]>
---
arch/xtensa/kernel/irq.c | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)

Index: tip/arch/xtensa/kernel/irq.c
===================================================================
--- tip.orig/arch/xtensa/kernel/irq.c
+++ tip/arch/xtensa/kernel/irq.c
@@ -155,18 +155,6 @@ void __init init_IRQ(void)
}

#ifdef CONFIG_HOTPLUG_CPU
-static void route_irq(struct irq_data *data, unsigned int irq, unsigned int cpu)
-{
- struct irq_desc *desc = irq_to_desc(irq);
- struct irq_chip *chip = irq_data_get_irq_chip(data);
- unsigned long flags;
-
- raw_spin_lock_irqsave(&desc->lock, flags);
- if (chip->irq_set_affinity)
- chip->irq_set_affinity(data, cpumask_of(cpu), false);
- raw_spin_unlock_irqrestore(&desc->lock, flags);
-}
-
/*
* The CPU has been marked offline. Migrate IRQs off this CPU. If
* the affinity settings do not allow other CPUs, force them onto any
@@ -175,10 +163,9 @@ static void route_irq(struct irq_data *d
void migrate_irqs(void)
{
unsigned int i, cpu = smp_processor_id();
- struct irq_desc *desc;

- for_each_irq_desc(i, desc) {
- struct irq_data *data = irq_desc_get_irq_data(desc);
+ for_each_active_irq(i) {
+ struct irq_data *data = irq_get_irq_data(i);
unsigned int newcpu;

if (irqd_is_per_cpu(data))
@@ -197,8 +184,7 @@ void migrate_irqs(void)
newcpu = cpumask_any_and(data->affinity,
cpu_online_mask);
}
-
- route_irq(data, i, newcpu);
+ irq_set_affinity(i, cpumask_of(newcpu));
}
}
#endif /* CONFIG_HOTPLUG_CPU */

2014-02-24 00:32:06

by Max Filippov

Subject: Re: [patch 04/26] xtensa: Use irq_set_affinity instead of homebrewn code

On Mon, Feb 24, 2014 at 1:40 AM, Thomas Gleixner <[email protected]> wrote:
> There is no point in having an incomplete copy of irq_set_affinity()
> for the hotplug irq migration code.
>
> Use the core function instead and while at it switch to
> for_each_active_irq()
>
> Signed-off-by: Thomas Gleixner <[email protected]>
> Cc: Chris Zankel <[email protected]>
> Cc: xtensa <[email protected]>
> ---
> arch/xtensa/kernel/irq.c | 20 +++-----------------
> 1 file changed, 3 insertions(+), 17 deletions(-)

Acked-by: Max Filippov <[email protected]>

--
Thanks.
-- Max