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: 7jX78I1sE7zi9L3H5svR0ptkTqV0byMdJ4PM3h3nqOB9KPA+CG3XFXwaYGnyCfg4ExKW3Asc4j
 giLlh6DgkX+2PiI6+Tr91Hs6uuTlxXUMdZn+2ePW3i+NzCh3cOf84xFyYDIUe/5QVpxa2B3XAG
 dk6fSSRNIyejd4rwSen0abo1vjPzb0Lc+awLdSnHmVNdRODZ8kpAS08c8uMlGf/Cpm6YgW3j9q
 zpxgPAFc8ITMi/jemOG6rL+zr93Il3KJn0VpItH6feWn7uVrufIc9kvPhnhe/wCS1AGbLb/BuP
 w3L+/QOo6+VbswW9TAhX/Tmy
IronPort-SDR: jlBo3KgjjCtfbZ0C2//CHKveriNkLa5ePBIwBiiz2JWS4EEMAwAa6wBKMMCcn5W3PQiQnO0oug
 qmSDOSi3AE1owkEmlOwzrBqH9elQKwPCqBhB3pjdxc8htom8fSSvoo3fNHZyzZ1GirqPmjBSul
 QeFlIQ2sZFSSbZ71SvqCn/m64Z4C39umiG7jv4VwJNWv4mhk3K+I8rBp7cf2eTnkhMuGiJHt07
 dsiJNgj+HO2VeYO677yy/xVmHT/gmMZFsZ6Q25AmJ3uRbeA4BFKaYBuNH8ryQxBtX7dwVToil2
 4WQ=
From:   Atish Patra <atish.patra@wdc.com>
To:     linux-kernel@vger.kernel.org
Cc:     Atish Patra <atish.patra@wdc.com>, Christoph Hellwig <hch@lst.de>,
        Albert Ou <aou@eecs.berkeley.edu>,
        Andreas Schwab <schwab@suse.de>,
        Anup Patel <anup@brainfault.org>,
        Johan Hovold <johan@kernel.org>,
        linux-riscv@lists.infradead.org,
        Palmer Dabbelt <palmer@sifive.com>,
        Paul Walmsley <paul.walmsley@sifive.com>,
        Sudeep Holla <sudeep.holla@arm.com>,
        Damien Le Moal <Damien.LeMoal@wdc.com>
Subject: [PATCH 2/4] RISC-V: Implement nosmp commandline option.
Date:   Wed, 24 Apr 2019 14:47:59 -0700
Message-Id: <20190424214801.18880-3-atish.patra@wdc.com>
In-Reply-To: <20190424214801.18880-1-atish.patra@wdc.com>
References: <20190424214801.18880-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>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
 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