From: Atish Patra <atish.patra@wdc.com>
To: linux-riscv@lists.infradead.org
Cc: "Patrick Stählin" <me@packi.ch>,
"Albert Ou" <aou@eecs.berkeley.edu>,
"Jason Cooper" <jason@lakedaemon.net>,
"Alan Kao" <alankao@andestech.com>,
"Dmitriy Cherkasov" <dmitriy@oss-tech.org>,
"Anup Patel" <anup@brainfault.org>,
"Daniel Lezcano" <daniel.lezcano@linaro.org>,
linux-kernel@vger.kernel.org,
"Michael Clark" <michaeljclark@mac.com>,
"Atish Patra" <atish.patra@wdc.com>,
"Palmer Dabbelt" <palmer@sifive.com>,
"Andreas Schwab" <schwab@suse.de>,
"Marc Zyngier" <marc.zyngier@arm.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Zong Li" <zongbox@gmail.com>
Subject: [PATCH v2 2/8] RISC-V: Move cpuid to hartid mapping to SMP.
Date: Tue, 8 Jan 2019 01:38:32 -0800 [thread overview]
Message-ID: <1546940318-9752-3-git-send-email-atish.patra@wdc.com> (raw)
In-Reply-To: <1546940318-9752-1-git-send-email-atish.patra@wdc.com>
Currently, logical CPU id to physical hartid mapping is
defined for both smp and non-smp configurations. This
is not required as we need this only for smp configuration.
The mapping function can define directly boot_cpu_hartid
for non-smp use case.
The reverse mapping function i.e. hartid to cpuid can be called
for any valid but not booted harts. So it should return default
cpu 0 only if it is a boot hartid.
Signed-off-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
---
arch/riscv/include/asm/smp.h | 15 ++++++++++++---
arch/riscv/kernel/setup.c | 9 ---------
arch/riscv/kernel/smp.c | 9 +++++++++
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/arch/riscv/include/asm/smp.h b/arch/riscv/include/asm/smp.h
index 41aa73b4..8f30300f 100644
--- a/arch/riscv/include/asm/smp.h
+++ b/arch/riscv/include/asm/smp.h
@@ -22,12 +22,13 @@
/*
* Mapping between linux logical cpu index and hartid.
*/
-extern unsigned long __cpuid_to_hartid_map[NR_CPUS];
-#define cpuid_to_hartid_map(cpu) __cpuid_to_hartid_map[cpu]
+extern unsigned long boot_cpu_hartid;
struct seq_file;
#ifdef CONFIG_SMP
+extern unsigned long __cpuid_to_hartid_map[NR_CPUS];
+#define cpuid_to_hartid_map(cpu) __cpuid_to_hartid_map[cpu]
/* print IPI stats */
void show_ipi_stats(struct seq_file *p, int prec);
@@ -58,7 +59,15 @@ static inline void show_ipi_stats(struct seq_file *p, int prec)
static inline int riscv_hartid_to_cpuid(int hartid)
{
- return 0;
+ if (hartid == boot_cpu_hartid)
+ return 0;
+ else
+ return -1;
+}
+static inline unsigned long cpuid_to_hartid_map(int cpu)
+{
+
+ return boot_cpu_hartid;
}
static inline void riscv_cpuid_to_hartid_mask(const struct cpumask *in,
diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
index fc8006a0..f377add4 100644
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@ -61,15 +61,6 @@ EXPORT_SYMBOL(empty_zero_page);
atomic_t hart_lottery;
unsigned long boot_cpu_hartid;
-unsigned long __cpuid_to_hartid_map[NR_CPUS] = {
- [0 ... NR_CPUS-1] = INVALID_HARTID
-};
-
-void __init smp_setup_processor_id(void)
-{
- cpuid_to_hartid_map(0) = boot_cpu_hartid;
-}
-
#ifdef CONFIG_BLK_DEV_INITRD
static void __init setup_initrd(void)
{
diff --git a/arch/riscv/kernel/smp.c b/arch/riscv/kernel/smp.c
index 57b1383e..e407bd4f 100644
--- a/arch/riscv/kernel/smp.c
+++ b/arch/riscv/kernel/smp.c
@@ -34,6 +34,15 @@ enum ipi_message_type {
IPI_MAX
};
+unsigned long __cpuid_to_hartid_map[NR_CPUS] = {
+ [0 ... NR_CPUS-1] = INVALID_HARTID
+};
+
+void __init smp_setup_processor_id(void)
+{
+ cpuid_to_hartid_map(0) = boot_cpu_hartid;
+}
+
/* A collection of single bit ipi messages. */
static struct {
unsigned long stats[IPI_MAX] ____cacheline_aligned;
--
2.7.4
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2019-01-08 9:38 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-08 9:38 [PATCH v2 0/8] Various SMP related fixes Atish Patra
2019-01-08 9:38 ` [PATCH v2 1/8] RISC-V: Do not wait indefinitely in __cpu_up Atish Patra
2019-01-15 13:51 ` Christoph Hellwig
2019-01-18 2:35 ` Atish Patra
2019-01-18 7:20 ` Christoph Hellwig
2019-01-08 9:38 ` Atish Patra [this message]
2019-01-15 13:52 ` [PATCH v2 2/8] RISC-V: Move cpuid to hartid mapping to SMP Christoph Hellwig
2019-01-18 2:08 ` Atish Patra
2019-01-08 9:38 ` [PATCH v2 3/8] RISC-V: Remove NR_CPUs check during hartid search from DT Atish Patra
2019-01-08 11:48 ` Anup Patel
2019-01-15 13:52 ` Christoph Hellwig
2019-01-08 9:38 ` [PATCH v2 4/8] RISC-V: Allow hartid-to-cpuid function to fail Atish Patra
2019-01-08 11:49 ` Anup Patel
2019-01-15 13:53 ` Christoph Hellwig
2019-01-08 9:38 ` [PATCH v2 5/8] RISC-V: Compare cpuid with NR_CPUS before mapping Atish Patra
2019-01-08 11:49 ` Anup Patel
2019-01-15 13:53 ` Christoph Hellwig
2019-01-08 9:38 ` [PATCH v2 6/8] RISC-V: Add required checks during clock source init Atish Patra
2019-01-08 11:56 ` Anup Patel
2019-01-18 2:10 ` Atish Patra
2019-01-15 13:54 ` Christoph Hellwig
2019-01-08 9:38 ` [PATCH v2 7/8] RISC-V: Check and continue in case of an invalid cpuid Atish Patra
2019-01-08 11:59 ` Anup Patel
2019-01-18 2:10 ` Atish Patra
2019-01-15 13:55 ` Christoph Hellwig
2019-01-08 9:38 ` [PATCH v2 8/8] RISC-V: Assign hwcap only according to current cpu Atish Patra
2019-01-08 10:33 ` Atish Patra
2019-01-08 12:01 ` Anup Patel
2019-01-15 13:56 ` Christoph Hellwig
2019-01-18 2:13 ` Atish Patra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1546940318-9752-3-git-send-email-atish.patra@wdc.com \
--to=atish.patra@wdc.com \
--cc=alankao@andestech.com \
--cc=anup@brainfault.org \
--cc=aou@eecs.berkeley.edu \
--cc=daniel.lezcano@linaro.org \
--cc=dmitriy@oss-tech.org \
--cc=jason@lakedaemon.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=marc.zyngier@arm.com \
--cc=me@packi.ch \
--cc=michaeljclark@mac.com \
--cc=palmer@sifive.com \
--cc=schwab@suse.de \
--cc=tglx@linutronix.de \
--cc=zongbox@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).