Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
IronPort-SDR: 6eV2AdQyyG8IRLTDJu1a2ddT1JPStKWShreC/vcKfMIq2911P5MVocfIwN3DNkKu0wKwp+S1wq
 fz7CqkMEkRyvVb+pOrtv69UTapC0mQji9mEhmYnlziQhua7Qgpu25q8F08el0vEaiP6IO4jjhJ
 oFsEprI/M+wGZ0GwQ7o2GmIlx+9YzZgjXPXisuGOGyjvnxQuAo+Iz88DxXNyqhYw3D7szmOUSL
 Ck7b3N4OAQPrwXHJLZ9sVR23YMxb+ZUhNTBBUdHhlW1N2R5Fcb611HkoELUvqubYnfJAwSW4G2
 ISHFDkxlwp7M57W3p2ebnXqh
IronPort-SDR: qSCZ+MB5u8VxvgmD1nPVzJjNR4LtGOvm1wKeEZBnQoylDPQFPADfO/14h5TDqLzxuODWbUL403
 eFYFoZz1x1jMC8i7etI5f0X6+rkbZ5nHV01E/SEWlpM7R881ZFPiAKCH+Icn8KS3+yTlH6gPM4
 i6Z2B6IrtwM22k/f82ZsNDhU98LAoAfJmLU9TdLCdRroZCAQk4MqUWhDF3A4GdYS8DvtdC0J0Q
 68GTD5DS2u6r9iLhGWADLJCPB8tiTHmaKY/CfFxxZGl9e6ZH8qMJqYghtWAqKdvkuSxaGGaryR
 jVY=
From:   Atish Patra <atish.patra@wdc.com>
To:     linux-kernel@vger.kernel.org
Cc:     Atish Patra <atish.patra@wdc.com>,
        Albert Ou <aou@eecs.berkeley.edu>,
        Andreas Schwab <schwab@suse.de>,
        Anup Patel <anup@brainfault.org>,
        Dmitriy Cherkasov <dmitriy@oss-tech.org>,
        Johan Hovold <johan@kernel.org>,
        linux-riscv@lists.infradead.org,
        Palmer Dabbelt <palmer@sifive.com>,
        Paul Walmsley <paul.walmsley@sifive.com>
Subject: [PATCH v2 3/4] RISC-V: Implement nosmp commandline option.
Date:   Wed, 10 Apr 2019 16:04:42 -0700
Message-Id: <20190410230443.15729-4-atish.patra@wdc.com>
In-Reply-To: <20190410230443.15729-1-atish.patra@wdc.com>
References: <20190410230443.15729-1-atish.patra@wdc.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

nosmp command line option sets max_cpus to zero. No secondary harts
will boot if this is enabled. But present cpu mask will still point to
all possible masks.

Fix present cpu mask for nosmp usecase.

Signed-off-by: Atish Patra <atish.patra@wdc.com>
---
 arch/riscv/kernel/smpboot.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c
index eb533b5c2c8c..a8ad200581aa 100644
--- a/arch/riscv/kernel/smpboot.c
+++ b/arch/riscv/kernel/smpboot.c
@@ -47,6 +47,17 @@ void __init smp_prepare_boot_cpu(void)
 
 void __init smp_prepare_cpus(unsigned int max_cpus)
 {
+	int cpuid;
+
+	/* This covers non-smp usecase mandated by "nosmp" option */
+	if (max_cpus == 0)
+		return;
+
+	for_each_possible_cpu(cpuid) {
+		if (cpuid == smp_processor_id())
+			continue;
+		set_cpu_present(cpuid, true);
+	}
 }
 
 void __init setup_smp(void)
@@ -74,7 +85,6 @@ void __init setup_smp(void)
 
 		cpuid_to_hartid_map(cpuid) = hart;
 		set_cpu_possible(cpuid, true);
-		set_cpu_present(cpuid, true);
 		cpuid++;
 	}
 
-- 
2.21.0