2022-06-13 19:36:34

by Masahiro Yamada

Subject: [PATCH 1/3] s390: remove unneeded 'select BUILD_BIN2C'

Since commit 4c0f032d4963 ("s390/purgatory: Omit use of bin2c"),
s390 builds the purgatory without using bin2c.

Remove 'select BUILD_BIN2C' to avoid the unneeded build of bin2c.

Fixes: 4c0f032d4963 ("s390/purgatory: Omit use of bin2c")
Signed-off-by: Masahiro Yamada <[email protected]>
---

arch/s390/Kconfig | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 91c0b80a8bf0..8cd9e56c629b 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -484,7 +484,6 @@ config KEXEC
config KEXEC_FILE
bool "kexec file based system call"
select KEXEC_CORE
- select BUILD_BIN2C
depends on CRYPTO
depends on CRYPTO_SHA256
depends on CRYPTO_SHA256_S390
--
2.32.0

2022-06-13 20:06:11

by Masahiro Yamada

Subject: [PATCH 2/3] s390/purgatory: hard-code obj-y in Makefile

The purgatory/ directory is entirely guarded in arch/s390/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 <[email protected]>
---

arch/s390/purgatory/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile
index 360ada80d20c..3e2c17ba04de 100644
--- a/arch/s390/purgatory/Makefile
+++ b/arch/s390/purgatory/Makefile
@@ -51,4 +51,4 @@ $(obj)/purgatory.ro: $(obj)/purgatory $(obj)/purgatory.chk FORCE
$(obj)/kexec-purgatory.o: $(obj)/kexec-purgatory.S $(obj)/purgatory.ro FORCE
$(call if_changed_rule,as_o_S)

-obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += kexec-purgatory.o
+obj-y += kexec-purgatory.o
--
2.32.0

2022-06-22 13:46:42

by Alexander Gordeev

Subject: Re: [PATCH 1/3] s390: remove unneeded 'select BUILD_BIN2C'

On Tue, Jun 14, 2022 at 02:09:00AM +0900, Masahiro Yamada wrote:
> Since commit 4c0f032d4963 ("s390/purgatory: Omit use of bin2c"),
> s390 builds the purgatory without using bin2c.
>
> Remove 'select BUILD_BIN2C' to avoid the unneeded build of bin2c.
>
> Fixes: 4c0f032d4963 ("s390/purgatory: Omit use of bin2c")
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---
>
> arch/s390/Kconfig | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
> index 91c0b80a8bf0..8cd9e56c629b 100644
> --- a/arch/s390/Kconfig
> +++ b/arch/s390/Kconfig
> @@ -484,7 +484,6 @@ config KEXEC
> config KEXEC_FILE
> bool "kexec file based system call"
> select KEXEC_CORE
> - select BUILD_BIN2C
> depends on CRYPTO
> depends on CRYPTO_SHA256
> depends on CRYPTO_SHA256_S390

Applied, thanks!

> --
> 2.32.0
>

2022-06-22 14:09:22

by Alexander Gordeev

Subject: Re: [PATCH 2/3] s390/purgatory: hard-code obj-y in Makefile

On Tue, Jun 14, 2022 at 02:09:01AM +0900, Masahiro Yamada wrote:
> The purgatory/ directory is entirely guarded in arch/s390/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 <[email protected]>
> ---
>
> arch/s390/purgatory/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile
> index 360ada80d20c..3e2c17ba04de 100644
> --- a/arch/s390/purgatory/Makefile
> +++ b/arch/s390/purgatory/Makefile
> @@ -51,4 +51,4 @@ $(obj)/purgatory.ro: $(obj)/purgatory $(obj)/purgatory.chk FORCE
> $(obj)/kexec-purgatory.o: $(obj)/kexec-purgatory.S $(obj)/purgatory.ro FORCE
> $(call if_changed_rule,as_o_S)
>
> -obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += kexec-purgatory.o
> +obj-y += kexec-purgatory.o

Applied, thanks!

BTW, it looks like x86 and riscv also need similar change.

In addition, x86 use of CONFIG_ARCH_HAS_KEXEC_PURGATORY vs CONFIG_KEXEC_FILE
is not consistent with other architectures (may be even incorrect?).

> --
> 2.32.0
>

2022-06-23 10:39:28

by Masahiro Yamada

Subject: Re: [PATCH 2/3] s390/purgatory: hard-code obj-y in Makefile

On Wed, Jun 22, 2022 at 10:48 PM Alexander Gordeev
<[email protected]> wrote:
>
> On Tue, Jun 14, 2022 at 02:09:01AM +0900, Masahiro Yamada wrote:
> > The purgatory/ directory is entirely guarded in arch/s390/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 <[email protected]>
> > ---
> >
> > arch/s390/purgatory/Makefile | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile
> > index 360ada80d20c..3e2c17ba04de 100644
> > --- a/arch/s390/purgatory/Makefile
> > +++ b/arch/s390/purgatory/Makefile
> > @@ -51,4 +51,4 @@ $(obj)/purgatory.ro: $(obj)/purgatory $(obj)/purgatory.chk FORCE
> > $(obj)/kexec-purgatory.o: $(obj)/kexec-purgatory.S $(obj)/purgatory.ro FORCE
> > $(call if_changed_rule,as_o_S)
> >
> > -obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += kexec-purgatory.o
> > +obj-y += kexec-purgatory.o
>
> Applied, thanks!
>
> BTW, it looks like x86 and riscv also need similar change.

A patch for x86 exists:

https://lore.kernel.org/all/[email protected]/


I will send riscv patches later.


> In addition, x86 use of CONFIG_ARCH_HAS_KEXEC_PURGATORY vs CONFIG_KEXEC_FILE
> is not consistent with other architectures (may be even incorrect?).

I thought of this when I reworked Makefiles,
but did not touch this part.


>
> > --
> > 2.32.0
> >



--
Best Regards
Masahiro Yamada