Unverified Commit a4166aec authored by Samuel Holland's avatar Samuel Holland Committed by Palmer Dabbelt
Browse files

riscv: Deduplicate code in setup_smp() 



Both the ACPI and DT implementations contain some of the same code.
Move it to the calling function so it is not duplicated.

Signed-off-by: default avatarSamuel Holland <samuel.holland@sifive.com>
Reviewed-by: default avatarConor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20231121234736.3489608-2-samuel.holland@sifive.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent b85ea95d

arch/riscv/kernel/smpboot.c

+11 −20
Original line number Diff line number Diff line
@@ -125,18 +125,7 @@ static int __init acpi_parse_rintc(union acpi_subtable_headers *header, const un 


static void __init acpi_parse_and_init_cpus(void)

{

	int cpuid;



	cpu_set_ops(0);



	acpi_table_parse_madt(ACPI_MADT_TYPE_RINTC, acpi_parse_rintc, 0);



	for (cpuid = 1; cpuid < nr_cpu_ids; cpuid++) {

		if (cpuid_to_hartid_map(cpuid) != INVALID_HARTID) {

			cpu_set_ops(cpuid);

			set_cpu_possible(cpuid, true);

		}

	}

}

#else

#define acpi_parse_and_init_cpus(...)	do { } while (0)
@@ -150,8 +139,6 @@ static void __init of_parse_and_init_cpus(void) 
	int cpuid = 1;

	int rc;



	cpu_set_ops(0);



	for_each_of_cpu_node(dn) {

		rc = riscv_early_of_processor_hartid(dn, &hart);

		if (rc < 0)
@@ -179,21 +166,25 @@ static void __init of_parse_and_init_cpus(void) 
	if (cpuid > nr_cpu_ids)

		pr_warn("Total number of cpus [%d] is greater than nr_cpus option value [%d]\n",

			cpuid, nr_cpu_ids);



	for (cpuid = 1; cpuid < nr_cpu_ids; cpuid++) {

		if (cpuid_to_hartid_map(cpuid) != INVALID_HARTID) {

			cpu_set_ops(cpuid);

			set_cpu_possible(cpuid, true);

		}

	}

}



void __init setup_smp(void)

{

	int cpuid;



	cpu_set_ops(0);



	if (acpi_disabled)

		of_parse_and_init_cpus();

	else

		acpi_parse_and_init_cpus();



	for (cpuid = 1; cpuid < nr_cpu_ids; cpuid++) {

		if (cpuid_to_hartid_map(cpuid) != INVALID_HARTID) {

			cpu_set_ops(cpuid);

			set_cpu_possible(cpuid, true);

		}

	}

}



static int start_secondary_cpu(int cpu, struct task_struct *tidle)