From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756233AbbJ1TDj (ORCPT ); Wed, 28 Oct 2015 15:03:39 -0400 Received: from mail-by2on0088.outbound.protection.outlook.com ([207.46.100.88]:45461 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755515AbbJ1TDA (ORCPT ); Wed, 28 Oct 2015 15:03:00 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=amd.com; alien8.de; dkim=none (message not signed) header.d=none;alien8.de; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0NWY28V-08-GAR-02 X-M-MSG: From: Aravind Gopalakrishnan To: , , , , , CC: , , , , , , , Subject: [PATCH V2 1/2] x86/mcheck: Add Scalable MCA cpuid bit Date: Wed, 28 Oct 2015 14:03:29 -0500 Message-ID: <1446059010-28010-2-git-send-email-Aravind.Gopalakrishnan@amd.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1446059010-28010-1-git-send-email-Aravind.Gopalakrishnan@amd.com> References: <1446059010-28010-1-git-send-email-Aravind.Gopalakrishnan@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.222;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(189002)(199003)(101416001)(105586002)(76176999)(575784001)(106466001)(5001770100001)(5003600100002)(86362001)(2201001)(50986999)(87936001)(36756003)(5003940100001)(229853001)(50466002)(48376002)(19580405001)(97736004)(11100500001)(19580395003)(5008740100001)(189998001)(47776003)(50226001)(5007970100001)(77096005)(2950100001)(92566002)(53416004);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0717;H:atltwp02.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0717;2:FtEnaHMTOl7Md/4sn+09XpOWJPuAiHv3jUjscozUlZgjClBRw/BMF0R348q4ZPYPhh56HvTNDd0pP/cS5eFBZKZQp+at4EJcTVknp1IyZay43pjb9nnaVs10cbaXMfgn4cIWqjaxMRMsyM7qq7e103GVW3ua7W9NIM8fNRb+BoE=;3:7wCC4wuC/Qn+ASWKw8pRNOPOsx+t/MTWc7RInIRnEzFjuJm5NJsazW/CGc+diOdtND3iZxHQRK/mMnXmPBgcX1Vcn5n+DVGPyaVsREPb9s8uKyNhDv+pibISHjOuZU/hvAsLsh5EB4PbebsvqtlqxvCNRXjrh6bJ0kboalEsXCgBMOpGdFV9Dpspj/FAt8w2dC9mZZ925R8Cpe0hhhMzv7kzFYF80ekNnmzhNgK0I2Kln6jPCxV8i4OlZuC5g53/;25:gxTvl5K8vGvXlzKvUnHb86KxXGGqfPYCGpvpfHGi2dd91pQ4Pf2PkqdcnmpRCHFZwRqkXvOFkrpR201MDPhFwQGh7qnWi3DuKz0w+o2bNOlde6+dATARoSSgiIqG3wRBz+iuUNCDo7zM/hnM2u3u1f3Q3gB1Cz08P0Uai4D+uiOL+FAqifhsU9KOxwnmacfwRi9fCpW4g4FZHNUovPMA/fpxYsEL4OU8H3r5W2sNoab0hntcg3CAWFDCXL+JM6yfxvInpV5ni+vajglZAIwn8g== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0717; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0717;20:txJSiR+MzCe4rwzYGb7ix79Em3wKdQmjjtlBUeYxg0MK+Sncg4PYzwh+NOqLoT8ElbxN2CzcHtsiQqzOR1yWnsHUqDDMDUzvEwZnWEpKqeMQdi9mO8pey8dlsYH8Gh7Z1mLXZN59aWGEdAkJhHj8irvpiqorMzN6VI2TpaWvRAAFzxZ5X/1egDnLvjSE4vAxSfocdqIar/Nm6b37SkEMgust72VNbDIb57VhCDi11UP4Jdre6rPxOIkseobH24CzTZhw6yU+qdAKW97pS2WD3U3sTAavak4MvM5KAwvgOkRS74nvEkOFht1b7HvN4CwV148NFV/qbbwzOXLWqWw3ygRtYBLRbp92Aqo7NpIsicvzX706p7xnFlXdil8thqP2gtu5sKwWRJBoyqThJC4Zabr6QEeGjZRAFf5CIWNtcrrf9NtX1NoEgvVQ/JTF1J0rujf/5T0/5VbyE3SdtXL+SpTg41q7f1BHt3kKT0FNbZhiyVZG6alEF/jjS4L9++Yk;4:nA9e9ctq+L6hOtgMTrfjVA+TwliCi1KsME+ar/uMskqCUKbyzaPAgG+0o9bgCKby/YQ/U5aEnQMReZHCQztofuvFjsni4OkwE3IsGQJ0CGXiR7fCcZPj5XBGbOTwOabgC5Wr7fKPewdXtFm1KZF6hgvy/YQsWBFyVLeHNCD98DbI/0wP0N1ebjcchg+YYnVJMEW8lHS5MEalfxBD5lPlBn/a15+H6fPGLzCvoy4dKfSRCzVBXJs/WdxV5OH0DFmWvFtvoIHnJvdtemNfSufKIgmaFnfkUU0298LqLUkDGR0wXtnSGvKKNwVHVKTacAgkrOviTw+l1NOTiaoyd7x83KBS4F2Hczc/ors8tHQ6NxsSYBgEysIz02SeZDLKIwk3Zu4tUqEeDyiyeo3xnGnlQQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(10201501046)(3002001)(102215026);SRVR:SN1PR12MB0717;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0717; X-Forefront-PRVS: 0743E8D0A6 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR12MB0717;23:CANVaAzJL+YDDBrLAWxNNeLa9xBsbFUjhZd/Cipds?= =?us-ascii?Q?ii6nPnhbEiyBELANJEHO2RYqjEE81B/apkr9KfJTCbEj4FpktPlYOga7pV/b?= =?us-ascii?Q?FLiWCcruNk3ewx5UgTjKNadwP95112b0Ztfcf0khXB9v5p3/QWGhbFDWEECq?= =?us-ascii?Q?VqUsQmumY9OTuxnr36zlKf0NIjFxPnDZ/Igz/ZF4cETBXJi9TOMpRbY2wa7U?= =?us-ascii?Q?LyQmc9y15VabYe+qBFf7S1ZPaaR1yJvUQUxRpvHoAqj/T8FIToUnKQE62vHT?= =?us-ascii?Q?Epnr5hDf7w3lxRwAWQVeZbTdTKDfgGCTM7WruvWkpVB/gN0Wlzfl2FQRRqkY?= =?us-ascii?Q?JMkgBm4Ud/HbxKX0kShEcAe48KgtSXFkkDW+3monVGr+8EImWGIMqwGhPucC?= =?us-ascii?Q?QUyLh7Vh4cbgeIlH6JvpZ4V+GnonMAWOUPN95kukFbUnnBsmfnBSmieiyyLU?= =?us-ascii?Q?U8NcaCXzuXq7mBeoBsVjijxOz2q0G0QnkHwfROACLVxh1LtAGJbmQNApjFM+?= =?us-ascii?Q?rHypeeezualdjbX0qK6jvHY17YxplKSMNCxKFUMgk6JX/mx2t8CbQLLBuj/w?= =?us-ascii?Q?63S4jNjpU0YWdmn0ouJOnYX2oHXo1vVpNmNk/joQFSxw/Clr99vVIcoWarNJ?= =?us-ascii?Q?4iIGtxVeT0a5Az4YY/ZMe4pJoHY6YF976YnqszCvUPBACS+UjLVqsS8dA3f8?= =?us-ascii?Q?hybDYTrQwY6HVu0azOvsKMsdR4pKYSwRY32zsvM4IecCyjZh4rDJNf9DwmCi?= =?us-ascii?Q?HZRgLNBaUORqOfeea1HWEq6AeGWu4He4fVDFczM0UQMKDpPtR8Z2Zm8qumG7?= =?us-ascii?Q?Db7IKz9N6H0IDLrBWu933J4vMQxDLLb5uM66gaExaBnj4sy7hKzxfo9T59Ns?= =?us-ascii?Q?+CxpUUPVOyG/lLe5OvHMp9nTnJZXQZ2ga7DF4GotlLKfAsGVabYakKTV7oUz?= =?us-ascii?Q?CiYmAGIyqFCNMimGZUni9fp0RZRlPLJooyRb7Gw7A=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0717;5:mbXqUFYYbkxXkBJ+5Fjt2mFxUO5CDgTlV72jN4nSC++D7thuuA/L7aDcknhqL0VLDP0E0khOT379UMTMKxp0JivaV6FL1jG7Mje9kjZ/wREWx+hEUVL8xcyvj/gKT07bTWneULJGjBp/Nw+gySFMXw==;24:M3+I/vbZXMEa+KSr6AVz9wnp2984XD/brMtNekDHvb9FIyRw420KinUD4EIvyJr8LQXqb4dxu1nlBGFNmXAI0NVK4Eq0aSv7nAOLwoVZbz8=;20:LZvI6UNJ3ZdasREKrjg2RMC2bHAYdh3dDG9N+w0W1NZdFYp0YXLHetFaRuUX8ngcsZBB5s/TkZ2PZvZRfdhYIT95/NjzUmoGk9JpsZ4ut84Pgg83X7q9Eo9MbHRyQBS4QdHzhoTX6tbAKOHlggVqqWWp5huuy5+zy1/39r1a7XYMC+g3/JTs7gwfAvUtHt/EGqn1pcL5pamsYAu4HhUCqdTs2ADpXtHbdmez15dACFRAQt9+9KvS9zGBlO9WXjn6 SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2015 19:02:56.8213 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.222];Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0717 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Scalable MCA (SMCA) is a new feature in AMD Fam17h processors which indicates presence of MCA extensions. MCA extensions expands existing register space for the MCE banks and also introduces a new MSR range to accommodate new banks. Future additions to AMD MCE code will first need to detect if SMCA is enabled before enabling the new features. Adding code to detect if it SMCA is enabled in this patch and store that info in mce_vendor_flags structure. Signed-off-by: Aravind Gopalakrishnan --- arch/x86/include/asm/mce.h | 13 ++++++++++++- arch/x86/kernel/cpu/mcheck/mce.c | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 2dbc0bf..63307b5 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -135,7 +135,18 @@ struct mce_vendor_flags { * in HW and deferred error interrupts. */ succor : 1, - __reserved_0 : 62; + + /* + * Scalable MCA: This bit indicates support for MCAX + * (MCA EXtensions) which expands the register space + * for each MCA bank and also increases number of + * banks. Also, to accommodate the new banks and + * registers, the MCA register space is moved to a new + * MSR range + */ + smca : 1, + + __reserved_0 : 61; }; extern struct mce_vendor_flags mce_flags; diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 17b5ec6..3d631c4 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1605,6 +1605,8 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c) mce_amd_feature_init(c); mce_flags.overflow_recov = !!(ebx & BIT(0)); mce_flags.succor = !!(ebx & BIT(1)); + mce_flags.smca = !!(ebx & BIT(3)); + break; } -- 2.6.1