| From ffde1de64012c406dfdda8690918248b472f24e4 Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Wed, 16 Apr 2014 14:36:44 +0000 |
| Subject: irqchip: Gic: Support forced affinity setting |
| |
| From: Thomas Gleixner <tglx@linutronix.de> |
| |
| commit ffde1de64012c406dfdda8690918248b472f24e4 upstream. |
| |
| To support the affinity setting of per cpu timers in the early startup |
| of a not yet online cpu, implement the force logic, which disables the |
| cpu online check. |
| |
| Tagged for stable to allow a simple fix of the affected SoC clock |
| event drivers. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Tested-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> |
| Cc: Kyungmin Park <kyungmin.park@samsung.com> |
| Cc: Marek Szyprowski <m.szyprowski@samsung.com> |
| Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> |
| Cc: Tomasz Figa <t.figa@samsung.com>, |
| Cc: Daniel Lezcano <daniel.lezcano@linaro.org>, |
| Cc: Kukjin Kim <kgene.kim@samsung.com> |
| Cc: linux-arm-kernel@lists.infradead.org, |
| Link: http://lkml.kernel.org/r/20140416143315.916984416@linutronix.de |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/irqchip/irq-gic.c | 8 ++++++-- |
| 1 file changed, 6 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/irqchip/irq-gic.c |
| +++ b/drivers/irqchip/irq-gic.c |
| @@ -246,10 +246,14 @@ static int gic_set_affinity(struct irq_d |
| bool force) |
| { |
| void __iomem *reg = gic_dist_base(d) + GIC_DIST_TARGET + (gic_irq(d) & ~3); |
| - unsigned int shift = (gic_irq(d) % 4) * 8; |
| - unsigned int cpu = cpumask_any_and(mask_val, cpu_online_mask); |
| + unsigned int cpu, shift = (gic_irq(d) % 4) * 8; |
| u32 val, mask, bit; |
| |
| + if (!force) |
| + cpu = cpumask_any_and(mask_val, cpu_online_mask); |
| + else |
| + cpu = cpumask_first(mask_val); |
| + |
| if (cpu >= NR_GIC_CPU_IF || cpu >= nr_cpu_ids) |
| return -EINVAL; |
| |