From: Atish Patra <atish.patra@wdc.com>
To: linux-riscv@lists.infradead.org
Cc: "Rob Herring" <robh@kernel.org>, "Patrick Stählin" <me@packi.ch>,
"Albert Ou" <aou@eecs.berkeley.edu>,
"Damien Le Moal" <Damien.LeMoal@wdc.com>,
"Jason Cooper" <jason@lakedaemon.net>,
"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>,
"Marc Zyngier" <marc.zyngier@arm.com>,
"Thomas Gleixner" <tglx@linutronix.de>
Subject: [PATCH 2/3] RISC-V: Move cpuid to hartid mapping to SMP.
Date: Wed, 26 Dec 2018 15:09:00 -0800 [thread overview]
Message-ID: <1545865741-22795-3-git-send-email-atish.patra@wdc.com> (raw)
In-Reply-To: <1545865741-22795-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 usecase.
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>
---
arch/riscv/include/asm/smp.h | 13 +++++++++++--
arch/riscv/kernel/setup.c | 2 ++
2 files changed, 13 insertions(+), 2 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)
{
+ 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 2c290e6a..bd4d7b85 100644
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@ -83,6 +83,7 @@ EXPORT_SYMBOL(empty_zero_page);
atomic_t hart_lottery;
unsigned long boot_cpu_hartid;
+#ifdef CONFIG_SMP
unsigned long __cpuid_to_hartid_map[NR_CPUS] = {
[0 ... NR_CPUS-1] = INVALID_HARTID
};
@@ -91,6 +92,7 @@ void __init smp_setup_processor_id(void)
{
cpuid_to_hartid_map(0) = boot_cpu_hartid;
}
+#endif
#ifdef CONFIG_BLK_DEV_INITRD
static void __init setup_initrd(void)
--
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:[~2018-12-26 23:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-26 23:08 [PATCH 0/3] Non-smp configuration fix Atish Patra
2018-12-26 23:08 ` [PATCH 1/3] RISC-V: Do not wait indefinitely in __cpu_up Atish Patra
2018-12-27 3:36 ` Anup Patel
2018-12-26 23:09 ` Atish Patra [this message]
2018-12-27 3:37 ` [PATCH 2/3] RISC-V: Move cpuid to hartid mapping to SMP Anup Patel
2019-01-06 2:13 ` Atish Patra
2018-12-26 23:09 ` [PATCH 3/3] RISC-V: Fix non-smp kernel boot on SMP systems Atish Patra
2018-12-27 3:58 ` Anup Patel
2019-01-06 2:14 ` 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=1545865741-22795-3-git-send-email-atish.patra@wdc.com \
--to=atish.patra@wdc.com \
--cc=Damien.LeMoal@wdc.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=robh@kernel.org \
--cc=tglx@linutronix.de \
/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).