From: Palmer Dabbelt <palmer@dabbelt.com> To: heiko@sntech.de Cc: Paul Walmsley <paul.walmsley@sifive.com>, aou@eecs.berkeley.edu, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, wefu@redhat.com, liush@allwinnertech.com, guoren@kernel.org, atishp@atishpatra.org, anup@brainfault.org, drew@beagleboard.org, Christoph Hellwig <hch@lst.de>, Arnd Bergmann <arnd@arndb.de>, wens@csie.org, maxime@cerno.tech, gfavor@ventanamicro.com, andrea.mondelli@huawei.com, behrensj@mit.edu, xinhaoqu@huawei.com, huffman@cadence.com, mick@ics.forth.gr, allen.baum@esperantotech.com, jscheid@ventanamicro.com, rtrauben@gmail.com, samuel@sholland.org, cmuellner@linux.com, philipp.tomsich@vrull.eu, heiko@sntech.de Subject: Re: [PATCH v6 08/14] riscv: move boot alternatives to a slightly earlier position Date: Mon, 07 Mar 2022 16:47:23 -0800 (PST) [thread overview] Message-ID: <mhng-3d591628-2c87-40c7-91e4-407ad313a4aa@palmer-ri-x1c9> (raw) In-Reply-To: <20220209123800.269774-9-heiko@sntech.de> On Wed, 09 Feb 2022 04:37:54 PST (-0800), heiko@sntech.de wrote: > Move the application of boot alternatives to soc_early_init(). > This allows to catch more generic cases of code needing patches > than doing it in smp_prepare_boot_cpu() and also makes it actually > work if CONFIG_SMP is disabled for whatever reason. > > The position is chosen mainly as it is before the actual soc early > init runs but also already allows accessing the devicetree > via fdt_* functions. I think this is OK, but it warrants testing on the K210 -- specifically the system is in an odd state before soc_early_init (IIRC some of memory doesn't work right) so I'm always a bit worried about calling stuff there. I don't have a K210 (or at least a working one), so I'm not going to be able to test it. > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > arch/riscv/kernel/head.S | 2 ++ > arch/riscv/kernel/smpboot.c | 2 -- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S > index 2363b43312fc..0e1bb97f9749 100644 > --- a/arch/riscv/kernel/head.S > +++ b/arch/riscv/kernel/head.S > @@ -10,6 +10,7 @@ > #include <asm/thread_info.h> > #include <asm/page.h> > #include <asm/pgtable.h> > +#include <asm/alternative.h> > #include <asm/csr.h> > #include <asm/cpu_ops_sbi.h> > #include <asm/hwcap.h> > @@ -341,6 +342,7 @@ clear_bss_done: > call kasan_early_init > #endif > /* Start the kernel */ > + call apply_boot_alternatives > call soc_early_init > tail start_kernel > > diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c > index a6d13dca1403..f1e4948a4b52 100644 > --- a/arch/riscv/kernel/smpboot.c > +++ b/arch/riscv/kernel/smpboot.c > @@ -32,7 +32,6 @@ > #include <asm/sections.h> > #include <asm/sbi.h> > #include <asm/smp.h> > -#include <asm/alternative.h> > > #include "head.h" > > @@ -41,7 +40,6 @@ static DECLARE_COMPLETION(cpu_running); > void __init smp_prepare_boot_cpu(void) > { > init_cpu_topology(); > - apply_boot_alternatives(); > } > > void __init smp_prepare_cpus(unsigned int max_cpus)
WARNING: multiple messages have this Message-ID (diff)
From: Palmer Dabbelt <palmer@dabbelt.com> To: heiko@sntech.de Cc: Paul Walmsley <paul.walmsley@sifive.com>, aou@eecs.berkeley.edu, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, wefu@redhat.com, liush@allwinnertech.com, guoren@kernel.org, atishp@atishpatra.org, anup@brainfault.org, drew@beagleboard.org, Christoph Hellwig <hch@lst.de>, Arnd Bergmann <arnd@arndb.de>, wens@csie.org, maxime@cerno.tech, gfavor@ventanamicro.com, andrea.mondelli@huawei.com, behrensj@mit.edu, xinhaoqu@huawei.com, huffman@cadence.com, mick@ics.forth.gr, allen.baum@esperantotech.com, jscheid@ventanamicro.com, rtrauben@gmail.com, samuel@sholland.org, cmuellner@linux.com, philipp.tomsich@vrull.eu, heiko@sntech.de Subject: Re: [PATCH v6 08/14] riscv: move boot alternatives to a slightly earlier position Date: Mon, 07 Mar 2022 16:47:23 -0800 (PST) [thread overview] Message-ID: <mhng-3d591628-2c87-40c7-91e4-407ad313a4aa@palmer-ri-x1c9> (raw) In-Reply-To: <20220209123800.269774-9-heiko@sntech.de> On Wed, 09 Feb 2022 04:37:54 PST (-0800), heiko@sntech.de wrote: > Move the application of boot alternatives to soc_early_init(). > This allows to catch more generic cases of code needing patches > than doing it in smp_prepare_boot_cpu() and also makes it actually > work if CONFIG_SMP is disabled for whatever reason. > > The position is chosen mainly as it is before the actual soc early > init runs but also already allows accessing the devicetree > via fdt_* functions. I think this is OK, but it warrants testing on the K210 -- specifically the system is in an odd state before soc_early_init (IIRC some of memory doesn't work right) so I'm always a bit worried about calling stuff there. I don't have a K210 (or at least a working one), so I'm not going to be able to test it. > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > arch/riscv/kernel/head.S | 2 ++ > arch/riscv/kernel/smpboot.c | 2 -- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S > index 2363b43312fc..0e1bb97f9749 100644 > --- a/arch/riscv/kernel/head.S > +++ b/arch/riscv/kernel/head.S > @@ -10,6 +10,7 @@ > #include <asm/thread_info.h> > #include <asm/page.h> > #include <asm/pgtable.h> > +#include <asm/alternative.h> > #include <asm/csr.h> > #include <asm/cpu_ops_sbi.h> > #include <asm/hwcap.h> > @@ -341,6 +342,7 @@ clear_bss_done: > call kasan_early_init > #endif > /* Start the kernel */ > + call apply_boot_alternatives > call soc_early_init > tail start_kernel > > diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c > index a6d13dca1403..f1e4948a4b52 100644 > --- a/arch/riscv/kernel/smpboot.c > +++ b/arch/riscv/kernel/smpboot.c > @@ -32,7 +32,6 @@ > #include <asm/sections.h> > #include <asm/sbi.h> > #include <asm/smp.h> > -#include <asm/alternative.h> > > #include "head.h" > > @@ -41,7 +40,6 @@ static DECLARE_COMPLETION(cpu_running); > void __init smp_prepare_boot_cpu(void) > { > init_cpu_topology(); > - apply_boot_alternatives(); > } > > void __init smp_prepare_cpus(unsigned int max_cpus) _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2022-03-08 0:47 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-09 12:37 [PATCH v6 00/14] riscv: support for Svpbmt and D1 memory types Heiko Stuebner 2022-02-09 12:37 ` Heiko Stuebner 2022-02-09 12:37 ` [PATCH v6 01/14] riscv: prevent null-pointer dereference with sbi_remote_fence_i Heiko Stuebner 2022-02-09 12:37 ` Heiko Stuebner 2022-02-11 1:59 ` Atish Patra 2022-02-11 1:59 ` Atish Patra 2022-02-09 12:37 ` [PATCH v6 02/14] riscv: integrate alternatives better into the main architecture Heiko Stuebner 2022-02-09 12:37 ` Heiko Stuebner 2022-02-09 12:37 ` [PATCH v6 03/14] riscv: allow different stages with alternatives Heiko Stuebner 2022-02-09 12:37 ` Heiko Stuebner 2022-02-09 12:37 ` [PATCH v6 04/14] riscv: implement module alternatives Heiko Stuebner 2022-02-09 12:37 ` Heiko Stuebner 2022-02-09 12:37 ` [PATCH v6 05/14] riscv: implement ALTERNATIVE_2 macro Heiko Stuebner 2022-02-09 12:37 ` Heiko Stuebner 2022-02-09 12:37 ` [PATCH v6 06/14] riscv: extend concatenated alternatives-lines to the same length Heiko Stuebner 2022-02-09 12:37 ` Heiko Stuebner 2022-02-09 12:37 ` [PATCH v6 07/14] riscv: prevent compressed instructions in alternatives Heiko Stuebner 2022-02-09 12:37 ` Heiko Stuebner 2022-03-08 0:47 ` Palmer Dabbelt 2022-03-08 0:47 ` Palmer Dabbelt 2022-02-09 12:37 ` [PATCH v6 08/14] riscv: move boot alternatives to a slightly earlier position Heiko Stuebner 2022-02-09 12:37 ` Heiko Stuebner 2022-02-10 22:42 ` Atish Patra 2022-02-10 22:42 ` Atish Patra 2022-02-11 1:11 ` Heiko Stübner 2022-02-11 1:11 ` Heiko Stübner 2022-02-11 1:57 ` Atish Patra 2022-02-11 1:57 ` Atish Patra 2022-02-11 9:34 ` Heiko Stübner 2022-02-11 9:34 ` Heiko Stübner 2022-03-08 0:47 ` Palmer Dabbelt [this message] 2022-03-08 0:47 ` Palmer Dabbelt 2022-03-23 16:51 ` Heiko Stübner 2022-03-23 16:51 ` Heiko Stübner 2022-02-09 12:37 ` [PATCH v6 09/14] riscv: Fix accessing pfn bits in PTEs for non-32bit variants Heiko Stuebner 2022-02-09 12:37 ` Heiko Stuebner 2022-02-09 12:37 ` [PATCH v6 10/14] riscv: add cpufeature handling via alternatives Heiko Stuebner 2022-02-09 12:37 ` Heiko Stuebner 2022-02-09 12:37 ` [PATCH v6 11/14] dt-bindings: riscv: add MMU Standard Extensions support for Svpbmt Heiko Stuebner 2022-02-09 12:37 ` Heiko Stuebner 2022-02-09 18:47 ` Rob Herring 2022-02-09 18:47 ` Rob Herring 2022-02-09 12:37 ` [PATCH v6 12/14] riscv: add RISC-V Svpbmt extension support Heiko Stuebner 2022-02-09 12:37 ` Heiko Stuebner 2022-02-09 12:37 ` [PATCH v6 13/14] riscv: remove FIXMAP_PAGE_IO and fall back to its default value Heiko Stuebner 2022-02-09 12:37 ` Heiko Stuebner 2022-02-09 12:38 ` [PATCH v6 14/14] riscv: add memory-type errata for T-Head Heiko Stuebner 2022-02-09 12:38 ` Heiko Stuebner 2022-02-11 0:12 ` Atish Patra 2022-02-11 0:12 ` Atish Patra 2022-02-11 9:25 ` Heiko Stübner 2022-02-11 9:25 ` Heiko Stübner 2022-02-12 0:27 ` Atish Patra 2022-02-12 0:27 ` Atish Patra 2022-02-11 2:01 ` Atish Patra 2022-02-11 2:01 ` Atish Patra 2022-02-14 3:42 ` Samuel Holland 2022-02-14 3:42 ` Samuel Holland 2022-02-09 17:49 ` [PATCH v6 00/14] riscv: support for Svpbmt and D1 memory types Jisheng Zhang 2022-02-09 17:49 ` Jisheng Zhang 2022-02-09 23:44 ` Heiko Stübner 2022-02-09 23:44 ` Heiko Stübner 2022-02-10 16:01 ` Jisheng Zhang 2022-02-10 16:01 ` Jisheng Zhang 2022-02-11 0:25 ` Atish Patra 2022-02-11 0:25 ` Atish Patra 2022-02-11 1:48 ` Atish Patra 2022-02-11 1:48 ` Atish Patra 2022-02-11 2:04 ` Heiko Stübner 2022-02-11 2:04 ` Heiko Stübner 2022-02-12 0:25 ` Atish Patra 2022-02-12 0:25 ` Atish Patra 2022-02-14 20:02 ` Heiko Stübner 2022-02-14 20:02 ` Heiko Stübner 2022-02-14 20:25 ` Atish Patra 2022-02-14 20:25 ` Atish Patra 2022-02-14 20:37 ` Heiko Stübner 2022-02-14 20:37 ` Heiko Stübner 2022-03-09 7:56 ` Guo Ren 2022-03-09 7:56 ` Guo Ren
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=mhng-3d591628-2c87-40c7-91e4-407ad313a4aa@palmer-ri-x1c9 \ --to=palmer@dabbelt.com \ --cc=allen.baum@esperantotech.com \ --cc=andrea.mondelli@huawei.com \ --cc=anup@brainfault.org \ --cc=aou@eecs.berkeley.edu \ --cc=arnd@arndb.de \ --cc=atishp@atishpatra.org \ --cc=behrensj@mit.edu \ --cc=cmuellner@linux.com \ --cc=devicetree@vger.kernel.org \ --cc=drew@beagleboard.org \ --cc=gfavor@ventanamicro.com \ --cc=guoren@kernel.org \ --cc=hch@lst.de \ --cc=heiko@sntech.de \ --cc=huffman@cadence.com \ --cc=jscheid@ventanamicro.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-riscv@lists.infradead.org \ --cc=liush@allwinnertech.com \ --cc=maxime@cerno.tech \ --cc=mick@ics.forth.gr \ --cc=paul.walmsley@sifive.com \ --cc=philipp.tomsich@vrull.eu \ --cc=robh+dt@kernel.org \ --cc=rtrauben@gmail.com \ --cc=samuel@sholland.org \ --cc=wefu@redhat.com \ --cc=wens@csie.org \ --cc=xinhaoqu@huawei.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.