From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753034AbcAOXml (ORCPT ); Fri, 15 Jan 2016 18:42:41 -0500 Received: from mail-bl2on0063.outbound.protection.outlook.com ([65.55.169.63]:8288 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752347AbcAOXmh (ORCPT ); Fri, 15 Jan 2016 18:42:37 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Aravind.Gopalakrishnan@amd.com; From: Aravind Gopalakrishnan To: , , , , CC: , , Subject: [PATCH V2 4/5] x86/mcheck/AMD: Fix LVT offset configuration for thresholding Date: Fri, 15 Jan 2016 17:50:35 -0600 Message-ID: <1452901836-27632-5-git-send-email-Aravind.Gopalakrishnan@amd.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1452901836-27632-1-git-send-email-Aravind.Gopalakrishnan@amd.com> References: <1452901836-27632-1-git-send-email-Aravind.Gopalakrishnan@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BLUPR13CA0045.namprd13.prod.outlook.com (25.160.82.16) To CY1PR12MB0427.namprd12.prod.outlook.com (25.163.91.17) X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0427;2:8o5IJO7LiW9rLAYg4sROH220M6FNraNzGEsYWwvwgk9Mf0Skhxu1atWXAVwc0azpyqBOdkdXcPIwwacCa1mMgVu7apxg7DSY4TYMwrHFxP6JR/Y46ItUvpTUMU48OEDAqUu8W6lBEaQrn14h0/tM0A==;3:9rgvz1Ynnjw3vB7onEs//vHCL+qbpBKZQVIyZoGSr3X/fBOp62DyXCqKMl4RPgvrVlpyJeG+oG9Ga5EFxPrtZZP6Suc7Pyg3JL39rgd6vxLjPYo9a3H7RH3IIEf9W5Al;25:wBlUBaDSDFPgy0XuXyFgk7S9+88YdCPKmLd9fEe8dYYgP74yHRhjyRC/Fm2ueGI/SvYq91Dd2dJIrLGq+m3504vG1pBvIZ2M7f7slHXCT0a930yopE5L1Axan1ZT/yOIb8EdMzOyty+7dvdHNzQCxndYRCsmGzQjJp2yRGn0dilVJEAOX2fueVd4BLjUzEeLMvWRa8rGcO1hBvROGYTV4d3RfGmxhSUy3xkvd5EN3VBrF01oMkqchL/s16V0cFd9 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0427; X-MS-Office365-Filtering-Correlation-Id: 877fbda3-df0f-4300-0fd0-08d31e058623 X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0427;20:eHCucJwqIZShBNjcYmjom28l3Pta/9Ocsx36P38cWGSZQ8TKwEphqkiU+VtCUypEg+uIdwDAJFQxMCwRHzBOxvVDYAmGbdyBgTepiDwxCDtuiLVxqPjAaXnO6C/IeAr2z3la5+GlBnjSjDNaYU19Hp6BA9dp79yKIIYkd+XlcarlhjMnqIoX6521704VZgKwniS+d/4vVuNYmS7H3Ed8Bax3neo+nLkQoP6KORmTtIPe/2yfwQfI1WBSI62tmCsOj1NDVLekbKXYqYn7vyxhAMfKyhAW7BirS8zfV4i1DC6FX8kVGu+hJYM77K0f1+GUiKTqlSIx4sS0btjTCz6TYR95+fA0AYB2MRE/32ByDLvFGqecgmkIr2aCtoCdS6VV2VPo1E3XKhfVqrrQfRX+RL3mTzTQHi6UQQqpAEpYzlXmRcMa90LbugRHpeGM7IlnXybWzgzRG20ffCL9JfmtZptkTDX48P7fAcLCufvXIFl2K1kB0r6G2/GhuZCiXKgp;4:/kVizy+/gTE9t9yIT2w8wJL9zeRWAUxkPs6ink6iilj7EReZp3DKV5pCitc4v1gYMAXRus2MvQPZ8+TQxNt9TQZegKwiTJDO3OQjnoyIg9NqXZPvXdic/d8SsqoicfXEzVKagpOBPDlQJ8Cp89iOsZp6BJwc6+1V90TnWozulgh+3oNTZ7KmREWm/ei5phWA7z6ugLwKul8Ant1Nt3dExh1QfDmkiHmi98e+nDHiKsH3ng0M5UAUpVX2cwGKMraJrZNVcHn/qrkJ17n10ZJa49bTGSwSnF4cBw6m8pygm7FYcOksveSvPu0IKXVDb5sBlEruAgAGMi6KX1HwyS11bYq5adE+UNetpSC3AWAy9ASFKjhyW6n/YLQTrvKw7VpvRFIK1U6gmAIs9OxXMd8c5ebAVw8TIPden3Y/wKpycFg= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(5005006)(520078)(3002001)(10201501046);SRVR:CY1PR12MB0427;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0427; X-Forefront-PRVS: 08220FA8D6 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(189002)(199003)(5004730100002)(5008740100001)(2201001)(50226001)(40100003)(2950100001)(6116002)(122386002)(87976001)(97736004)(5003940100001)(586003)(101416001)(76176999)(575784001)(50986999)(3846002)(86362001)(189998001)(77096005)(48376002)(47776003)(19580395003)(106356001)(105586002)(53416004)(229853001)(4326007)(19580405001)(92566002)(5001770100001)(50466002)(66066001)(1096002)(2906002)(42186005)(36756003);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR12MB0427;H:arav-dinar.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR12MB0427;23:T/Y8i36PprpxYM3OiPPpCGNwC40UatI91BNzzadur?= =?us-ascii?Q?9z5I8ukNdE29ONsrCakXTjG8utHrzM2WR37eHpU4M3FBoG7RdPobbTYkcDV1?= =?us-ascii?Q?lWf/aeTwi8nhorfZlwCGWLL5I8DCfwGvrFmmyS+Q/rvJaAcO2cg1iNr6tTsM?= =?us-ascii?Q?KUKMehW7iKkfcV4MNfkLKNegVQkiT1M1Lqam4ZKxs1UcjiA22Y4AIuJhJvEw?= =?us-ascii?Q?/k0+iOgCL+N0Onsb3KeKAoaEsKEGmte7DWObcTEYq46Kwi/BuycMStLmIueD?= =?us-ascii?Q?amS4dqd2dQYi3mndaQ7B5ovdIRy+yJZoX22vIdkSUMlt18PfQx6bqvcpA4U+?= =?us-ascii?Q?+BSFNGOM7FbTTSz/zGo8zimtSXSqN7BC9a5FkbsWVcg4YFNE/C/RSks7jXqG?= =?us-ascii?Q?NHXJTepekcJVHiyNS8XC8V14qoW22aPECIZajoF1DEu5NRL5EgO1L8iIlEmf?= =?us-ascii?Q?P0CWB1hnokemhsC6z4ebvOqPUEru0ZLVXC2Q0AGN6lt1pDVCrrubH+x1rl3d?= =?us-ascii?Q?nL5GwE5L9AoJ7e9q+LyMucr4Om0fMW5x9qvq7ypJWuOIGr2/WUf+B4ms4pTe?= =?us-ascii?Q?Kdak8dVBXOzGFjotWTrlmqbs4xdQdmu3j7yi8F5nlrhPQyYjjPnTEL+QVy7r?= =?us-ascii?Q?5dZRKbBMhuFrnq5af3APYVFknlu5GnnBjR1Tu0o+QWD3RkeunyZ4mzh0YBkz?= =?us-ascii?Q?Iyl3JDYGqdotwMh5ArJ9MAK8vpKJpWJlOXyV6ElLnen+pApKEjc+nbO05qF0?= =?us-ascii?Q?/AcycLIPIwv3hfSuziyqrwWZO1aV3o7y5DZ3QN8GThQ+oC2bPADh2mi/6b9d?= =?us-ascii?Q?ADQUdEsUP2E6Iig93CDrRy/B1svanxzYwaH5rq8QEfQqFQzbKoJGbU55Gzjb?= =?us-ascii?Q?LyljTCCJTfwc6SlVgKWq3+IaR0ex6MUQ1G9xfr0BlGFi5sv6KlpzHOM5klEW?= =?us-ascii?Q?0/M6TJWWeqzvUBncwNVUR9jpeKUE2QOZLkd3/H0gTi3EHhlP/f48c2d3YqMM?= =?us-ascii?Q?fZYss9jxukPLjUFQwGKiFSIDQ5RH6gyiPcsFQJUfvhegt3nmuPej4SJpp4rP?= =?us-ascii?Q?1dVQ9o=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0427;5:W3Fqz8974JS5/fofVBotyvJKgHBkyXOAVgnxd4a7JlYLLMXLMxKM7q5oM0J48TMUqIBS5hX1s/HVIMOiFEFPUJ8FaHHoDCv668xaOcU5DaaOljWmOEbkym4IMGUUhOTMBaB0fyWA+3KBorJLS44NOw==;24:63SL/D06lkqPArchRYaZ+9a2NSpysCiamnwPQmpBWd2ebSHYWIukwhc1lTbnogd8qmLuiAmbpMG5oxlTryeRc8ev/hIrEaU3ljnw5IZHTn0=;20:i9Y+3J6AxncGDlxW8uzmPyAXhEwgN8V312yb5S5zR5jVEMk1f9uEGSi0KxyVhlw6KcXhRoBZc5sLX0QSM9g+uwuOyYR3i40Bw1a2CRh3zbsbh7/NNxtOv5eSp6TV5LUT7rp0w2ROSo2EaHVf1PR7N57i2vcHglQ0hHQwMNRiiIdSwn4LXAGAtw55WlKgWTcepUkF20LPKbrDS179nOzsA3YViChyAE4UTVy3KoK4lxGaTmA6Xuw7JntGB2TmY+rv X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2016 23:42:25.3485 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0427 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For processor families with SMCA feature, the LVT offset for threshold interrupts is configured only in MSR 0xC0000410 and not in each per bank MISC register as was done in earlier families. Fixing the code here to obtain the LVT offset from the correct MSR for those families which have SMCA feature enabled. Signed-off-by: Aravind Gopalakrishnan --- arch/x86/kernel/cpu/mcheck/mce_amd.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index e650fdc..29a7688 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -49,6 +49,15 @@ #define DEF_LVT_OFF 0x2 #define DEF_INT_TYPE_APIC 0x2 +/* + * SMCA settings: + * The following defines provide masks or bit positions of + * MSRs that are applicable only to SMCA enabled processors + */ + +/* Threshold LVT offset is at MSR0xC0000410[15:12] */ +#define SMCA_THR_LVT_OFF 0xF000 + static const char * const th_names[] = { "load_store", "insn_fetch", @@ -143,6 +152,15 @@ static int lvt_off_valid(struct threshold_block *b, int apic, u32 lo, u32 hi) } if (apic != msr) { + /* + * For SMCA enabled processors, LVT offset is programmed at + * different MSR and BIOS provides the value. + * The original field where LVT offset was set is Reserved. + * So, return early here. + */ + if (mce_flags.smca) + return 0; + pr_err(FW_BUG "cpu %d, invalid threshold interrupt offset %d " "for bank %d, block %d (MSR%08X=0x%x%08x)\n", b->cpu, apic, b->bank, b->block, b->address, hi, lo); @@ -301,7 +319,21 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) goto init; b.interrupt_enable = 1; - new = (high & MASK_LVTOFF_HI) >> 20; + + if (mce_flags.smca) { + u32 smca_low = 0, smca_high = 0; + + /* Gather LVT offset for thresholding */ + if (rdmsr_safe(MSR_CU_DEF_ERR, + &smca_low, + &smca_high)) + break; + + new = (smca_low & SMCA_THR_LVT_OFF) >> 12; + } else { + new = (high & MASK_LVTOFF_HI) >> 20; + } + offset = setup_APIC_mce_threshold(offset, new); if ((offset == new) && -- 2.7.0