From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932580AbcKHQTd (ORCPT ); Tue, 8 Nov 2016 11:19:33 -0500 Received: from terminus.zytor.com ([198.137.202.10]:51838 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932290AbcKHQTc (ORCPT ); Tue, 8 Nov 2016 11:19:32 -0500 Date: Tue, 8 Nov 2016 08:19:24 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: bp@suse.de, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org Reply-To: tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, bp@suse.de, linux-kernel@vger.kernel.org In-Reply-To: <20161101120911.13163-3-bp@alien8.de> References: <20161101120911.13163-3-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/RAS: Add TSC timestamp to the injected MCE Git-Commit-ID: 8c203dbb78ca7a9aed4e2570c866b0f43c752e41 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: 8c203dbb78ca7a9aed4e2570c866b0f43c752e41 Gitweb: http://git.kernel.org/tip/8c203dbb78ca7a9aed4e2570c866b0f43c752e41 Author: Borislav Petkov AuthorDate: Tue, 1 Nov 2016 13:04:41 +0100 Committer: Thomas Gleixner CommitDate: Tue, 8 Nov 2016 17:10:13 +0100 x86/RAS: Add TSC timestamp to the injected MCE The MCE injection code does not provide the time stamp information for the injected MCE. Add it. Signed-off-by: Borislav Petkov Link: http://lkml.kernel.org/r/20161101120911.13163-3-bp@alien8.de Signed-off-by: Thomas Gleixner --- arch/x86/ras/mce_amd_inj.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/ras/mce_amd_inj.c b/arch/x86/ras/mce_amd_inj.c index 1ac7647..8730c28 100644 --- a/arch/x86/ras/mce_amd_inj.c +++ b/arch/x86/ras/mce_amd_inj.c @@ -275,6 +275,8 @@ static void do_inject(void) unsigned int cpu = i_mce.extcpu; u8 b = i_mce.bank; + rdtscll(i_mce.tsc); + if (i_mce.misc) i_mce.status |= MCI_STATUS_MISCV;