[PATCH 1/2] arch/loongarch: clean up the left code and Kconfig item related to CRASH_CORE

[PATCH 1/2] arch/loongarch: clean up the left code and Kconfig item related to CRASH_CORE

[Baoquan He]

In commit 85fcde402db1 ("kexec: split crashkernel reservation code
out from crash_core.c"), crashkernel reservation code is split out from
crash_core.c, and add CRASH_RESERVE to control it. And also rename each
ARCH's <asm/crash_core.h> to <asm/crash_reserve.h> accordingly.

But the relevant part in loongarch is missed. Do it now.

Signed-off-by: Baoquan He <bhe@redhat.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: loongarch@lists.linux.dev
---
 arch/loongarch/Kconfig                                       | 2 +-
 arch/loongarch/include/asm/{crash_core.h => crash_reserve.h} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename arch/loongarch/include/asm/{crash_core.h => crash_reserve.h} (75%)

diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
index a5f300ec6f28..54ad04dacdee 100644
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@ -595,7 +595,7 @@ config ARCH_SELECTS_CRASH_DUMP
 	select RELOCATABLE
 
 config ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
-	def_bool CRASH_CORE
+	def_bool CRASH_RESERVE
 
 config RELOCATABLE
 	bool "Relocatable kernel"
diff --git a/arch/loongarch/include/asm/crash_core.h b/arch/loongarch/include/asm/crash_reserve.h
similarity index 75%
rename from arch/loongarch/include/asm/crash_core.h
rename to arch/loongarch/include/asm/crash_reserve.h
index 218bdbfa527b..a1d9b84b1c7d 100644
--- a/arch/loongarch/include/asm/crash_core.h
+++ b/arch/loongarch/include/asm/crash_reserve.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef _LOONGARCH_CRASH_CORE_H
-#define _LOONGARCH_CRASH_CORE_H
+#ifndef _LOONGARCH_CRASH_RESERVE_H
+#define _LOONGARCH_CRASH_RESERVE_H
 
 #define CRASH_ALIGN			SZ_2M
 
-- 
2.41.0

Re: [PATCH 1/2] arch/loongarch: clean up the left code and Kconfig item related to CRASH_CORE

[Huacai Chen]

Queued, thanks.

Huacai

On Fri, Mar 29, 2024 at 9:28 PM Baoquan He <bhe@redhat.com> wrote:
>
> In commit 85fcde402db1 ("kexec: split crashkernel reservation code
> out from crash_core.c"), crashkernel reservation code is split out from
> crash_core.c, and add CRASH_RESERVE to control it. And also rename each
> ARCH's <asm/crash_core.h> to <asm/crash_reserve.h> accordingly.
>
> But the relevant part in loongarch is missed. Do it now.
>
> Signed-off-by: Baoquan He <bhe@redhat.com>
> Cc: Huacai Chen <chenhuacai@kernel.org>
> Cc: WANG Xuerui <kernel@xen0n.name>
> Cc: loongarch@lists.linux.dev
> ---
>  arch/loongarch/Kconfig                                       | 2 +-
>  arch/loongarch/include/asm/{crash_core.h => crash_reserve.h} | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
>  rename arch/loongarch/include/asm/{crash_core.h => crash_reserve.h} (75%)
>
> diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
> index a5f300ec6f28..54ad04dacdee 100644
> --- a/arch/loongarch/Kconfig
> +++ b/arch/loongarch/Kconfig
> @@ -595,7 +595,7 @@ config ARCH_SELECTS_CRASH_DUMP
>         select RELOCATABLE
>
>  config ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
> -       def_bool CRASH_CORE
> +       def_bool CRASH_RESERVE
>
>  config RELOCATABLE
>         bool "Relocatable kernel"
> diff --git a/arch/loongarch/include/asm/crash_core.h b/arch/loongarch/include/asm/crash_reserve.h
> similarity index 75%
> rename from arch/loongarch/include/asm/crash_core.h
> rename to arch/loongarch/include/asm/crash_reserve.h
> index 218bdbfa527b..a1d9b84b1c7d 100644
> --- a/arch/loongarch/include/asm/crash_core.h
> +++ b/arch/loongarch/include/asm/crash_reserve.h
> @@ -1,6 +1,6 @@
>  /* SPDX-License-Identifier: GPL-2.0-only */
> -#ifndef _LOONGARCH_CRASH_CORE_H
> -#define _LOONGARCH_CRASH_CORE_H
> +#ifndef _LOONGARCH_CRASH_RESERVE_H
> +#define _LOONGARCH_CRASH_RESERVE_H
>
>  #define CRASH_ALIGN                    SZ_2M
>
> --
> 2.41.0
>

Re: [PATCH 1/2] arch/loongarch: clean up the left code and Kconfig item related to CRASH_CORE

[Baoquan He]

On 03/30/24 at 09:59pm, Huacai Chen wrote:
> Queued, thanks.

Thanks, Huacai. While I noticed Andrew has queued this patchset in his
mm-unstable branch.

> 
> Huacai
> 
> On Fri, Mar 29, 2024 at 9:28 PM Baoquan He <bhe@redhat.com> wrote:
> >
> > In commit 85fcde402db1 ("kexec: split crashkernel reservation code
> > out from crash_core.c"), crashkernel reservation code is split out from
> > crash_core.c, and add CRASH_RESERVE to control it. And also rename each
> > ARCH's <asm/crash_core.h> to <asm/crash_reserve.h> accordingly.
> >
> > But the relevant part in loongarch is missed. Do it now.
> >
> > Signed-off-by: Baoquan He <bhe@redhat.com>
> > Cc: Huacai Chen <chenhuacai@kernel.org>
> > Cc: WANG Xuerui <kernel@xen0n.name>
> > Cc: loongarch@lists.linux.dev
> > ---
> >  arch/loongarch/Kconfig                                       | 2 +-
> >  arch/loongarch/include/asm/{crash_core.h => crash_reserve.h} | 4 ++--
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> >  rename arch/loongarch/include/asm/{crash_core.h => crash_reserve.h} (75%)
> >
> > diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
> > index a5f300ec6f28..54ad04dacdee 100644
> > --- a/arch/loongarch/Kconfig
> > +++ b/arch/loongarch/Kconfig
> > @@ -595,7 +595,7 @@ config ARCH_SELECTS_CRASH_DUMP
> >         select RELOCATABLE
> >
> >  config ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
> > -       def_bool CRASH_CORE
> > +       def_bool CRASH_RESERVE
> >
> >  config RELOCATABLE
> >         bool "Relocatable kernel"
> > diff --git a/arch/loongarch/include/asm/crash_core.h b/arch/loongarch/include/asm/crash_reserve.h
> > similarity index 75%
> > rename from arch/loongarch/include/asm/crash_core.h
> > rename to arch/loongarch/include/asm/crash_reserve.h
> > index 218bdbfa527b..a1d9b84b1c7d 100644
> > --- a/arch/loongarch/include/asm/crash_core.h
> > +++ b/arch/loongarch/include/asm/crash_reserve.h
> > @@ -1,6 +1,6 @@
> >  /* SPDX-License-Identifier: GPL-2.0-only */
> > -#ifndef _LOONGARCH_CRASH_CORE_H
> > -#define _LOONGARCH_CRASH_CORE_H
> > +#ifndef _LOONGARCH_CRASH_RESERVE_H
> > +#define _LOONGARCH_CRASH_RESERVE_H
> >
> >  #define CRASH_ALIGN                    SZ_2M
> >
> > --
> > 2.41.0
> >
> 

Re: [PATCH 1/2] arch/loongarch: clean up the left code and Kconfig item related to CRASH_CORE

[Huacai Chen]

Hi, Andrew,

On Sat, Mar 30, 2024 at 10:24 PM Baoquan He <bhe@redhat.com> wrote:
>
> On 03/30/24 at 09:59pm, Huacai Chen wrote:
> > Queued, thanks.
>
> Thanks, Huacai. While I noticed Andrew has queued this patchset in his
> mm-unstable branch.
If I'm not mistaken, mm-unstable is target for the next 6.10, not for
the current 6.9. But I think this patch should be a fix for 6.9, so I
think it is more suitable in the loongarch-fixes branch. What's your
opinion?

The same question for this patch which fix a build warning:
https://lore.kernel.org/loongarch/CANiq72kACt+FfeYXJxfQpmGH=uPqkDA0oprfnebw52VSKyn7kQ@mail.gmail.com/T/#t


Huacai

>
> >
> > Huacai
> >
> > On Fri, Mar 29, 2024 at 9:28 PM Baoquan He <bhe@redhat.com> wrote:
> > >
> > > In commit 85fcde402db1 ("kexec: split crashkernel reservation code
> > > out from crash_core.c"), crashkernel reservation code is split out from
> > > crash_core.c, and add CRASH_RESERVE to control it. And also rename each
> > > ARCH's <asm/crash_core.h> to <asm/crash_reserve.h> accordingly.
> > >
> > > But the relevant part in loongarch is missed. Do it now.
> > >
> > > Signed-off-by: Baoquan He <bhe@redhat.com>
> > > Cc: Huacai Chen <chenhuacai@kernel.org>
> > > Cc: WANG Xuerui <kernel@xen0n.name>
> > > Cc: loongarch@lists.linux.dev
> > > ---
> > >  arch/loongarch/Kconfig                                       | 2 +-
> > >  arch/loongarch/include/asm/{crash_core.h => crash_reserve.h} | 4 ++--
> > >  2 files changed, 3 insertions(+), 3 deletions(-)
> > >  rename arch/loongarch/include/asm/{crash_core.h => crash_reserve.h} (75%)
> > >
> > > diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
> > > index a5f300ec6f28..54ad04dacdee 100644
> > > --- a/arch/loongarch/Kconfig
> > > +++ b/arch/loongarch/Kconfig
> > > @@ -595,7 +595,7 @@ config ARCH_SELECTS_CRASH_DUMP
> > >         select RELOCATABLE
> > >
> > >  config ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
> > > -       def_bool CRASH_CORE
> > > +       def_bool CRASH_RESERVE
> > >
> > >  config RELOCATABLE
> > >         bool "Relocatable kernel"
> > > diff --git a/arch/loongarch/include/asm/crash_core.h b/arch/loongarch/include/asm/crash_reserve.h
> > > similarity index 75%
> > > rename from arch/loongarch/include/asm/crash_core.h
> > > rename to arch/loongarch/include/asm/crash_reserve.h
> > > index 218bdbfa527b..a1d9b84b1c7d 100644
> > > --- a/arch/loongarch/include/asm/crash_core.h
> > > +++ b/arch/loongarch/include/asm/crash_reserve.h
> > > @@ -1,6 +1,6 @@
> > >  /* SPDX-License-Identifier: GPL-2.0-only */
> > > -#ifndef _LOONGARCH_CRASH_CORE_H
> > > -#define _LOONGARCH_CRASH_CORE_H
> > > +#ifndef _LOONGARCH_CRASH_RESERVE_H
> > > +#define _LOONGARCH_CRASH_RESERVE_H
> > >
> > >  #define CRASH_ALIGN                    SZ_2M
> > >
> > > --
> > > 2.41.0
> > >
> >
>

Re: [PATCH 1/2] arch/loongarch: clean up the left code and Kconfig item related to CRASH_CORE

[Geert Uytterhoeven]

On Wed, Apr 17, 2024 at 5:15 AM Huacai Chen <chenhuacai@kernel.org> wrote:
> On Sat, Mar 30, 2024 at 10:24 PM Baoquan He <bhe@redhat.com> wrote:
> >
> > On 03/30/24 at 09:59pm, Huacai Chen wrote:
> > > Queued, thanks.
> >
> > Thanks, Huacai. While I noticed Andrew has queued this patchset in his
> > mm-unstable branch.
> If I'm not mistaken, mm-unstable is target for the next 6.10, not for
> the current 6.9. But I think this patch should be a fix for 6.9, so I
> think it is more suitable in the loongarch-fixes branch. What's your
> opinion?

This would have been slightly more obvious with
Fixes: 85fcde402db191b5 ("kexec: split crashkernel reservation code
out from crash_core.c")

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds