From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751803AbdKTQ1D (ORCPT ); Mon, 20 Nov 2017 11:27:03 -0500 Received: from mail-bl2nam02on0070.outbound.protection.outlook.com ([104.47.38.70]:43197 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751680AbdKTQ1B (ORCPT ); Mon, 20 Nov 2017 11:27:01 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yazen.Ghannam@amd.com; From: Yazen Ghannam To: linux-edac@vger.kernel.org Cc: Yazen Ghannam , Borislav Petkov , Tony Luck , x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] x86/mce/AMD: Don't set DEF_INT_TYPE in MSR_CU_DEF_ERR on SMCA systems Date: Mon, 20 Nov 2017 10:26:46 -0600 Message-Id: <20171120162646.5210-1-Yazen.Ghannam@amd.com> X-Mailer: git-send-email 2.14.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: DM5PR19CA0005.namprd19.prod.outlook.com (10.175.226.143) To CY4PR1201MB0135.namprd12.prod.outlook.com (10.172.78.17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 68c169df-3566-4f1d-8338-08d5303385e6 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(2017052603258);SRVR:CY4PR1201MB0135; X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB0135;3:EKmfVvv+xfePRZ3nBP2WYbD/5MgQ08uioAnI8Vm4Hsp0QPdzg/WADVgO3lMXn4hzg2CL0TYRIiUtysO34QX2sopJYrSjvtNuQRVphuGKHdsUR3LTUrF5q6O3I9UfiIuAcPgfHDCC5A9Z+/v9ewpMWvQ4ndHefrmdA0hvsKyC9oKiKCHBD3vYxSxG+QV26CmIUz6Dj0CTahGAbZtm4oRhn9BiOHMq9n1lBP/7sozEgV6iaBR6/p2p6jwVUFCP2Vee;25:iXJ6H2uhDAxfdFkAomD62hoAIqH9imoq0UNCslA4j+8bBMC6Eohl2ZAEHPgzNeDO7HbUrd0TyBRN0cUIYVEqE7yr/R/yWxcYYlftFW0e6ZeN3Ddh+vBDX+MDQbhHwiD2Nwm8f6pluugoeO/7ItW9zzPuYkTrP/rE6lrD/dyGEIpoePyDORHv3hWr0/r2SSlyYS+EUx+CX7XQH3M6w3W/4Z5xM8fHTr0qPw117nWVKNqlq6YRc/+HcUcnd7dfJmb4Np2ugnWU5Eyd6Y7Pz72OfSAwT/DQrDlGRNRmfpyxF1gy2rhCnTDTfH/lvK3oyMS9F9xutzdwNuP5Vms0HD5EaA==;31:eSW9obk46/mDLTY6GEIVBWI+sE6QwLvcCVPQJseO+jgX1tBUlJKeNtBryqKFS3ajjh3yIFVGSIiKsZ8h7oFcle5fN4hogoOD+d4fESouo65stk/Xebx2hWdf/faCOde1rSPGpn5B2iIUg2MLK5caLjOAhGEkU9sYjAAcOr+7zFr50PBTAqH5FpxCaC4xqvL7H/Aln9O/tr+uWh0En04vvO07ceLRBZ8lDC52Nqt7jfQ= X-MS-TrafficTypeDiagnostic: CY4PR1201MB0135: X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB0135;20:rWg3cwduKDHkaZOC+059Lb0Ry61DGoOOAWX9CW6yP6pn84ZUGBA0l6T4igGM54ZqZ00tjQOn98ER46FfpVgF5VtobyzsFK8jA61sEJFQIF3wazixtfSnN5yCzAzOC6YRSJy1PKc9j0EAIhCV2mt2uA64ykC2usJHZiuAFP6OamEb67zhro9tFLnINrIUIpn1kB4yD/mNLxv4SZzoPgdIDDiBRY+9z6Ik5mLPN7Jno7tE/MTb6xEYX86PA4ygE4hWVZ/2U9qRUbpemycaFJZ21TwyU0sYCm7cFgrrPG5LvGsWRgZhDi3C2Ctj9Oa6ZVhgrRX5mv79JgBUPqjWKlVlPPVKh8wfqg4V2YKSCiEyOahfZa2qnCdEnUGHOqIp1wivbgh6YMaOMyhrgE8uyJKtXJpagSRKvkEE70CvStnvNqkX4P2iFlPeiShuZJSJ6G45w0/WVxMyReA8oT6oCRvhUxAhs8ykr+fk96W59IIOd5tLLk/5dWKVbC5rhdG0Le9p;4:ZqKw86rWkPiyBpQGQ4URYjhODm8Ryjhg96z6OQAinnfI1voplmA1v4pQN6BDXb9EaeZ1rL7A8pWuNullffuXhDUt399pBt3qztq2V3s94a/KNJummb3C+W9cYpyANMmxWeBVUsbEm6L0BNnkbrNzObGT+RnnykNh3gcc+AfIPwoZ8+sEgBP6Ml0/WnM052gB2m95BLet1nRHD2gwEh4LK2nu0ZBt6it1Ha1TVR6HTt2ctZ8EXhX0XMQj0FKyhd7vqAvV3d1oIuc3zBLEJgd34wPMs+JK32CWxkW/AqswnJ4BJBXNaLTvD7daABXR2VIb X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231022)(100000703101)(100105400095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(20161123555025)(20161123562025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CY4PR1201MB0135;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CY4PR1201MB0135; X-Forefront-PRVS: 04976078F0 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(346002)(376002)(39860400002)(189002)(199003)(4326008)(81156014)(47776003)(1076002)(6116002)(54906003)(8676002)(3846002)(16586007)(316002)(66066001)(86362001)(81166006)(50466002)(48376002)(25786009)(189998001)(305945005)(7736002)(53416004)(53936002)(5003940100001)(101416001)(68736007)(105586002)(6916009)(6666003)(8936002)(478600001)(97736004)(5660300001)(16526018)(2906002)(6486002)(50226002)(36756003)(2361001)(2351001)(106356001)(50986999)(72206003);DIR:OUT;SFP:1101;SCL:1;SRVR:CY4PR1201MB0135;H:yaz-diesel.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY4PR1201MB0135;23:LaexMwo1Cij+mTWKtetZptEaNqlFec48oStbRuS?= =?us-ascii?Q?A0pqF49EykVAnz+ta7AmbJgM1g7NlzgG97hXuokLcRV4hbi+bi7yhihI571B?= =?us-ascii?Q?SN+GdWIKwrYirjP6HswSHKXEAL5JWyJC3iB9VNc14OmRQ5tuQ30KzUYueI6I?= =?us-ascii?Q?9xIZe6r9ogEsay+Fuw0K3alA8qxiT+DSjlwMETX0h5WBXoYpLhVQs4jqs9Fv?= =?us-ascii?Q?dS26ve/higV/pFjLnN0h01PzLwOFxYpMULJWWeb27FkVT7reu/sdwhLLxznX?= =?us-ascii?Q?ca/pwSn8d/J2ciR7RlnEkfeO2J0GBycDecE9lc+CcZJ19dUiHFtjBpgq4Gr5?= =?us-ascii?Q?IUdkKuLg79zczkWiTS6GFIrfuhnd/CAHgL+PC30sLCN+UbMLlKmM54Z+5wjj?= =?us-ascii?Q?MhFnpM4PA59tpnrDqowTeyYObl4ttDRt/a+vZxSkxra2QYewafY46ywyMEwx?= =?us-ascii?Q?JQHNzXDkBZJkounfwvEhF20jJ+cRnlMW1PBcHR/eV7LmDFmmEQSglx6Hf3q8?= =?us-ascii?Q?B3ZlenrSljnD0WYnhaTnqYe1YIXfc+eWm+0Msq20Jq+yWVZaSEM/pB9l3aSZ?= =?us-ascii?Q?wj32nxrnp05XdWw9fMUCkUKSSo9Xy/y/87N6TNRUJfdnxTOx3LVDtYc1+gTn?= =?us-ascii?Q?zpoN4bdSMIlfp8pf32MmShcgjjBf0+nueE/c5aLk2gHrDScEHJ92vNoj4b5N?= =?us-ascii?Q?HniHvQoFtSfkfhlAW+l0pd3yRcBglhhzBtiUQWKDVpZMDJNE22MW3wmeCqUl?= =?us-ascii?Q?4s+SqIcVhnD1xy8I8k0xlp8ApSCgNNg1ay0FeWaCPjt2nDlIHpBGc5A9W26v?= =?us-ascii?Q?KHN2xf5pu8I/rcNsRLqB6P5vY2lt0IrNCx2uJuuOS5mBrnpBnaz1th6278Q4?= =?us-ascii?Q?Gyt2mREihCXAxW3pEWJCPXHF2BJ/I5vDiy1v3Gbpr6DteJrZQY03Yht6bJz+?= =?us-ascii?Q?5ei3L9n2itpc2IhPYinK5rRwqm758ZSBMQe0Jrj3zYkqQvHWbSqtUB0V+Nct?= =?us-ascii?Q?Dd/E9n1LCjt6jOa5M90ey2XxvzBlN+lLYGI+u55pRHr7+WfBLCDE6e/Opdn8?= =?us-ascii?Q?YrHAaz4+gzQzqn6pNBbqiJoge4E1r4xd+pOFbhLAUl4GVQnuCnA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB0135;6:71n/29ZZcTFqQLBq9hhAeo3Cgh2xpJ0lU0h7hZR34QQ2+QPqbDiKOU/FzpK6sR8FRxb6AUSej8FBraYamE0xSxxmSA5Z91Krpfw1dtOl0GsgPcVCe5NJOfqWBZPb4q7jougxMac+hXlNv2RutZskmpxN6cOlG/l+xzm3s9rkzvC7RhWAhx/DIv+YAk/OyE2HrDrlqk48pzyxytiXyVW4uRXM4jk+j/kb3pPN+d8uaa59t158A3bZblti6tEMi1MQeMCDKhCAfgXr3iZZAyOPuz6Z4DAFI+qIes1zOgam3qOOCY9NrJKemvIW/6p95zjLd2vqS2ouc7cTACMiI4+2iXms6BjFLQEAsT1GAYuZO1o=;5:7i/TSoWtA0K9lrEfm7yiD/YektHByHfK6dgaiEc3FSBl+8bIg0DvQcgbOzyPJdvcAMH4LdSA4MTyuL5ut5ryNU3RzrXoGAoAyZB+lgBW1h5cBZ4UBuI3nCCCyEbms1URCHKb5DJ2NUfEfVXzOKexZhhNPlcgI68yVVE0D1gKrBo=;24:RcSjj0Qt2UgMKnRuW05wrKkhEiG5HaIJEA6xK28xNrxvI2pp/ZL7iJ2kEcHFtCMsF1oQUzbDkxKLbILccuKboBthOTg3COevJdZLM77cKFk=;7:yd7fQWoIATtqB16UOOZomSUoOlqImVFN390x49CMRegbA9KzZcUIptK8HWfzeWRMfO/VhOUI/vf2JazdDD1PJVb6FhFgElYd4Mx52MTHQZkjydFAD90u8nTwskyaRKBX3hHZIuHxY8jDtNTfWkLT1vNTGfFn7FjRh8eEg2D2avjQhybKI0ryqP5DjTr6DGtiRDZ2HhOImBYsDsPjFvS4WTI+pBdoDWFUBSxmcxUlnoWBBssu6iH1JHFRXgJPXKLz SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB0135;20:DwvGyVVGLQiP3AuV0MnKrtVOdugV1TWxK1+GOAxA7Bksjo9XUudrm247uost4BEUdO+reZIsKqatkcKdlWF/I+GeWRrdiMQbpVnuwFub8+rnr1zSGrjuvzHeJOztFwVS8S3nFMRZGJ3wH3q2uCqxHwepeFExcWPUojvkr6MvZTEFtosPLvrQRS1Pkh5Xm7wiPzYFCFcQCTmxp9nI8GDKdnN1v7FqS2skGzSP946K9s8DOcZMUYeO0DnxrPg/muoR X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2017 16:26:58.6985 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 68c169df-3566-4f1d-8338-08d5303385e6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0135 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yazen Ghannam The McaIntrCfg register at MSRC000_0410, previously known as CU_DEFER_ERR, is used on SMCA systems to set the LVT offset for the Threshold and Deferred error interrupts. This register was used on non-SMCA systems to also set the Deferred interrupt type in bits 2:1. However, these bits are reserved on SMCA systems. Only set MSRC000_0410[2:1] on non-SMCA systems. Signed-off-by: Yazen Ghannam --- arch/x86/kernel/cpu/mcheck/mce_amd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index e4e27adedc81..32008a8d293f 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -418,7 +418,9 @@ static void deferred_error_interrupt_enable(struct cpuinfo_x86 *c) (deferred_error_int_vector != amd_deferred_error_interrupt)) deferred_error_int_vector = amd_deferred_error_interrupt; - low = (low & ~MASK_DEF_INT_TYPE) | DEF_INT_TYPE_APIC; + if (!mce_flags.smca) + low = (low & ~MASK_DEF_INT_TYPE) | DEF_INT_TYPE_APIC; + wrmsr(MSR_CU_DEF_ERR, low, high); } -- 2.14.1