* [PATCH v2 1/2] riscv/purgatory: hard-code obj-y in Makefile
@ 2022-07-25 2:19 Masahiro Yamada
2022-07-25 2:19 ` [PATCH v2 2/2] riscv/purgatory: Omit use of bin2c Masahiro Yamada
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Masahiro Yamada @ 2022-07-25 2:19 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, linux-riscv
Cc: Masahiro Yamada, Borislav Petkov, Li Zhengyu, Nick Desaulniers,
linux-kernel
The purgatory/ directory is entirely guarded in arch/riscv/Kbuild.
CONFIG_ARCH_HAS_KEXEC_PURGATORY is bool type.
$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) is always 'y' when Kbuild visits
this Makefile for building.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
(no changes since v1)
arch/riscv/purgatory/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile
index d4df200f7edf..c2d14e2f345d 100644
--- a/arch/riscv/purgatory/Makefile
+++ b/arch/riscv/purgatory/Makefile
@@ -92,4 +92,4 @@ quiet_cmd_bin2c = BIN2C $@
$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE
$(call if_changed,bin2c)
-obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += kexec-purgatory.o
+obj-y += kexec-purgatory.o
--
2.34.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] riscv/purgatory: Omit use of bin2c
2022-07-25 2:19 [PATCH v2 1/2] riscv/purgatory: hard-code obj-y in Makefile Masahiro Yamada
@ 2022-07-25 2:19 ` Masahiro Yamada
2022-07-25 17:52 ` Nick Desaulniers
2022-07-25 17:04 ` [PATCH v2 1/2] riscv/purgatory: hard-code obj-y in Makefile Nick Desaulniers
2022-08-11 16:53 ` Palmer Dabbelt
2 siblings, 1 reply; 6+ messages in thread
From: Masahiro Yamada @ 2022-07-25 2:19 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, linux-riscv
Cc: Masahiro Yamada, Borislav Petkov, Helge Deller, Li Zhengyu,
Nick Desaulniers, Russell King (Oracle),
Thomas Bogendoerfer, linux-kernel
The .incbin assembler directive is much faster than bin2c + $(CC).
Do similar refactoring as in commit 4c0f032d4963 ("s390/purgatory:
Omit use of bin2c").
Please note the .quad directive matches to size_t in C (both 8 byte)
because the purgatory is compiled only for the 64-bit kernel.
(KEXEC_FILE depends on 64BIT).
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
Changes in v2:
- Fix a typo (kexec_purgatroy_end -> kexec_purgatory_end)
arch/riscv/Kconfig | 1 -
arch/riscv/purgatory/.gitignore | 1 -
arch/riscv/purgatory/Makefile | 8 +-------
arch/riscv/purgatory/kexec-purgatory.S | 14 ++++++++++++++
scripts/remove-stale-files | 2 ++
5 files changed, 17 insertions(+), 9 deletions(-)
create mode 100644 arch/riscv/purgatory/kexec-purgatory.S
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 32ffef9f6e5b..218c2f12b3ef 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -447,7 +447,6 @@ config KEXEC_FILE
config ARCH_HAS_KEXEC_PURGATORY
def_bool KEXEC_FILE
- select BUILD_BIN2C
depends on CRYPTO=y
depends on CRYPTO_SHA256=y
diff --git a/arch/riscv/purgatory/.gitignore b/arch/riscv/purgatory/.gitignore
index 38d7d1bda4d7..6e4dfb024ad2 100644
--- a/arch/riscv/purgatory/.gitignore
+++ b/arch/riscv/purgatory/.gitignore
@@ -1,4 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
purgatory.chk
purgatory.ro
-kexec-purgatory.c
diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile
index c2d14e2f345d..dd58e1d99397 100644
--- a/arch/riscv/purgatory/Makefile
+++ b/arch/riscv/purgatory/Makefile
@@ -84,12 +84,6 @@ $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE
$(obj)/purgatory.chk: $(obj)/purgatory.ro FORCE
$(call if_changed,ld)
-targets += kexec-purgatory.c
-
-quiet_cmd_bin2c = BIN2C $@
- cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@
-
-$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE
- $(call if_changed,bin2c)
+$(obj)/kexec-purgatory.o: $(obj)/purgatory.ro $(obj)/purgatory.chk
obj-y += kexec-purgatory.o
diff --git a/arch/riscv/purgatory/kexec-purgatory.S b/arch/riscv/purgatory/kexec-purgatory.S
new file mode 100644
index 000000000000..32c53581b8f2
--- /dev/null
+++ b/arch/riscv/purgatory/kexec-purgatory.S
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+ .section .rodata, "a"
+
+ .align 8
+kexec_purgatory:
+ .globl kexec_purgatory
+ .incbin "arch/riscv/purgatory/purgatory.ro"
+.Lkexec_purgatory_end:
+
+ .align 8
+kexec_purgatory_size:
+ .globl kexec_purgatory_size
+ .quad .Lkexec_purgatory_end - kexec_purgatory
diff --git a/scripts/remove-stale-files b/scripts/remove-stale-files
index 7adab4618035..d75a52199a38 100755
--- a/scripts/remove-stale-files
+++ b/scripts/remove-stale-files
@@ -40,4 +40,6 @@ if [ -n "${building_out_of_srctree}" ]; then
done
fi
+rm -f arch/riscv/purgatory/kexec-purgatory.c
+
rm -f scripts/extract-cert
--
2.34.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] riscv/purgatory: hard-code obj-y in Makefile
2022-07-25 2:19 [PATCH v2 1/2] riscv/purgatory: hard-code obj-y in Makefile Masahiro Yamada
2022-07-25 2:19 ` [PATCH v2 2/2] riscv/purgatory: Omit use of bin2c Masahiro Yamada
@ 2022-07-25 17:04 ` Nick Desaulniers
2022-08-11 16:53 ` Palmer Dabbelt
2 siblings, 0 replies; 6+ messages in thread
From: Nick Desaulniers @ 2022-07-25 17:04 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, linux-riscv,
Borislav Petkov, Li Zhengyu, linux-kernel
On Sun, Jul 24, 2022 at 7:21 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> The purgatory/ directory is entirely guarded in arch/riscv/Kbuild.
> CONFIG_ARCH_HAS_KEXEC_PURGATORY is bool type.
>
> $(CONFIG_ARCH_HAS_KEXEC_PURGATORY) is always 'y' when Kbuild visits
> this Makefile for building.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Thanks for the patch!
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
> ---
>
> (no changes since v1)
>
> arch/riscv/purgatory/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile
> index d4df200f7edf..c2d14e2f345d 100644
> --- a/arch/riscv/purgatory/Makefile
> +++ b/arch/riscv/purgatory/Makefile
> @@ -92,4 +92,4 @@ quiet_cmd_bin2c = BIN2C $@
> $(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE
> $(call if_changed,bin2c)
>
> -obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += kexec-purgatory.o
> +obj-y += kexec-purgatory.o
> --
> 2.34.1
>
--
Thanks,
~Nick Desaulniers
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] riscv/purgatory: Omit use of bin2c
2022-07-25 2:19 ` [PATCH v2 2/2] riscv/purgatory: Omit use of bin2c Masahiro Yamada
@ 2022-07-25 17:52 ` Nick Desaulniers
2022-07-26 4:49 ` Masahiro Yamada
0 siblings, 1 reply; 6+ messages in thread
From: Nick Desaulniers @ 2022-07-25 17:52 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, linux-riscv,
Borislav Petkov, Helge Deller, Li Zhengyu, Russell King (Oracle),
Thomas Bogendoerfer, linux-kernel
On Sun, Jul 24, 2022 at 7:22 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> The .incbin assembler directive is much faster than bin2c + $(CC).
>
> Do similar refactoring as in commit 4c0f032d4963 ("s390/purgatory:
> Omit use of bin2c").
>
> Please note the .quad directive matches to size_t in C (both 8 byte)
> because the purgatory is compiled only for the 64-bit kernel.
> (KEXEC_FILE depends on 64BIT).
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Seems fine. Is the overall goal working towards removing scripts/bin2c?
Acked-by: Nick Desaulniers <ndesaulniers@google.com>
> ---
>
> Changes in v2:
> - Fix a typo (kexec_purgatroy_end -> kexec_purgatory_end)
>
> arch/riscv/Kconfig | 1 -
> arch/riscv/purgatory/.gitignore | 1 -
> arch/riscv/purgatory/Makefile | 8 +-------
> arch/riscv/purgatory/kexec-purgatory.S | 14 ++++++++++++++
> scripts/remove-stale-files | 2 ++
> 5 files changed, 17 insertions(+), 9 deletions(-)
> create mode 100644 arch/riscv/purgatory/kexec-purgatory.S
>
> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> index 32ffef9f6e5b..218c2f12b3ef 100644
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@ -447,7 +447,6 @@ config KEXEC_FILE
>
> config ARCH_HAS_KEXEC_PURGATORY
> def_bool KEXEC_FILE
> - select BUILD_BIN2C
> depends on CRYPTO=y
> depends on CRYPTO_SHA256=y
>
> diff --git a/arch/riscv/purgatory/.gitignore b/arch/riscv/purgatory/.gitignore
> index 38d7d1bda4d7..6e4dfb024ad2 100644
> --- a/arch/riscv/purgatory/.gitignore
> +++ b/arch/riscv/purgatory/.gitignore
> @@ -1,4 +1,3 @@
> # SPDX-License-Identifier: GPL-2.0-only
> purgatory.chk
> purgatory.ro
> -kexec-purgatory.c
> diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile
> index c2d14e2f345d..dd58e1d99397 100644
> --- a/arch/riscv/purgatory/Makefile
> +++ b/arch/riscv/purgatory/Makefile
> @@ -84,12 +84,6 @@ $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE
> $(obj)/purgatory.chk: $(obj)/purgatory.ro FORCE
> $(call if_changed,ld)
>
> -targets += kexec-purgatory.c
> -
> -quiet_cmd_bin2c = BIN2C $@
> - cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@
> -
> -$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE
> - $(call if_changed,bin2c)
> +$(obj)/kexec-purgatory.o: $(obj)/purgatory.ro $(obj)/purgatory.chk
>
> obj-y += kexec-purgatory.o
> diff --git a/arch/riscv/purgatory/kexec-purgatory.S b/arch/riscv/purgatory/kexec-purgatory.S
> new file mode 100644
> index 000000000000..32c53581b8f2
> --- /dev/null
> +++ b/arch/riscv/purgatory/kexec-purgatory.S
> @@ -0,0 +1,14 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +
> + .section .rodata, "a"
> +
> + .align 8
> +kexec_purgatory:
> + .globl kexec_purgatory
> + .incbin "arch/riscv/purgatory/purgatory.ro"
> +.Lkexec_purgatory_end:
> +
> + .align 8
> +kexec_purgatory_size:
> + .globl kexec_purgatory_size
> + .quad .Lkexec_purgatory_end - kexec_purgatory
> diff --git a/scripts/remove-stale-files b/scripts/remove-stale-files
> index 7adab4618035..d75a52199a38 100755
> --- a/scripts/remove-stale-files
> +++ b/scripts/remove-stale-files
> @@ -40,4 +40,6 @@ if [ -n "${building_out_of_srctree}" ]; then
> done
> fi
>
> +rm -f arch/riscv/purgatory/kexec-purgatory.c
> +
> rm -f scripts/extract-cert
> --
> 2.34.1
>
--
Thanks,
~Nick Desaulniers
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] riscv/purgatory: Omit use of bin2c
2022-07-25 17:52 ` Nick Desaulniers
@ 2022-07-26 4:49 ` Masahiro Yamada
0 siblings, 0 replies; 6+ messages in thread
From: Masahiro Yamada @ 2022-07-26 4:49 UTC (permalink / raw)
To: Nick Desaulniers
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou,
open list:SIFIVE DRIVERS, Borislav Petkov, Helge Deller,
Li Zhengyu, Russell King (Oracle),
Thomas Bogendoerfer, Linux Kernel Mailing List
On Tue, Jul 26, 2022 at 2:52 AM Nick Desaulniers
<ndesaulniers@google.com> wrote:
>
> On Sun, Jul 24, 2022 at 7:22 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
> >
> > The .incbin assembler directive is much faster than bin2c + $(CC).
> >
> > Do similar refactoring as in commit 4c0f032d4963 ("s390/purgatory:
> > Omit use of bin2c").
> >
> > Please note the .quad directive matches to size_t in C (both 8 byte)
> > because the purgatory is compiled only for the 64-bit kernel.
> > (KEXEC_FILE depends on 64BIT).
> >
> > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
>
> Seems fine. Is the overall goal working towards removing scripts/bin2c?
Yes.
I want to remove bin2c.
> Acked-by: Nick Desaulniers <ndesaulniers@google.com>
>
> > ---
> >
> > Changes in v2:
> > - Fix a typo (kexec_purgatroy_end -> kexec_purgatory_end)
> >
> > arch/riscv/Kconfig | 1 -
> > arch/riscv/purgatory/.gitignore | 1 -
> > arch/riscv/purgatory/Makefile | 8 +-------
> > arch/riscv/purgatory/kexec-purgatory.S | 14 ++++++++++++++
> > scripts/remove-stale-files | 2 ++
> > 5 files changed, 17 insertions(+), 9 deletions(-)
> > create mode 100644 arch/riscv/purgatory/kexec-purgatory.S
> >
> > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> > index 32ffef9f6e5b..218c2f12b3ef 100644
> > --- a/arch/riscv/Kconfig
> > +++ b/arch/riscv/Kconfig
> > @@ -447,7 +447,6 @@ config KEXEC_FILE
> >
> > config ARCH_HAS_KEXEC_PURGATORY
> > def_bool KEXEC_FILE
> > - select BUILD_BIN2C
> > depends on CRYPTO=y
> > depends on CRYPTO_SHA256=y
> >
> > diff --git a/arch/riscv/purgatory/.gitignore b/arch/riscv/purgatory/.gitignore
> > index 38d7d1bda4d7..6e4dfb024ad2 100644
> > --- a/arch/riscv/purgatory/.gitignore
> > +++ b/arch/riscv/purgatory/.gitignore
> > @@ -1,4 +1,3 @@
> > # SPDX-License-Identifier: GPL-2.0-only
> > purgatory.chk
> > purgatory.ro
> > -kexec-purgatory.c
> > diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile
> > index c2d14e2f345d..dd58e1d99397 100644
> > --- a/arch/riscv/purgatory/Makefile
> > +++ b/arch/riscv/purgatory/Makefile
> > @@ -84,12 +84,6 @@ $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE
> > $(obj)/purgatory.chk: $(obj)/purgatory.ro FORCE
> > $(call if_changed,ld)
> >
> > -targets += kexec-purgatory.c
> > -
> > -quiet_cmd_bin2c = BIN2C $@
> > - cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@
> > -
> > -$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE
> > - $(call if_changed,bin2c)
> > +$(obj)/kexec-purgatory.o: $(obj)/purgatory.ro $(obj)/purgatory.chk
> >
> > obj-y += kexec-purgatory.o
> > diff --git a/arch/riscv/purgatory/kexec-purgatory.S b/arch/riscv/purgatory/kexec-purgatory.S
> > new file mode 100644
> > index 000000000000..32c53581b8f2
> > --- /dev/null
> > +++ b/arch/riscv/purgatory/kexec-purgatory.S
> > @@ -0,0 +1,14 @@
> > +/* SPDX-License-Identifier: GPL-2.0 */
> > +
> > + .section .rodata, "a"
> > +
> > + .align 8
> > +kexec_purgatory:
> > + .globl kexec_purgatory
> > + .incbin "arch/riscv/purgatory/purgatory.ro"
> > +.Lkexec_purgatory_end:
> > +
> > + .align 8
> > +kexec_purgatory_size:
> > + .globl kexec_purgatory_size
> > + .quad .Lkexec_purgatory_end - kexec_purgatory
> > diff --git a/scripts/remove-stale-files b/scripts/remove-stale-files
> > index 7adab4618035..d75a52199a38 100755
> > --- a/scripts/remove-stale-files
> > +++ b/scripts/remove-stale-files
> > @@ -40,4 +40,6 @@ if [ -n "${building_out_of_srctree}" ]; then
> > done
> > fi
> >
> > +rm -f arch/riscv/purgatory/kexec-purgatory.c
> > +
> > rm -f scripts/extract-cert
> > --
> > 2.34.1
> >
>
>
> --
> Thanks,
> ~Nick Desaulniers
--
Best Regards
Masahiro Yamada
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] riscv/purgatory: hard-code obj-y in Makefile
2022-07-25 2:19 [PATCH v2 1/2] riscv/purgatory: hard-code obj-y in Makefile Masahiro Yamada
2022-07-25 2:19 ` [PATCH v2 2/2] riscv/purgatory: Omit use of bin2c Masahiro Yamada
2022-07-25 17:04 ` [PATCH v2 1/2] riscv/purgatory: hard-code obj-y in Makefile Nick Desaulniers
@ 2022-08-11 16:53 ` Palmer Dabbelt
2 siblings, 0 replies; 6+ messages in thread
From: Palmer Dabbelt @ 2022-08-11 16:53 UTC (permalink / raw)
To: masahiroy
Cc: Paul Walmsley, aou, linux-riscv, masahiroy, bp, lizhengyu3,
ndesaulniers, linux-kernel
On Sun, 24 Jul 2022 19:19:01 PDT (-0700), masahiroy@kernel.org wrote:
> The purgatory/ directory is entirely guarded in arch/riscv/Kbuild.
> CONFIG_ARCH_HAS_KEXEC_PURGATORY is bool type.
>
> $(CONFIG_ARCH_HAS_KEXEC_PURGATORY) is always 'y' when Kbuild visits
> this Makefile for building.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>
> (no changes since v1)
>
> arch/riscv/purgatory/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile
> index d4df200f7edf..c2d14e2f345d 100644
> --- a/arch/riscv/purgatory/Makefile
> +++ b/arch/riscv/purgatory/Makefile
> @@ -92,4 +92,4 @@ quiet_cmd_bin2c = BIN2C $@
> $(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE
> $(call if_changed,bin2c)
>
> -obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += kexec-purgatory.o
> +obj-y += kexec-purgatory.o
Thanks, these are on for-next.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-08-11 16:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-25 2:19 [PATCH v2 1/2] riscv/purgatory: hard-code obj-y in Makefile Masahiro Yamada
2022-07-25 2:19 ` [PATCH v2 2/2] riscv/purgatory: Omit use of bin2c Masahiro Yamada
2022-07-25 17:52 ` Nick Desaulniers
2022-07-26 4:49 ` Masahiro Yamada
2022-07-25 17:04 ` [PATCH v2 1/2] riscv/purgatory: hard-code obj-y in Makefile Nick Desaulniers
2022-08-11 16:53 ` Palmer Dabbelt
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).