[PATCH 3.10 005/103] irqchip: Gic: Support forced affinity setting
From: gregkh@linuxfoundation.org (Greg Kroah-Hartman)
Date: 2014-06-04 23:24:28
3.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Gleixner <redacted> 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 <redacted> Tested-by: Krzysztof Kozlowski <redacted> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Bartlomiej Zolnierkiewicz <redacted> Cc: Tomasz Figa <redacted>, Cc: Daniel Lezcano <redacted>, Cc: Kukjin Kim <redacted> Cc: linux-arm-kernel at lists.infradead.org, Link: http://lkml.kernel.org/r/20140416143315.916984416 at linutronix.de Signed-off-by: Thomas Gleixner <redacted> 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;