From: "Fenghua Yu" <fenghua.yu@intel.com>
To: "H Peter Anvin" <hpa@zytor.com>, "Ingo Molnar" <mingo@elte.hu>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Asit K Mallick" <asit.k.mallick@intel.com>,
"Tigran Aivazian" <tigran@aivazian.fsnet.co.uk>,
"Andreas Herrmann" <andreas.herrmann3@amd.com>,
"Borislav Petkov" <borislav.petkov@amd.com>,
"linux-kernel" <linux-kernel@vger.kernel.org>,
"x86" <x86@kernel.org>
Cc: "Fenghua Yu" <fenghua.yu@intel.com>
Subject: [PATCH 04/11] x86/microcode_core_early.c: Define interfaces for early load ucode
Date: Sat, 18 Aug 2012 01:15:22 -0700 [thread overview]
Message-ID: <1345277729-8399-5-git-send-email-fenghua.yu@intel.com> (raw)
In-Reply-To: <1345277729-8399-1-git-send-email-fenghua.yu@intel.com>
From: Fenghua Yu <fenghua.yu@intel.com>
Define interfaces load_ucode_bsp() and load_ucode_ap() to load ucode on BSP and
AP in early boot time. These are generic interfaces. Internally they call
vendor specific implementations.
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
---
arch/x86/include/asm/microcode.h | 23 ++++++++++
arch/x86/kernel/microcode_core_early.c | 74 ++++++++++++++++++++++++++++++++
2 files changed, 97 insertions(+), 0 deletions(-)
create mode 100644 arch/x86/kernel/microcode_core_early.c
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index 4ebe157..080ea77 100644
--- a/arch/x86/include/asm/microcode.h
+++ b/arch/x86/include/asm/microcode.h
@@ -63,4 +63,27 @@ static inline struct microcode_ops * __init init_amd_microcode(void)
static inline void __exit exit_amd_microcode(void) {}
#endif
+struct mc_saved_data {
+ unsigned int mc_saved_count;
+ struct microcode_intel **mc_saved;
+ struct ucode_cpu_info *ucode_cpu_info;
+};
+#ifdef CONFIG_MICROCODE_EARLY
+#define MAX_UCODE_COUNT 128
+extern struct ucode_cpu_info ucode_cpu_info_early[NR_CPUS];
+extern struct microcode_intel __initdata *mc_saved_in_initrd[MAX_UCODE_COUNT];
+extern struct mc_saved_data mc_saved_data;
+extern void __init load_ucode_bsp(char *real_mode_data);
+extern __init void load_ucode_ap(void);
+extern void __init
+save_microcode_in_initrd(struct mc_saved_data *mc_saved_data,
+ struct microcode_intel **mc_saved_in_initrd);
+#else
+static inline void __init load_ucode_bsp(char *real_mode_data) {}
+static inline __init void load_ucode_ap(void) {}
+static inline void __init
+save_microcode_in_initrd(struct mc_saved_data *mc_saved_data,
+ struct microcode_intel **mc_saved_in_initrd) {}
+#endif
+
#endif /* _ASM_X86_MICROCODE_H */
diff --git a/arch/x86/kernel/microcode_core_early.c b/arch/x86/kernel/microcode_core_early.c
new file mode 100644
index 0000000..5bcc6f8
--- /dev/null
+++ b/arch/x86/kernel/microcode_core_early.c
@@ -0,0 +1,74 @@
+/*
+ * X86 CPU microcode early update for Linux
+ *
+ * Copyright (C) 2012 Fenghua Yu <fenghua.yu@intel.com>
+ * H Peter Anvin" <hpa@zytor.com>
+ *
+ * This driver allows to early upgrade microcode on Intel processors
+ * belonging to IA-32 family - PentiumPro, Pentium II,
+ * Pentium III, Xeon, Pentium 4, etc.
+ *
+ * Reference: Section 9.11 of Volume 3, IA-32 Intel Architecture
+ * Software Developer's Manual.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <asm/microcode_intel.h>
+#include <asm/processor.h>
+#include <asm/cpio.h>
+
+struct ucode_cpu_info ucode_cpu_info_early[NR_CPUS];
+EXPORT_SYMBOL_GPL(ucode_cpu_info_early);
+
+static __init enum ucode_state
+find_ucode_intel(unsigned long start, unsigned long end)
+{
+ unsigned int size = end - start + 1;
+ struct cpio_data cd = { 0, 0 };
+ char ucode_name[] = "kernel/x86/microcode/GenuineIntel/microcode.hex";
+
+ cd = find_cpio_data(ucode_name, (void *)start, size);
+ if (cd.data)
+ return UCODE_OK;
+
+ return UCODE_ERROR;
+}
+
+void __init load_ucode_bsp(char *real_mode_data)
+{
+ u64 ramdisk_image, ramdisk_size, ramdisk_end;
+ unsigned long initrd_start, initrd_end;
+ struct boot_params *boot_params;
+
+ boot_params = (struct boot_params *)real_mode_data;
+ ramdisk_image = boot_params->hdr.ramdisk_image;
+ ramdisk_size = boot_params->hdr.ramdisk_size;
+
+#ifdef CONFIG_X86_64
+ ramdisk_end = PAGE_ALIGN(ramdisk_image + ramdisk_size);
+ initrd_start = ramdisk_image + PAGE_OFFSET;
+#else
+ ramdisk_end = ramdisk_image + ramdisk_size;
+ initrd_start = ramdisk_image;
+#endif
+ initrd_end = initrd_start + ramdisk_size;
+
+ /*
+ * It's early to get CPU vendor info at this point.
+ * By searching initrd to find right name for vendor's microcode,
+ * it's relative easier to get CPU vendor info.
+ */
+ if (find_ucode_intel(initrd_start, initrd_end) == UCODE_OK)
+ load_ucode_intel_bsp(real_mode_data);
+}
+
+void __cpuinit load_ucode_ap(void)
+{
+ if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)
+ load_ucode_intel_ap();
+}
--
1.7.2
next prev parent reply other threads:[~2012-08-18 8:31 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-18 8:15 [PATCH 00/11] x86/microcode: Early load microcode Fenghua Yu
2012-08-18 8:15 ` [PATCH 01/11] Documentation/x86: " Fenghua Yu
2012-08-20 12:26 ` Borislav Petkov
2012-08-18 8:15 ` [PATCH 02/11] x86/lib/cpio.c: Find cpio data by its file name Fenghua Yu
2012-08-18 22:12 ` Henrique de Moraes Holschuh
2012-08-18 23:23 ` Yu, Fenghua
2012-08-19 4:35 ` Henrique de Moraes Holschuh
2012-08-19 5:15 ` H. Peter Anvin
2012-08-20 13:29 ` Borislav Petkov
2012-08-18 8:15 ` [PATCH 03/11] x86/microcode_intel.h: Define functions and macros for early load ucode Fenghua Yu
2012-08-20 13:47 ` Borislav Petkov
2012-08-18 8:15 ` Fenghua Yu [this message]
2012-08-18 22:44 ` [PATCH 04/11] x86/microcode_core_early.c: Define interfaces " Henrique de Moraes Holschuh
2012-08-19 2:38 ` Yu, Fenghua
2012-08-19 4:43 ` Henrique de Moraes Holschuh
2012-08-19 5:24 ` H. Peter Anvin
2012-08-19 16:39 ` Yu, Fenghua
2012-08-20 14:06 ` Borislav Petkov
2012-08-20 20:08 ` H. Peter Anvin
2012-08-20 20:19 ` Borislav Petkov
2012-08-21 20:05 ` Yu, Fenghua
2012-08-21 20:13 ` H. Peter Anvin
2012-08-21 20:48 ` Borislav Petkov
2012-08-21 20:52 ` H. Peter Anvin
2012-08-21 20:52 ` Yu, Fenghua
2012-08-21 20:53 ` H. Peter Anvin
2012-08-21 20:58 ` Yu, Fenghua
2012-08-20 14:04 ` Borislav Petkov
2012-08-18 8:15 ` [PATCH 05/11] x86/microcode_intel_lib.c: Early update ucode on Intel's CPU Fenghua Yu
2012-08-20 15:31 ` Borislav Petkov
2012-08-20 16:24 ` Borislav Petkov
2012-08-18 8:15 ` [PATCH 06/11] x86/microcode_intel_early.c: " Fenghua Yu
2012-08-18 8:15 ` [PATCH 07/11] x86/head_32.S: Early update ucode in 32-bit Fenghua Yu
2012-08-18 8:15 ` [PATCH 08/11] x86/head64.c: Early update ucode in 64-bit Fenghua Yu
2012-08-18 8:15 ` [PATCH 09/11] x86/smpboot.c: Early update ucode on AP Fenghua Yu
2012-08-18 8:15 ` [PATCH 10/11] x86/mm/init.c: Copy ucode from initrd image to memory Fenghua Yu
2012-08-18 8:15 ` [PATCH 11/11] x86/Kconfig: Configurations to enable/disable the feature Fenghua Yu
2012-08-20 21:41 ` Paul Bolle
2012-08-20 15:39 ` [PATCH 00/11] x86/microcode: Early load microcode Borislav Petkov
2012-08-20 15:44 ` Yu, Fenghua
2012-08-20 18:51 ` H. Peter Anvin
2012-08-20 20:04 ` 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=1345277729-8399-5-git-send-email-fenghua.yu@intel.com \
--to=fenghua.yu@intel.com \
--cc=andreas.herrmann3@amd.com \
--cc=asit.k.mallick@intel.com \
--cc=borislav.petkov@amd.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=tigran@aivazian.fsnet.co.uk \
--cc=x86@kernel.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
Powered by JetHome