Hi,

On Sat, Jan 11, 2025 at 02:48:46PM +0900, Akihiko Odaki wrote:
> Use note name macros to match with the userspace's expectation.

Note, there seems to be some manual encoding of some arch-specific
notes in arch/powerpc/boot/addnote.c, but since this is all hard-coded
and the note types are not taken from elf.h anyway, I think this is
probably out of scope for this series.  I haven't tried to understand
fully what that code is doing.

Anyway:

Reviewed-by: Dave Martin <dave.mar...@arm.com>

> 
> Acked-by: Baoquan He <b...@redhat.com>
> Signed-off-by: Akihiko Odaki <akihiko.od...@daynix.com>
> ---
>  arch/powerpc/kernel/fadump.c               | 2 +-
>  arch/powerpc/platforms/powernv/opal-core.c | 8 ++++----
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
> index 4b371c738213..d44349fe8e2b 100644
> --- a/arch/powerpc/kernel/fadump.c
> +++ b/arch/powerpc/kernel/fadump.c
> @@ -751,7 +751,7 @@ u32 *__init fadump_regs_to_elf_notes(u32 *buf, struct 
> pt_regs *regs)
>        * prstatus.pr_pid = ????
>        */
>       elf_core_copy_regs(&prstatus.pr_reg, regs);
> -     buf = append_elf_note(buf, CRASH_CORE_NOTE_NAME, NT_PRSTATUS,
> +     buf = append_elf_note(buf, NN_PRSTATUS, NT_PRSTATUS,
>                             &prstatus, sizeof(prstatus));
>       return buf;
>  }
> diff --git a/arch/powerpc/platforms/powernv/opal-core.c 
> b/arch/powerpc/platforms/powernv/opal-core.c
> index c9a9b759cc92..a379ff86c120 100644
> --- a/arch/powerpc/platforms/powernv/opal-core.c
> +++ b/arch/powerpc/platforms/powernv/opal-core.c
> @@ -149,7 +149,7 @@ static Elf64_Word *__init auxv_to_elf64_notes(Elf64_Word 
> *buf,
>       /* end of vector */
>       bufp[idx++] = cpu_to_be64(AT_NULL);
>  
> -     buf = append_elf64_note(buf, CRASH_CORE_NOTE_NAME, NT_AUXV,
> +     buf = append_elf64_note(buf, NN_AUXV, NT_AUXV,
>                               oc_conf->auxv_buf, AUXV_DESC_SZ);
>       return buf;
>  }
> @@ -252,7 +252,7 @@ static Elf64_Word * __init 
> opalcore_append_cpu_notes(Elf64_Word *buf)
>        * crashing CPU's prstatus.
>        */
>       first_cpu_note = buf;
> -     buf = append_elf64_note(buf, CRASH_CORE_NOTE_NAME, NT_PRSTATUS,
> +     buf = append_elf64_note(buf, NN_PRSTATUS, NT_PRSTATUS,
>                               &prstatus, sizeof(prstatus));
>  
>       for (i = 0; i < oc_conf->num_cpus; i++, bufp += size_per_thread) {
> @@ -279,7 +279,7 @@ static Elf64_Word * __init 
> opalcore_append_cpu_notes(Elf64_Word *buf)
>               fill_prstatus(&prstatus, thread_pir, &regs);
>  
>               if (thread_pir != oc_conf->crashing_cpu) {
> -                     buf = append_elf64_note(buf, CRASH_CORE_NOTE_NAME,
> +                     buf = append_elf64_note(buf, NN_PRSTATUS,
>                                               NT_PRSTATUS, &prstatus,
>                                               sizeof(prstatus));
>               } else {
> @@ -287,7 +287,7 @@ static Elf64_Word * __init 
> opalcore_append_cpu_notes(Elf64_Word *buf)
>                        * Add crashing CPU as the first NT_PRSTATUS note for
>                        * GDB to process the core file appropriately.
>                        */
> -                     append_elf64_note(first_cpu_note, CRASH_CORE_NOTE_NAME,
> +                     append_elf64_note(first_cpu_note, NN_PRSTATUS,
>                                         NT_PRSTATUS, &prstatus,
>                                         sizeof(prstatus));
>               }
> 
> -- 
> 2.47.1
> 
> 

Reply via email to