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

Commit fae176d6 authored by Jiri Slaby's avatar Jiri Slaby Committed by Ingo Molnar
Browse files

x86_32: apic/summit_32, fix cpu_mask_to_apicid 



Perform same-cluster checking even for masks with all (nr_cpu_ids)
bits set and report correct apicid on success instead.

While at it, convert it to for_each_cpu and newer cpumask api.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 0edc0b32

arch/x86/kernel/apic/summit_32.c

+9 −21
Original line number Diff line number Diff line
@@ -291,33 +291,21 @@ static int summit_check_phys_apicid_present(int boot_cpu_physical_apicid) 


static unsigned int summit_cpu_mask_to_apicid(const cpumask_t *cpumask)

{

	int cpus_found = 0;

	int num_bits_set;

	int apicid;

	int cpu;

	unsigned int round = 0;

	int cpu, apicid = 0;



	num_bits_set = cpus_weight(*cpumask);

	if (num_bits_set >= nr_cpu_ids)

		return BAD_APICID;

	/*

	 * The cpus in the mask must all be on the apic cluster.

	 */

	cpu = first_cpu(*cpumask);

	apicid = summit_cpu_to_logical_apicid(cpu);



	while (cpus_found < num_bits_set) {

		if (cpu_isset(cpu, *cpumask)) {

	for_each_cpu(cpu, cpumask) {

		int new_apicid = summit_cpu_to_logical_apicid(cpu);



			if (APIC_CLUSTER(apicid) != APIC_CLUSTER(new_apicid)) {

		if (round && APIC_CLUSTER(apicid) != APIC_CLUSTER(new_apicid)) {

			printk("%s: Not a valid mask!\n", __func__);



			return BAD_APICID;

		}

			apicid = apicid | new_apicid;

			cpus_found++;

		}

		cpu++;

		apicid |= new_apicid;

		round++;

	}

	return apicid;

}