Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 267840f3 authored by Will Deacon's avatar Will Deacon Committed by Russell King
Browse files

ARM: 7061/1: gic: convert logical CPU numbers into physical numbers 



The GIC driver must convert logical CPU numbers passed in from Linux
into physical CPU numbers that are understood by the hardware.

This patch uses the new cpu_logical_map macro for performing the
conversion inside the GIC driver.

Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d6257288

arch/arm/common/gic.c

+14 −3
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, 
		return -EINVAL;



	mask = 0xff << shift;

	bit = 1 << (cpu + shift);

	bit = 1 << (cpu_logical_map(cpu) + shift);



	spin_lock(&irq_controller_lock);

	val = readl_relaxed(reg) & ~mask;
@@ -259,9 +259,15 @@ static void __init gic_dist_init(struct gic_chip_data *gic, 
	unsigned int irq_start)

{

	unsigned int gic_irqs, irq_limit, i;

	u32 cpumask;

	void __iomem *base = gic->dist_base;

	u32 cpumask = 1 << smp_processor_id();

	u32 cpu = 0;



#ifdef CONFIG_SMP

	cpu = cpu_logical_map(smp_processor_id());

#endif



	cpumask = 1 << cpu;

	cpumask |= cpumask << 8;

	cpumask |= cpumask << 16;
@@ -382,7 +388,12 @@ void __cpuinit gic_enable_ppi(unsigned int irq) 
#ifdef CONFIG_SMP

void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)

{

	unsigned long map = *cpus_addr(*mask);

	int cpu;

	unsigned long map = 0;



	/* Convert our logical CPU mask into a physical one. */

	for_each_cpu(cpu, mask)

		map |= 1 << cpu_logical_map(cpu);



	/*

	 * Ensure that stores to Normal memory are visible to the