linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Fenghua Yu <fenghua.yu@intel.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
	fenghua.yu@intel.com, tglx@linutronix.de, hpa@linux.intel.com
Subject: [tip:x86/microcode] x86/microcode_core_early.c: Define interfaces for early loading ucode
Date: Thu, 31 Jan 2013 14:29:50 -0800	[thread overview]
Message-ID: <tip-a8ebf6d1d6971b90a20f5bd0465e6d520377e33b@git.kernel.org> (raw)
In-Reply-To: <1356075872-3054-6-git-send-email-fenghua.yu@intel.com>

Commit-ID:  a8ebf6d1d6971b90a20f5bd0465e6d520377e33b
Gitweb:     http://git.kernel.org/tip/a8ebf6d1d6971b90a20f5bd0465e6d520377e33b
Author:     Fenghua Yu <fenghua.yu@intel.com>
AuthorDate: Thu, 20 Dec 2012 23:44:25 -0800
Committer:  H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Thu, 31 Jan 2013 13:19:12 -0800

x86/microcode_core_early.c: Define interfaces for early loading ucode

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>
Link: http://lkml.kernel.org/r/1356075872-3054-6-git-send-email-fenghua.yu@intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 arch/x86/include/asm/microcode.h       | 14 +++++++
 arch/x86/kernel/microcode_core_early.c | 76 ++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index 43d921b..6825e2e 100644
--- a/arch/x86/include/asm/microcode.h
+++ b/arch/x86/include/asm/microcode.h
@@ -57,4 +57,18 @@ static inline struct microcode_ops * __init init_amd_microcode(void)
 static inline void __exit exit_amd_microcode(void) {}
 #endif
 
