From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753190AbbE0Sy4 (ORCPT ); Wed, 27 May 2015 14:54:56 -0400 Received: from mail-bn1bon0112.outbound.protection.outlook.com ([157.56.111.112]:45308 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751361AbbE0Sys (ORCPT ); Wed, 27 May 2015 14:54:48 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=amd.com; alien8.de; dkim=none (message not signed) header.d=none; X-WSS-ID: 0NP0V77-07-OXQ-02 X-M-MSG: From: Aravind Gopalakrishnan To: , , CC: , Subject: [PATCH 2/6] edac, mce_amd_inj: Rework sanity check for inj_bank_set Date: Wed, 27 May 2015 14:03:34 -0500 Message-ID: <1432753418-2985-3-git-send-email-Aravind.Gopalakrishnan@amd.com> X-Mailer: git-send-email 2.4.0 In-Reply-To: <1432753418-2985-1-git-send-email-Aravind.Gopalakrishnan@amd.com> References: <1432753418-2985-1-git-send-email-Aravind.Gopalakrishnan@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD027;1:tAEkLRlspduYu/tPHh2guE27WsoHABA9zzKV8RzyR0/hAExTnNgUUstT8INCePIYaoKACkwJopgCyz6VmdPETO7fKdgXHxLbmKS1QZK4elvAvfeaVOd8Sj6GM51G15KeFNyo44Gnmet75KwykG4x1diXY48ClrpCIxsVcz8ubVAAKLauGKusDQ5ZxxkJKqo531KpkqJO0Xnr+ntjlSetYOsdoDET36go1D2na5iLskCvTXM4ynIGuy4qfHsPTJQWi5LA6Zftp++Tq76NNbCDcA== X-Forefront-Antispam-Report: CIP:165.204.84.221;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(428002)(189002)(199003)(53416004)(50226001)(4001540100001)(97736004)(5001860100001)(5001830100001)(86362001)(5001770100001)(76176999)(50986999)(2950100001)(48376002)(50466002)(77156002)(62966003)(92566002)(36756003)(77096005)(68736005)(229853001)(46102003)(101416001)(106466001)(2201001)(189998001)(87936001)(19580405001)(19580395003)(105586002)(47776003)(64706001);DIR:OUT;SFP:1102;SCL:1;SRVR:CO1PR02MB080;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO1PR02MB080; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(520003)(5005006)(3002001);SRVR:CO1PR02MB080;BCL:0;PCL:0;RULEID:;SRVR:CO1PR02MB080; X-Forefront-PRVS: 05891FB07F X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2015 18:54:45.1247 (UTC) X-MS-Exchange-CrossTenant-Id: fde4dada-be84-483f-92cc-e026cbee8e96 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fde4dada-be84-483f-92cc-e026cbee8e96;Ip=[165.204.84.221];Helo=[atltwp01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR02MB080 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The number of banks for a given processor is encoded in MSR_IA32_MCG_CAP. So, use this to obtain the value and for sanity checking in inj_bank_set() instead of requiring a family/model check. Signed-off-by: Aravind Gopalakrishnan --- drivers/edac/mce_amd_inj.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/edac/mce_amd_inj.c b/drivers/edac/mce_amd_inj.c index 7f3a97a..15f6aa1 100644 --- a/drivers/edac/mce_amd_inj.c +++ b/drivers/edac/mce_amd_inj.c @@ -25,6 +25,8 @@ static struct mce i_mce; static struct dentry *dfs_inj; +static u8 n_banks; + #define MCE_INJECT_SET(reg) \ static int inj_##reg##_set(void *data, u64 val) \ { \ @@ -174,11 +176,9 @@ static int inj_bank_set(void *data, u64 val) { struct mce *m = (struct mce *)data; - if (val > 5) { - if (boot_cpu_data.x86 != 0x15 || val > 6) { - pr_err("Non-existent MCE bank: %llu\n", val); - return -EINVAL; - } + if (val >= n_banks) { + pr_err("Non-existent MCE bank: %llu\n", val); + return -EINVAL; } m->bank = val; @@ -207,6 +207,10 @@ static struct dfs_node { static int __init init_mce_inject(void) { int i; + u64 cap; + + rdmsrl(MSR_IA32_MCG_CAP, cap); + n_banks = cap & MCG_BANKCNT_MASK; dfs_inj = debugfs_create_dir("mce-inject", NULL); if (!dfs_inj) -- 2.4.0