Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753863AbcCHNPg (ORCPT ); Tue, 8 Mar 2016 08:15:36 -0500 Received: from torg.zytor.com ([198.137.202.12]:51676 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932140AbcCHNP3 (ORCPT ); Tue, 8 Mar 2016 08:15:29 -0500 Date: Tue, 8 Mar 2016 05:14:31 -0800 From: tip-bot for Aravind Gopalakrishnan Message-ID: Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, tony.luck@intel.com, peterz@infradead.org, hpa@zytor.com, bp@suse.de, Aravind.Gopalakrishnan@amd.com, torvalds@linux-foundation.org, linux-edac@vger.kernel.org, bp@alien8.de, mingo@kernel.org Reply-To: tony.luck@intel.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, bp@alien8.de, linux-edac@vger.kernel.org, torvalds@linux-foundation.org, bp@suse.de, Aravind.Gopalakrishnan@amd.com, hpa@zytor.com, peterz@infradead.org In-Reply-To: <1457021458-2522-6-git-send-email-Aravind.Gopalakrishnan@amd.com> References: <1457021458-2522-6-git-send-email-Aravind.Gopalakrishnan@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/mce/AMD: Document some functionality Git-Commit-ID: ea2ca36b658cfc6081ee454e97593c81f646806e 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 Content-Length: 3278 Lines: 91 Commit-ID: ea2ca36b658cfc6081ee454e97593c81f646806e Gitweb: http://git.kernel.org/tip/ea2ca36b658cfc6081ee454e97593c81f646806e Author: Aravind Gopalakrishnan AuthorDate: Mon, 7 Mar 2016 14:02:21 +0100 Committer: Ingo Molnar CommitDate: Tue, 8 Mar 2016 11:48:15 +0100 x86/mce/AMD: Document some functionality In an attempt to aid in understanding of what the threshold_block structure holds, provide comments to describe the members here. Also, trim comments around threshold_restart_bank() and update copyright info. No functional change is introduced. Signed-off-by: Aravind Gopalakrishnan [ Shorten comments. ] Signed-off-by: Borislav Petkov Cc: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Tony Luck Cc: linux-edac Link: http://lkml.kernel.org/r/1457021458-2522-6-git-send-email-Aravind.Gopalakrishnan@amd.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/amd_nb.h | 26 +++++++++++++++++--------- arch/x86/kernel/cpu/mcheck/mce_amd.c | 7 ++----- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h index 3c56ef1..5e828da 100644 --- a/arch/x86/include/asm/amd_nb.h +++ b/arch/x86/include/asm/amd_nb.h @@ -27,15 +27,23 @@ struct amd_l3_cache { }; struct threshold_block { - unsigned int block; - unsigned int bank; - unsigned int cpu; - u32 address; - u16 interrupt_enable; - bool interrupt_capable; - u16 threshold_limit; - struct kobject kobj; - struct list_head miscj; + unsigned int block; /* Number within bank */ + unsigned int bank; /* MCA bank the block belongs to */ + unsigned int cpu; /* CPU which controls MCA bank */ + u32 address; /* MSR address for the block */ + u16 interrupt_enable; /* Enable/Disable APIC interrupt */ + bool interrupt_capable; /* Bank can generate an interrupt. */ + + u16 threshold_limit; /* + * Value upon which threshold + * interrupt is generated. + */ + + struct kobject kobj; /* sysfs object */ + struct list_head miscj; /* + * List of threshold blocks + * within a bank. + */ }; struct threshold_bank { diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index a53eb1b..9d656fd 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -1,5 +1,5 @@ /* - * (c) 2005-2015 Advanced Micro Devices, Inc. + * (c) 2005-2016 Advanced Micro Devices, Inc. * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html @@ -201,10 +201,7 @@ static int lvt_off_valid(struct threshold_block *b, int apic, u32 lo, u32 hi) return 1; }; -/* - * Called via smp_call_function_single(), must be called with correct - * cpu affinity. - */ +/* Reprogram MCx_MISC MSR behind this threshold bank. */ static void threshold_restart_bank(void *_tr) { struct thresh_restart *tr = _tr;