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

Commit c08ec7da authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Will Deacon
Browse files

irqchip: gic-v3: Use of_cpu_node_to_id helper 



Use the new generic helper of_cpu_node_to_id() instead
of using our own version to map a device node to logical CPU
number.

Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 29198e38

drivers/irqchip/irq-gic-v3.c

+2 −27
Original line number Diff line number Diff line
@@ -1070,31 +1070,6 @@ static int __init gic_validate_dist_version(void __iomem *dist_base) 
	return 0;

}



static int get_cpu_number(struct device_node *dn)

{

	const __be32 *cell;

	u64 hwid;

	int cpu;



	cell = of_get_property(dn, "reg", NULL);

	if (!cell)

		return -1;



	hwid = of_read_number(cell, of_n_addr_cells(dn));



	/*

	 * Non affinity bits must be set to 0 in the DT

	 */

	if (hwid & ~MPIDR_HWID_BITMASK)

		return -1;



	for_each_possible_cpu(cpu)

		if (cpu_logical_map(cpu) == hwid)

			return cpu;



	return -1;

}



/* Create all possible partitions at boot time */

static void __init gic_populate_ppi_partitions(struct device_node *gic_node)

{
@@ -1145,8 +1120,8 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node) 
			if (WARN_ON(!cpu_node))

				continue;



			cpu = get_cpu_number(cpu_node);

			if (WARN_ON(cpu == -1))

			cpu = of_cpu_node_to_id(cpu_node);

			if (WARN_ON(cpu < 0))

				continue;



			pr_cont("%pOF[%d] ", cpu_node, cpu);