From: Song Shuai <suagrfillet@gmail.com>
To: paul.walmsley@sifive.com, palmer@dabbelt.com,
aou@eecs.berkeley.edu, conor.dooley@microchip.com,
ajones@ventanamicro.com, sunilvl@ventanamicro.com,
heiko.stuebner@vrull.eu, apatel@ventanamicro.com,
suagrfillet@gmail.com, evan@rivosinc.com,
greentime.hu@sifive.com, leyfoon.tan@starfivetech.com
Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH] riscv: BUG_ON() for no cpu nodes in setup_smp
Date: Thu, 29 Jun 2023 18:58:39 +0800 [thread overview]
Message-ID: <20230629105839.1160895-1-suagrfillet@gmail.com> (raw)
When booting with ACPI tables, the tiny devictree created by
EFI Stub doesn't provide cpu nodes.
In setup_smp(), of_parse_and_init_cpus() will bug on !found_boot_cpu
if acpi_disabled. That's unclear, so bug for no cpu nodes before
of_parse_and_init_cpus().
Signed-off-by: Song Shuai <suagrfillet@gmail.com>
---
arch/riscv/kernel/smpboot.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c
index 6ca2b5309aab..243a7b533ad7 100644
--- a/arch/riscv/kernel/smpboot.c
+++ b/arch/riscv/kernel/smpboot.c
@@ -187,8 +187,13 @@ static void __init of_parse_and_init_cpus(void)
void __init setup_smp(void)
{
- if (acpi_disabled)
+ if (acpi_disabled) {
+ /* When booting with ACPI tables, the devictree created by EFI Stub
+ * doesn't provide cpu nodes. So BUG here for any acpi_disabled.
+ */
+ BUG_ON(!of_get_next_cpu_node(NULL));
of_parse_and_init_cpus();
+ }
else
acpi_parse_and_init_cpus();
}
--
2.20.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next reply other threads:[~2023-06-29 10:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-29 10:58 Song Shuai [this message]
2023-06-29 12:33 ` [PATCH] riscv: BUG_ON() for no cpu nodes in setup_smp Conor Dooley
2023-06-30 3:02 ` Song Shuai
2023-06-30 6:33 ` Conor Dooley
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=20230629105839.1160895-1-suagrfillet@gmail.com \
--to=suagrfillet@gmail.com \
--cc=ajones@ventanamicro.com \
--cc=aou@eecs.berkeley.edu \
--cc=apatel@ventanamicro.com \
--cc=conor.dooley@microchip.com \
--cc=evan@rivosinc.com \
--cc=greentime.hu@sifive.com \
--cc=heiko.stuebner@vrull.eu \
--cc=leyfoon.tan@starfivetech.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=sunilvl@ventanamicro.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).