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

Commit a7160b7e authored by Sudeep Holla's avatar Sudeep Holla Committed by Jason Cooper
Browse files

ARM: mach-mvebu: remove redundant DT parsing and validation 



arm_dt_init_cpu_maps parses the device tree, validates and sets the
cpu_possible_mask appropriately. It is unnecessary to do another DT
parse to get the number of cpus, use num_possible_cpus instead.

Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarSudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
Acked-by: default avatarGregory Clement <gregory.clement@free-electrons.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent ad81f054

arch/arm/mach-mvebu/platsmp.c

+1 −18
Original line number Diff line number Diff line
@@ -88,28 +88,11 @@ static int __cpuinit armada_xp_boot_secondary(unsigned int cpu, 


static void __init armada_xp_smp_init_cpus(void)

{

	struct device_node *np;

	unsigned int i, ncores;

	unsigned int ncores = num_possible_cpus();



	np = of_find_node_by_name(NULL, "cpus");

	if (!np)

		panic("No 'cpus' node found\n");



	ncores = of_get_child_count(np);

	if (ncores == 0 || ncores > ARMADA_XP_MAX_CPUS)

		panic("Invalid number of CPUs in DT\n");



	/* Limit possible CPUs to defconfig */

	if (ncores > nr_cpu_ids) {

		pr_warn("SMP: %d CPUs physically present. Only %d configured.",

			ncores, nr_cpu_ids);

		pr_warn("Clipping CPU count to %d\n", nr_cpu_ids);

		ncores = nr_cpu_ids;

	}



	for (i = 0; i < ncores; i++)

		set_cpu_possible(i, true);



	set_smp_cross_call(armada_mpic_send_doorbell);

}