linux-riscv.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Xiang Wang <merle@hardenedlinux.org>
To: Paul Walmsley <paul.walmsley@sifive.com>
Cc: "linux-riscv@lists.infradead.org"
	<linux-riscv@lists.infradead.org>,
	"palmer@sifive.com" <palmer@sifive.com>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"aou@eecs.berkeley.edu" <aou@eecs.berkeley.edu>,
	"citypw@hardenedlinux.org" <citypw@hardenedlinux.org>
Subject: Re: [PATCH] arch/riscv: disable too many harts before pick main boot hart
Date: Thu, 19 Sep 2019 10:30:15 +0000	[thread overview]
Message-ID: <oZnw_aigjzhp0LNTjqSVEPWA6nBsFhV4z0KJXsCw9oPg3pGRju1n3kzDin_GH06vl8Jn5MU5keS2LE1FLrPfR3V66b9hkoqKQJ7CZ_tMqUk=@hardenedlinux.org> (raw)
In-Reply-To: <alpine.DEB.2.21.9999.1909190324250.10826@viisi.sifive.com>






‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On 2019年9月19日ThursdayPM6点25分, Paul Walmsley <paul.walmsley@sifive.com> wrote:

> On Fri, 6 Sep 2019, Xiang Wang wrote:
>
> > From 12300865d1103618c9d4c375f7d7fbe601b6618c Mon Sep 17 00:00:00 2001
> > From: Xiang Wang merle@hardenedlinux.org
> > Date: Fri, 6 Sep 2019 11:56:09 +0800
> > Subject: [PATCH] arch/riscv: disable too many harts before pick main boot hart
> > These harts with id greater than or equal to CONFIG_NR_CPUS need to be disabled.
> > But pick the main Hart can choose any one. So, before pick the main hart, you
> > need to disable the hart with id greater than or equal to CONFIG_NR_CPUS.
> > Signed-off-by: Xiang Wang merle@hardenedlinux.org
>
> Thanks, here's what I'm planning to queue for v5.4-rc1. Please let me
> know ASAP if you want to change the patch description.
>
> -   Paul

Not need to change

>
>     From: Xiang Wang merle@hardenedlinux.org
>
>
> Date: Fri, 6 Sep 2019 11:56:09 +0800
> Subject: [PATCH] arch/riscv: disable excess harts before picking main boot hart
>
> Harts with id greater than or equal to CONFIG_NR_CPUS need to be
> disabled. But the kernel can pick any hart as the main hart. So,
> before picking the main hart, the kernel must disable harts with ids
> greater than or equal to CONFIG_NR_CPUS.
>
> Signed-off-by: Xiang Wang merle@hardenedlinux.org
> Reviewed-by: Palmer Dabbelt palmer@sifive.com
> [paul.walmsley@sifive.com: updated to apply; cleaned up patch
> description]
> Signed-off-by: Paul Walmsley paul.walmsley@sifive.com
>
> arch/riscv/kernel/head.S | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S
> index 15a9189f91ad..72f89b7590dd 100644
> --- a/arch/riscv/kernel/head.S
> +++ b/arch/riscv/kernel/head.S
> @@ -63,6 +63,11 @@ _start_kernel:
> li t0, SR_FS
> csrc CSR_SSTATUS, t0
>
> +#ifdef CONFIG_SMP
>
> -   li t0, CONFIG_NR_CPUS
> -   bgeu a0, t0, .Lsecondary_park
>     +#endif
>
> -   /* Pick one hart to run the main boot sequence */
>     la a3, hart_lottery
>     li a2, 1
>     @@ -154,9 +159,6 @@ relocate:
>
>     .Lsecondary_start:
>     #ifdef CONFIG_SMP
>
>
> -   li a1, CONFIG_NR_CPUS
> -   bgeu a0, a1, .Lsecondary_park
> -   /* Set trap vector to spin forever to help debug */
>     la a3, .Lsecondary_park
>     csrw CSR_STVEC, a3
>     --
>     2.23.0
>



_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

  reply	other threads:[~2019-09-19 10:30 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-06  6:56 [PATCH] arch/riscv: disable too many harts before pick main boot hart Xiang Wang
2019-09-10  9:56 ` Anup Patel
2019-09-19 10:25 ` Paul Walmsley
2019-09-19 10:30   ` Xiang Wang [this message]
2019-09-19 10:55   ` Anup Patel
2019-09-19 11:04     ` Paul Walmsley

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='oZnw_aigjzhp0LNTjqSVEPWA6nBsFhV4z0KJXsCw9oPg3pGRju1n3kzDin_GH06vl8Jn5MU5keS2LE1FLrPfR3V66b9hkoqKQJ7CZ_tMqUk=@hardenedlinux.org' \
    --to=merle@hardenedlinux.org \
    --cc=aou@eecs.berkeley.edu \
    --cc=citypw@hardenedlinux.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=palmer@sifive.com \
    --cc=paul.walmsley@sifive.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).