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: 2qZtbfEo+heDcowHj5aAVFUPY28iz4NoCOB5tveK4QCUTwm+66gcA2QNkTIzHuC9uNesNb0YSE
 /jfH/VGvRTpAf1gSQlgaNybDtEncsHFbW9S1jnYeU/vA5yKc8ctODzDlefXiqqe1Ji9FtA9Yy2
 z69SNx9zgZnaP7l9uJsiCSZBPcqEPEyI62W2FAWMfCGIZf+tG/NqpnFwAJT2ZbIW1Rv2Rv+6zk
 Mh/dF3L4QVc3CbnEviJBfvZhb/8mBgEX+G/SXhpxuwKh6nbjciceUVFxJjz788kiE9Ori8ZsPA
 fXgJ2fS02Wy6kLjiudTH2YQ5
IronPort-SDR: 1YarVtGkK4lQ7rq37ypwtAajEaQ363xFfuvu4paXwIQHsqZg8cDFm7MI28OzpMvaLF89rTThKU
 4u/I//deqUBS29OkAuke6diSTtNn9/FNOfEY7lGrtUwVW82L0Yr2iY/JAFWPGLGMvbrI8De3X2
 MC9SMOSCDpBRKmphMsSRFOakcI/QcQo7YLPf/EFdbF7jAoGIjMvIdVubAoWigeODdjFc/VZR1J
 bfLbK8WWyccJVyLTiAVVJeI3Hc1Z2apQiTT7vnA+KkzlUypEhOPb8GfSCaaP8HVuheejwPhzXo
 pLU=
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 3/4] RISC-V: Support nr_cpus command line option.
Date:   Wed, 24 Apr 2019 14:48:00 -0700
Message-Id: <20190424214801.18880-4-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

If nr_cpus command line option is set, maximum possible cpu should be
set to that value.

Signed-off-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
 arch/riscv/kernel/smpboot.  |  0
 arch/riscv/kernel/smpboot.c | 10 +++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 arch/riscv/kernel/smpboot.

diff --git a/arch/riscv/kernel/smpboot. b/arch/riscv/kernel/smpboot.
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c
index a8ad200581aa..7a0b62252524 100644
--- a/arch/riscv/kernel/smpboot.c
+++ b/arch/riscv/kernel/smpboot.c
@@ -84,11 +84,19 @@ void __init setup_smp(void)
 		}
 
 		cpuid_to_hartid_map(cpuid) = hart;
-		set_cpu_possible(cpuid, true);
 		cpuid++;
 	}
 
 	BUG_ON(!found_boot_cpu);
+
+	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)
+			set_cpu_possible(cpuid, true);
+	}
 }
 
 int __cpu_up(unsigned int cpu, struct task_struct *tidle)
-- 
2.21.0