I can confirm 5.3-rc5 is booting again from internal M2 drive on
Skylake i5 NUC with this commit - many thanks!
Regards
Neil
On Wed, 21 Aug 2019 at 20:25, John Hubbard <[email protected]> wrote:
>
> commit a90118c445cc ("x86/boot: Save fields explicitly, zero out
> everything else") had two errors:
>
> * It preserved boot_params.acpi_rsdp_addr, and
> * It failed to preserve boot_params.hdr
>
> Therefore, zero out acpi_rsdp_addr, and preserve hdr.
>
> Fixes: a90118c445cc ("x86/boot: Save fields explicitly, zero out everything else")
> Reported-by: Neil MacLeod <[email protected]>
> Suggested-by: Thomas Gleixner <[email protected]>
> Cc: H. Peter Anvin <[email protected]>
> Cc: [email protected]
> Signed-off-by: John Hubbard <[email protected]>
> ---
> arch/x86/include/asm/bootparam_utils.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/include/asm/bootparam_utils.h b/arch/x86/include/asm/bootparam_utils.h
> index f5e90a849bca..9e5f3c722c33 100644
> --- a/arch/x86/include/asm/bootparam_utils.h
> +++ b/arch/x86/include/asm/bootparam_utils.h
> @@ -59,7 +59,6 @@ static void sanitize_boot_params(struct boot_params *boot_params)
> BOOT_PARAM_PRESERVE(apm_bios_info),
> BOOT_PARAM_PRESERVE(tboot_addr),
> BOOT_PARAM_PRESERVE(ist_info),
> - BOOT_PARAM_PRESERVE(acpi_rsdp_addr),
> BOOT_PARAM_PRESERVE(hd0_info),
> BOOT_PARAM_PRESERVE(hd1_info),
> BOOT_PARAM_PRESERVE(sys_desc_table),
> @@ -71,6 +70,7 @@ static void sanitize_boot_params(struct boot_params *boot_params)
> BOOT_PARAM_PRESERVE(eddbuf_entries),
> BOOT_PARAM_PRESERVE(edd_mbr_sig_buf_entries),
> BOOT_PARAM_PRESERVE(edd_mbr_sig_buffer),
> + BOOT_PARAM_PRESERVE(hdr),
> BOOT_PARAM_PRESERVE(e820_table),
> BOOT_PARAM_PRESERVE(eddbuf),
> };
> --
> 2.22.1
>
On Wed, 21 Aug 2019, Neil MacLeod wrote:
> I can confirm 5.3-rc5 is booting again from internal M2 drive on
> Skylake i5 NUC with this commit - many thanks!
I've queued that in x86/urgent and it's en route for rc6 and stable.
Thanks!
tglx
On Wed, Aug 21, 2019 at 11:24:28PM +0200, Thomas Gleixner wrote:
> On Wed, 21 Aug 2019, Neil MacLeod wrote:
>
> > I can confirm 5.3-rc5 is booting again from internal M2 drive on
> > Skylake i5 NUC with this commit - many thanks!
>
> I've queued that in x86/urgent and it's en route for rc6 and stable.
I've dropped the original patch from the stable trees now to wait for
this fix to hit Linus's tree.
Also the original doesn't seem to have fixed the build warning I'm
seeing on my Fedora test build systems, which is odd, I need to dig into
that...
thanks,
greg k-h