From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932972AbcLSJ5H (ORCPT ); Mon, 19 Dec 2016 04:57:07 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56088 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932802AbcLSJ5G (ORCPT ); Mon, 19 Dec 2016 04:57:06 -0500 Date: Mon, 19 Dec 2016 01:56:53 -0800 From: tip-bot for Boris Ostrovsky Message-ID: Cc: hpa@zytor.com, jgross@suse.com, tglx@linutronix.de, boris.ostrovsky@oracle.com, mingo@kernel.org, bp@suse.de, linux-kernel@vger.kernel.org Reply-To: linux-kernel@vger.kernel.org, bp@suse.de, boris.ostrovsky@oracle.com, mingo@kernel.org, tglx@linutronix.de, jgross@suse.com, hpa@zytor.com In-Reply-To: <20161218164414.9649-5-bp@alien8.de> References: <1481906392-3847-1-git-send-email-boris.ostrovsky@oracle.com> <20161218164414.9649-5-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/microcode/AMD: Use native_cpuid() in load_ucode_amd_bsp() Git-Commit-ID: 2b4c91569a40c4512ea1b413e0c817d179ce9868 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 2b4c91569a40c4512ea1b413e0c817d179ce9868 Gitweb: http://git.kernel.org/tip/2b4c91569a40c4512ea1b413e0c817d179ce9868 Author: Boris Ostrovsky AuthorDate: Sun, 18 Dec 2016 17:44:14 +0100 Committer: Thomas Gleixner CommitDate: Mon, 19 Dec 2016 10:46:20 +0100 x86/microcode/AMD: Use native_cpuid() in load_ucode_amd_bsp() When CONFIG_PARAVIRT is selected, cpuid() becomes a call. Since for 32-bit kernels load_ucode_amd_bsp() is executed before paging is enabled the call cannot be completed (as kernel virtual addresses are not reachable yet). Use native_cpuid() instead which is an asm wrapper for the CPUID instruction. Signed-off-by: Boris Ostrovsky Signed-off-by: Borislav Petkov Cc: Jürgen Gross Link: http://lkml.kernel.org/r/1481906392-3847-1-git-send-email-boris.ostrovsky@oracle.com Link: http://lkml.kernel.org/r/20161218164414.9649-5-bp@alien8.de Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/amd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index dc80acf..6a31e26 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -301,6 +301,7 @@ static bool get_builtin_microcode(struct cpio_data *cp, unsigned int family) void __init load_ucode_amd_bsp(unsigned int family) { struct ucode_cpu_info *uci; + u32 eax, ebx, ecx, edx; struct cpio_data cp; const char *path; bool use_pa; @@ -322,7 +323,10 @@ void __init load_ucode_amd_bsp(unsigned int family) return; /* Get BSP's CPUID.EAX(1), needed in load_microcode_amd() */ - uci->cpu_sig.sig = cpuid_eax(1); + eax = 1; + ecx = 0; + native_cpuid(&eax, &ebx, &ecx, &edx); + uci->cpu_sig.sig = eax; apply_microcode_early_amd(cp.data, cp.size, true, NULL); }