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

Commit 50ee91bd authored by Kefeng Wang's avatar Kefeng Wang Committed by Will Deacon
Browse files

arm64: Support hard limit of cpu count by nr_cpus 



Enable the hard limit of cpu count by set boot options nr_cpus=x
on arm64, and make a minor change about message when total number
of cpu exceeds the limit.

Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Reported-by: default avatarShiyuan Hu <hushiyuan@huawei.com>
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 29b4817d

arch/arm64/kernel/smp.c

+4 −4
Original line number Diff line number Diff line
@@ -661,9 +661,9 @@ void __init smp_init_cpus(void) 
		acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_INTERRUPT,

				      acpi_parse_gic_cpu_interface, 0);



	if (cpu_count > NR_CPUS)

		pr_warn("no. of cores (%d) greater than configured maximum of %d - clipping\n",

			cpu_count, NR_CPUS);

	if (cpu_count > nr_cpu_ids)

		pr_warn("Number of cores (%d) exceeds configured maximum of %d - clipping\n",

			cpu_count, nr_cpu_ids);



	if (!bootcpu_valid) {

		pr_err("missing boot CPU MPIDR, not enabling secondaries\n");
@@ -677,7 +677,7 @@ void __init smp_init_cpus(void) 
	 * with entries in cpu_logical_map while initializing the cpus.

	 * If the cpu set-up fails, invalidate the cpu_logical_map entry.

	 */

	for (i = 1; i < NR_CPUS; i++) {

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

		if (cpu_logical_map(i) != INVALID_HWID) {

			if (smp_cpu_setup(i))

				cpu_logical_map(i) = INVALID_HWID;