| Message ID | 20231017132510.3845531-4-ardb@google.com |
|---|---|
| Headers | show |
| Series | x86/boot: Fix boot_params init in EFI stub | expand |
* Ard Biesheuvel <ardb@google.com> wrote: > From: Ard Biesheuvel <ardb@kernel.org> > > v2: > add separate patch to rename the decompressor's version of the > boot_params global variable > > Ard Biesheuvel (2): > x86/boot: Rename conflicting boot_params pointer to boot_params_p > x86/boot: efistub: Assign global boot_params variable > > arch/x86/boot/compressed/acpi.c | 14 +++++------ > arch/x86/boot/compressed/cmdline.c | 4 +-- > arch/x86/boot/compressed/ident_map_64.c | 7 +++--- > arch/x86/boot/compressed/kaslr.c | 26 ++++++++++---------- > arch/x86/boot/compressed/mem.c | 6 ++--- > arch/x86/boot/compressed/misc.c | 24 +++++++++--------- > arch/x86/boot/compressed/misc.h | 1 - > arch/x86/boot/compressed/pgtable_64.c | 9 +++---- > arch/x86/boot/compressed/sev.c | 2 +- > arch/x86/include/asm/boot.h | 2 ++ > drivers/firmware/efi/libstub/x86-stub.c | 2 ++ > 11 files changed, 50 insertions(+), 47 deletions(-) Thanks! I renamed 'boot_params_p' to 'boot_params_ptr' for clarity - fortunately haven't run out of 't' and 'r' letters yet in the kernel. Thanks, Ingo
On Wed, Oct 18, 2023 at 11:55 AM Ingo Molnar <mingo@kernel.org> wrote: > > > * Ard Biesheuvel <ardb@google.com> wrote: > > > From: Ard Biesheuvel <ardb@kernel.org> > > > > v2: > > add separate patch to rename the decompressor's version of the > > boot_params global variable > > > > Ard Biesheuvel (2): > > x86/boot: Rename conflicting boot_params pointer to boot_params_p > > x86/boot: efistub: Assign global boot_params variable > > > > arch/x86/boot/compressed/acpi.c | 14 +++++------ > > arch/x86/boot/compressed/cmdline.c | 4 +-- > > arch/x86/boot/compressed/ident_map_64.c | 7 +++--- > > arch/x86/boot/compressed/kaslr.c | 26 ++++++++++---------- > > arch/x86/boot/compressed/mem.c | 6 ++--- > > arch/x86/boot/compressed/misc.c | 24 +++++++++--------- > > arch/x86/boot/compressed/misc.h | 1 - > > arch/x86/boot/compressed/pgtable_64.c | 9 +++---- > > arch/x86/boot/compressed/sev.c | 2 +- > > arch/x86/include/asm/boot.h | 2 ++ > > drivers/firmware/efi/libstub/x86-stub.c | 2 ++ > > 11 files changed, 50 insertions(+), 47 deletions(-) > > Thanks! > > I renamed 'boot_params_p' to 'boot_params_ptr' for clarity - fortunately > haven't run out of 't' and 'r' letters yet in the kernel. > OK thanks. I noticed you queued this up for v6.7. So what should we do for v6.6 wrt the second patch?
* Ard Biesheuvel <ardb@google.com> wrote: > On Wed, Oct 18, 2023 at 11:55 AM Ingo Molnar <mingo@kernel.org> wrote: > > > > > > * Ard Biesheuvel <ardb@google.com> wrote: > > > > > From: Ard Biesheuvel <ardb@kernel.org> > > > > > > v2: > > > add separate patch to rename the decompressor's version of the > > > boot_params global variable > > > > > > Ard Biesheuvel (2): > > > x86/boot: Rename conflicting boot_params pointer to boot_params_p > > > x86/boot: efistub: Assign global boot_params variable > > > > > > arch/x86/boot/compressed/acpi.c | 14 +++++------ > > > arch/x86/boot/compressed/cmdline.c | 4 +-- > > > arch/x86/boot/compressed/ident_map_64.c | 7 +++--- > > > arch/x86/boot/compressed/kaslr.c | 26 ++++++++++---------- > > > arch/x86/boot/compressed/mem.c | 6 ++--- > > > arch/x86/boot/compressed/misc.c | 24 +++++++++--------- > > > arch/x86/boot/compressed/misc.h | 1 - > > > arch/x86/boot/compressed/pgtable_64.c | 9 +++---- > > > arch/x86/boot/compressed/sev.c | 2 +- > > > arch/x86/include/asm/boot.h | 2 ++ > > > drivers/firmware/efi/libstub/x86-stub.c | 2 ++ > > > 11 files changed, 50 insertions(+), 47 deletions(-) > > > > Thanks! > > > > I renamed 'boot_params_p' to 'boot_params_ptr' for clarity - fortunately > > haven't run out of 't' and 'r' letters yet in the kernel. > > > > OK thanks. > > I noticed you queued this up for v6.7. > So what should we do for v6.6 wrt the second patch? I presumed you'd queue it up in the EFI tree, and I'll merge it & resolve the conflict once it hits upstream? Thanks, Ingo
On Wed, 18 Oct 2023 at 14:31, Ingo Molnar <mingo@kernel.org> wrote: > > > * Ard Biesheuvel <ardb@google.com> wrote: > > > On Wed, Oct 18, 2023 at 11:55 AM Ingo Molnar <mingo@kernel.org> wrote: > > > > > > > > > * Ard Biesheuvel <ardb@google.com> wrote: > > > > > > > From: Ard Biesheuvel <ardb@kernel.org> > > > > > > > > v2: > > > > add separate patch to rename the decompressor's version of the > > > > boot_params global variable > > > > > > > > Ard Biesheuvel (2): > > > > x86/boot: Rename conflicting boot_params pointer to boot_params_p > > > > x86/boot: efistub: Assign global boot_params variable > > > > > > > > arch/x86/boot/compressed/acpi.c | 14 +++++------ > > > > arch/x86/boot/compressed/cmdline.c | 4 +-- > > > > arch/x86/boot/compressed/ident_map_64.c | 7 +++--- > > > > arch/x86/boot/compressed/kaslr.c | 26 ++++++++++---------- > > > > arch/x86/boot/compressed/mem.c | 6 ++--- > > > > arch/x86/boot/compressed/misc.c | 24 +++++++++--------- > > > > arch/x86/boot/compressed/misc.h | 1 - > > > > arch/x86/boot/compressed/pgtable_64.c | 9 +++---- > > > > arch/x86/boot/compressed/sev.c | 2 +- > > > > arch/x86/include/asm/boot.h | 2 ++ > > > > drivers/firmware/efi/libstub/x86-stub.c | 2 ++ > > > > 11 files changed, 50 insertions(+), 47 deletions(-) > > > > > > Thanks! > > > > > > I renamed 'boot_params_p' to 'boot_params_ptr' for clarity - fortunately > > > haven't run out of 't' and 'r' letters yet in the kernel. > > > > > > > OK thanks. > > > > I noticed you queued this up for v6.7. > > So what should we do for v6.6 wrt the second patch? > > I presumed you'd queue it up in the EFI tree, and I'll merge it & resolve > the conflict once it hits upstream? > Yup, works for me - I just wanted to double check.
From: Ard Biesheuvel <ardb@kernel.org> v2: add separate patch to rename the decompressor's version of the boot_params global variable Ard Biesheuvel (2): x86/boot: Rename conflicting boot_params pointer to boot_params_p x86/boot: efistub: Assign global boot_params variable arch/x86/boot/compressed/acpi.c | 14 +++++------ arch/x86/boot/compressed/cmdline.c | 4 +-- arch/x86/boot/compressed/ident_map_64.c | 7 +++--- arch/x86/boot/compressed/kaslr.c | 26 ++++++++++---------- arch/x86/boot/compressed/mem.c | 6 ++--- arch/x86/boot/compressed/misc.c | 24 +++++++++--------- arch/x86/boot/compressed/misc.h | 1 - arch/x86/boot/compressed/pgtable_64.c | 9 +++---- arch/x86/boot/compressed/sev.c | 2 +- arch/x86/include/asm/boot.h | 2 ++ drivers/firmware/efi/libstub/x86-stub.c | 2 ++ 11 files changed, 50 insertions(+), 47 deletions(-)