+#ifdef CONFIG_MICROCODE_EARLY
+#define MAX_UCODE_COUNT 128
+extern void __init load_ucode_bsp(void);
+extern __init void load_ucode_ap(void);
+extern int __init save_microcode_in_initrd(void);
+#else
+static inline void __init load_ucode_bsp(void) {}
+static inline __init void load_ucode_ap(void) {}
+static inline int __init save_microcode_in_initrd(void)
+{
+	return 0;
+}
+#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..577db84
--- /dev/null
+++ b/arch/x86/kernel/microcode_core_early.c
@@ -0,0 +1,76 @@
+/*
+ *	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 <asm/microcode_intel.h>
+#include <asm/processor.h>
+
+#define QCHAR(a, b, c, d) ((a) + ((b) << 8) + ((c) << 16) + ((d) << 24))
+#define CPUID_INTEL1 QCHAR('G', 'e', 'n', 'u')
+#define CPUID_INTEL2 QCHAR('i', 'n', 'e', 'I')
+#define CPUID_INTEL3 QCHAR('n', 't', 'e', 'l')
+#define CPUID_AMD1 QCHAR('A', 'u', 't', 'h')
+#define CPUID_AMD2 QCHAR('e', 'n', 't', 'i')
+#define CPUID_AMD3 QCHAR('c', 'A', 'M', 'D')
+
+#define CPUID_IS(a, b, c, ebx, ecx, edx)	\
+		(!((ebx ^ (a))|(edx ^ (b))|(ecx ^ (c))))
+
+/*
+ * In early loading microcode phase on BSP, boot_cpu_data is not set up yet.
+ * x86_vendor() gets vendor id for BSP.
+ *
+ * In 32 bit AP case, accessing boot_cpu_data needs linear address. To simplify
+ * coding, we still use x86_vendor() to get vendor id for AP.
+ *
+ * x86_vendor() gets vendor information directly through cpuid.
+ */
+static int __cpuinit x86_vendor(void)
+{
+	u32 eax = 0x00000000;
+	u32 ebx, ecx = 0, edx;
+
+	if (!have_cpuid_p())
+		return X86_VENDOR_UNKNOWN;
+
+	native_cpuid(&eax, &ebx, &ecx, &edx);
+
+	if (CPUID_IS(CPUID_INTEL1, CPUID_INTEL2, CPUID_INTEL3, ebx, ecx, edx))
+		return X86_VENDOR_INTEL;
+
+	if (CPUID_IS(CPUID_AMD1, CPUID_AMD2, CPUID_AMD3, ebx, ecx, edx))
+		return X86_VENDOR_AMD;
+
+	return X86_VENDOR_UNKNOWN;
+}
+
+void __init load_ucode_bsp(void)
+{
+	int vendor = x86_vendor();
+
+	if (vendor == X86_VENDOR_INTEL)
+		load_ucode_intel_bsp();
+}
+
+void __cpuinit load_ucode_ap(void)
+{
+	int vendor = x86_vendor();
+
+	if (vendor == X86_VENDOR_INTEL)
+		load_ucode_intel_ap();
+}

  reply	other threads:[~2013-01-31 22:30 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-21  7:44 [PATCH v5 00/12] x86/microcode: Early load microcode Fenghua Yu
2012-12-21  7:44 ` [PATCH v5 01/12] Documentation/x86: " Fenghua Yu
2013-01-31 22:25   ` [tip:x86/microcode] x86, doc: Documentation for early microcode loading tip-bot for Fenghua Yu
2012-12-21  7:44 ` [PATCH v5 02/12] x86/microcode_intel.h: Define functions and macros for early loading ucode Fenghua Yu
2013-01-31 22:26   ` [tip:x86/microcode] " tip-bot for Fenghua Yu
2012-12-21  7:44 ` [PATCH v5 03/12] x86/common.c: Make have_cpuid_p() a global function Fenghua Yu
2013-01-31 22:27   ` [tip:x86/microcode] " tip-bot for Fenghua Yu
2012-12-21  7:44 ` [PATCH v5 04/12] x86/common.c: load ucode in 64 bit or show loading ucode info in 32 bit on AP Fenghua Yu
2013-01-31 22:28   ` [tip:x86/microcode] " tip-bot for Fenghua Yu
2012-12-21  7:44 ` [PATCH v5 05/12] x86/microcode_core_early.c: Define interfaces for early loading ucode Fenghua Yu
2013-01-31 22:29   ` tip-bot for Fenghua Yu [this message]
2012-12-21  7:44 ` [PATCH v5 06/12] x86/microcode_intel_lib.c: Early update ucode on Intel's CPU Fenghua Yu
2013-01-31 22:31   ` [tip:x86/microcode] " tip-bot for Fenghua Yu
2012-12-21  7:44 ` [PATCH v5 07/12] x86/tlbflush.h: Define __native_flush_tlb_global_irq_disabled() Fenghua Yu
2013-01-31 22:32   ` [tip:x86/microcode] " tip-bot for Fenghua Yu
2012-12-21  7:44 ` [PATCH v5 08/12] x86/microcode_intel_early.c: Early update ucode on Intel's CPU Fenghua Yu
2013-01-31 22:33   ` [tip:x86/microcode] " tip-bot for Fenghua Yu
2012-12-21  7:44 ` [PATCH v5 09/12] x86/head_32.S: Early update ucode in 32-bit Fenghua Yu
2013-01-31 22:34   ` [tip:x86/microcode] " tip-bot for Fenghua Yu
2012-12-21  7:44 ` [PATCH v5 10/12] x86/head64.c: Early update ucode in 64-bit Fenghua Yu
2013-01-31 22:35   ` [tip:x86/microcode] " tip-bot for Fenghua Yu
2012-12-21  7:44 ` [PATCH v5 11/12] x86/mm/init.c: Copy ucode from initrd image to kernel memory Fenghua Yu
2013-01-31 22:37   ` [tip:x86/microcode] " tip-bot for Fenghua Yu
2012-12-21  7:44 ` [PATCH v5 12/12] x86/Kconfig: Configurations to enable/disable the feature Fenghua Yu
2013-01-31 22:38   ` [tip:x86/microcode] x86/Kconfig: Make early microcode loading a configuration feature tip-bot for Fenghua Yu
2013-01-03 17:44 ` [PATCH v5 00/12] x86/microcode: Early load microcode Konrad Rzeszutek Wilk
2013-01-03 17:48   ` H. Peter Anvin
2013-01-08 19:46     ` Konrad Rzeszutek Wilk
2013-01-08 19:47       ` H. Peter Anvin
2013-01-08 20:04         ` Konrad Rzeszutek Wilk
2013-01-08 20:16           ` H. Peter Anvin
2013-01-09 13:35           ` Konrad Rzeszutek Wilk
2023-10-09 12:29 ` [tip: x86/microcode] x86/microcode/32: Move early loading after paging enable tip-bot2 for Thomas Gleixner
  -- strict thread matches above, loose matches on Subject: below --
2012-11-30  1:47 [PATCH v2 03/10] x86/microcode_core_early.c: Define interfaces for early loading ucode Fenghua Yu
2012-12-01  0:23 ` [tip:x86/microcode] " tip-bot for Fenghua Yu

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-a8ebf6d1d6971b90a20f5bd0465e6d520377e33b@git.kernel.org \
    --to=fenghua.yu@intel.com \
    --cc=hpa@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /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).