From: Borislav Petkov Subject: [PATCH] x86, AMD: Fix crash as Xen Dom0 on AMD Trinity systems Date: Wed, 30 May 2012 19:47:10 +0200 Message-ID: <1338400030-8920-1-git-send-email-bp@amd64.org> References: <20120530173247.GC15635@x1.osrc.amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20120530173247.GC15635@x1.osrc.amd.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: "H. Peter Anvin" Cc: Andre Przywara , jeremy@goop.org, xen-devel@lists.xensource.com, Konrad Rzeszutek Wilk , Jacob Shin , LKML , stable@vger.kernel.org, Borislav Petkov , Jan Beulich , Thomas Gleixner , Ingo Molnar List-Id: xen-devel@lists.xenproject.org From: Andre Przywara Switch to the standard {rd,wr}msr*_safe* variants which should've been used in the first place anyway and avoided unneeded excitation with xen. Signed-off-by: Andre Przywara Cc: stable@vger.kernel.org # 3.4+ Link: [Boris: correct commit message] Signed-off-by: Borislav Petkov --- arch/x86/kernel/cpu/amd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 146bb6218eec..80ccd99542e6 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -586,9 +586,9 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) !cpu_has(c, X86_FEATURE_TOPOEXT)) { u64 val; - if (!rdmsrl_amd_safe(0xc0011005, &val)) { + if (!rdmsrl_safe(0xc0011005, &val)) { val |= 1ULL << 54; - wrmsrl_amd_safe(0xc0011005, val); + checking_wrmsrl(0xc0011005, val); rdmsrl(0xc0011005, val); if (val & (1ULL << 54)) { set_cpu_cap(c, X86_FEATURE_TOPOEXT); -- 1.7.9.3.362.g71319