From: tip-bot for Dave Young <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: dyoung@redhat.com, mingo@kernel.org, hpa@zytor.com,
ge.song@hxt-semitech.com, torvalds@linux-foundation.org,
peterz@infradead.org, tglx@linutronix.de,
matt@codeblueprint.co.uk, pure.logic@nexus-software.ie,
ard.biesheuvel@linaro.org, linux-kernel@vger.kernel.org
Subject: [tip:efi/core] x86/efi: Fix kernel param add_efi_memmap regression
Date: Wed, 3 Jan 2018 08:17:43 -0800 [thread overview]
Message-ID: <tip-835bcec5fdf3f9e880111b482177e7e70e3596da@git.kernel.org> (raw)
In-Reply-To: <20180102172110.17018-2-ard.biesheuvel@linaro.org>
Commit-ID: 835bcec5fdf3f9e880111b482177e7e70e3596da
Gitweb: https://git.kernel.org/tip/835bcec5fdf3f9e880111b482177e7e70e3596da
Author: Dave Young <dyoung@redhat.com>
AuthorDate: Tue, 2 Jan 2018 17:21:09 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 3 Jan 2018 13:54:31 +0100
x86/efi: Fix kernel param add_efi_memmap regression
'add_efi_memmap' is an early param, but do_add_efi_memmap() has no
chance to run because the code path is before parse_early_param().
I believe it worked when the param was introduced but probably later
some other changes caused the wrong order and nobody noticed it.
Move efi_memblock_x86_reserve_range() after parse_early_param()
to fix it.
Signed-off-by: Dave Young <dyoung@redhat.com>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Bryan O'Donoghue <pure.logic@nexus-software.ie>
Cc: Ge Song <ge.song@hxt-semitech.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20180102172110.17018-2-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/setup.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 8af2e8d..145810b 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -906,9 +906,6 @@ void __init setup_arch(char **cmdline_p)
set_bit(EFI_BOOT, &efi.flags);
set_bit(EFI_64BIT, &efi.flags);
}
-
- if (efi_enabled(EFI_BOOT))
- efi_memblock_x86_reserve_range();
#endif
x86_init.oem.arch_setup();
@@ -962,6 +959,8 @@ void __init setup_arch(char **cmdline_p)
parse_early_param();
+ if (efi_enabled(EFI_BOOT))
+ efi_memblock_x86_reserve_range();
#ifdef CONFIG_MEMORY_HOTPLUG
/*
* Memory used by the kernel cannot be hot-removed because Linux
next prev parent reply other threads:[~2018-01-03 16:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-02 17:21 [GIT PULL 0/2] EFI fixes for v4.15 Ard Biesheuvel
2018-01-02 17:21 ` [PATCH 1/2] x86/efi: Fix kernel param add_efi_memmap regression Ard Biesheuvel
2018-01-03 16:17 ` tip-bot for Dave Young [this message]
2018-01-02 17:21 ` [PATCH 2/2] efi: capsule-loader: reinstate virtual capsule mapping Ard Biesheuvel
2018-01-03 16:18 ` [tip:efi/core] efi/capsule-loader: Reinstate " tip-bot for Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-835bcec5fdf3f9e880111b482177e7e70e3596da@git.kernel.org \
--to=tipbot@zytor.com \
--cc=ard.biesheuvel@linaro.org \
--cc=dyoung@redhat.com \
--cc=ge.song@hxt-semitech.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=pure.logic@nexus-software.ie \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).