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: YplOBZOq0837meU2DwnPqj6Lb78452Z25SuQJaPPI+lbY95WNV7d2YBm9KhaD4Ys3SgPRK739o
 izM6gAhbcaQXmYfxgtAjQRVVHmRlWvzFe+2Cm95UT6yCsdtmnXhyJaaJ1YKpDZAGwt/0tzTGqt
 UvHGDKAk9XtFK7yBbOtZsaSiRpOWic1PWdioq6Os3nAxTQ2bN0qnWVwd8acI1Ptln9HoN32ajH
 r8Z3D1m3GafEkU9hfexR7pfnYRIq7GqsFWnkooCTPQk47SVayS5m/7dEkna8XeFgxToFz44mwU
 efk=
From:   Anup Patel <Anup.Patel@wdc.com>
To:     Paul Walmsley <paul.walmsley@sifive.com>,
        Xiang Wang <merle@hardenedlinux.org>
CC:     "palmer@sifive.com" <palmer@sifive.com>,
        "aou@eecs.berkeley.edu" <aou@eecs.berkeley.edu>,
        "linux-riscv@lists.infradead.org" <linux-riscv@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "citypw@hardenedlinux.org" <citypw@hardenedlinux.org>
Subject: RE: [PATCH] arch/riscv: disable too many harts before pick main boot
 hart
Thread-Topic: [PATCH] arch/riscv: disable too many harts before pick main boot
 hart
Thread-Index: AQHVZIA2865roxzFk0Oy+d+JtT78nKcy4D0AgAAH+LA=
Date:   Thu, 19 Sep 2019 10:55:05 +0000
Message-ID: <MN2PR04MB60618CCE4EAE01B58D25CBCC8D890@MN2PR04MB6061.namprd04.prod.outlook.com>
References: <AMJe39pHTcb4gsI-_Dv-wmR8_x9EbCCN9LKI47j34_8vBKRqzFxPrjmZvBtwV5OU_HcOiRkKUG66xVaNQ8VAXw7Ws0CCK74gpA8pKaYN5wM=@hardenedlinux.org>
 <alpine.DEB.2.21.9999.1909190324250.10826@viisi.sifive.com>
In-Reply-To: <alpine.DEB.2.21.9999.1909190324250.10826@viisi.sifive.com>
Accept-Language: en-US
Content-Language: en-US
wdcipoutbound: EOP-TRUE
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 27b41bd2-5434-4597-ac7f-08d73cefd4c6
X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Sep 2019 10:55:05.9685
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: tu3wczXBOCJDjwm9wNJP954907pzOxaahKPh31p184mmNk5n6w5C1EVLmvwJ0mrul+aCGHE2cAEyhaJFQeAwBg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6126
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: linux-kernel-owner@vger.kernel.org <linux-kernel-
> owner@vger.kernel.org> On Behalf Of Paul Walmsley
> Sent: Thursday, September 19, 2019 3:56 PM
> To: Xiang Wang <merle@hardenedlinux.org>
> Cc: palmer@sifive.com; aou@eecs.berkeley.edu; linux-
> riscv@lists.infradead.org; linux-kernel@vger.kernel.org;
> citypw@hardenedlinux.org
> Subject: Re: [PATCH] arch/riscv: disable too many harts before pick main
> boot hart
>=20
> On Fri, 6 Sep 2019, Xiang Wang wrote:
>=20
> > 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>
>=20
> Thanks, here's what I'm planning to queue for v5.4-rc1.  Please let me kn=
ow
> ASAP if you want to change the patch description.
>=20
>=20
> - Paul
>=20
> 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 boo=
t
> hart
>=20
> 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.
>=20
> Signed-off-by: Xiang Wang <merle@hardenedlinux.org>

You missed my Reviewed-by here.

Regards,
Anup

> 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(-)
>=20
> 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
>=20
> +#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:
>=20
>  .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