From: Borislav Petkov <bp@alien8.de>
To: Dominik Brodowski <linux@dominikbrodowski.net>,
Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/2] x86/microcode: Look for the initrd at the proper address on 32-bit
Date: Mon, 12 Jun 2017 19:58:53 +0200 [thread overview]
Message-ID: <20170612175854.14196-2-bp@alien8.de> (raw)
In-Reply-To: <20170612175854.14196-1-bp@alien8.de>
From: Borislav Petkov <bp@suse.de>
Early during boot, the BSP finds the ramdisk's position from boot_params
but by the time the APs get to boot, the BSP has continued in the mean
time and has potentially managed to relocate that ramdisk.
And in that case, the APs need to find the ramdisk at its new position,
in *physical* memory as they're running before paging has been enabled.
Thus, get the updated physical location of the ramdisk which is in the
relocated_ramdisk variable.
Signed-off-by: Borislav Petkov <bp@suse.de>
---
arch/x86/kernel/cpu/microcode/core.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index e53d3c909840..053e5cd1dce0 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -290,6 +290,18 @@ struct cpio_data find_microcode_in_initrd(const char *path, bool use_pa)
return (struct cpio_data){ NULL, 0, "" };
if (initrd_start)
start = initrd_start;
+ } else {
+ /*
+ * The picture on 32-bit is a bit different: we need to get
+ * the *physical* address to which the ramdisk was relocated,
+ * i.e., relocated_ramdisk (not initrd_start) and since we're
+ * running from physical addresses, we need to access
+ * relocated_ramdisk through its *physical* address.
+ */
+ u64 *rr = (u64 *)__pa_nodebug(&relocated_ramdisk);
+
+ if (*rr)
+ start = *rr;
}
return find_cpio_data(path, (void *)start, size, NULL);
--
2.13.0
next prev parent reply other threads:[~2017-06-12 17:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-12 17:58 [PATCH 0/2] microcode: Do early microcode application during resume-from-RAM Borislav Petkov
2017-06-12 17:58 ` Borislav Petkov [this message]
2017-06-12 17:58 ` [PATCH 2/2] x86/microcode/intel: Save pointer to ucode patch for early AP loading Borislav Petkov
2017-06-12 18:26 ` [PATCH 0/2] microcode: Do early microcode application during resume-from-RAM Henrique de Moraes Holschuh
2017-06-13 5:55 ` Dominik Brodowski
2017-06-13 8:29 ` Borislav Petkov
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=20170612175854.14196-2-bp@alien8.de \
--to=bp@alien8.de \
--cc=hmh@hmh.eng.br \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
/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