From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752727AbcAOXmf (ORCPT ); Fri, 15 Jan 2016 18:42:35 -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 S1752347AbcAOXm0 (ORCPT ); Fri, 15 Jan 2016 18:42:26 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Aravind.Gopalakrishnan@amd.com; From: Aravind Gopalakrishnan To: , , , , CC: , , Subject: [PATCH V2 1/5] x86, mce: Fix order of AMD MCE init function call Date: Fri, 15 Jan 2016 17:50:32 -0600 Message-ID: <1452901836-27632-2-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:Jy4nPRbo22b62fa513ykdnFxK2ghySocrQnXMNrRpGXZxe2XBJuqWSy8LZtzq9NwRd2zUrBFSc7STkoDsyADerXCPu7jXV+C9KdFEdtty0O+/sUnAjDz/BsVQRYyOkihf1pqj6ULFsMtG+lyh0T4Sg==;3:BX/TAmGzSSXbPZ7eTRa2+kjUzBWrOJWXqK5pP+WKlGeeWKdbnkGdBYHjhaAb50qw1yy0BoiPhEzxctfBTMaPHm5Cf5GansNf6FEQd5tppCfnoUBdJ+JX7OTLorzJ0cv2;25:6sFd9yrldeErrUou6pxyYlHmr2aXoyDfg9E1pM4AePxuZRtKmIagbIk+/EuTt6pwppIvPHfx9SyL2uglEl2B/IaIgM7HYSAtAh93XL1pqZ2wV853eZSmQKXAILHkAh3onzAmpehlR8U2RN2L+wXj4h6MsPJbpiGgoyMKoQtrwBpJsFbsHJIsh+Tx5LqX9DKO1Qfb3WChjrXNd/iR2WT8ZZfp13Ai6ad9hCma2zv/IZSp3AR3UY6819Oe3uefhVG5 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0427; X-MS-Office365-Filtering-Correlation-Id: d8673744-a994-4a4f-d70b-08d31e0583a8 X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0427;20:BdfZ6lgeeP29y1EtOeXB5a5LmTsDNC4YUWUXtP6KgAJbkqoVehKlsOzFgAAeyraTn+9LhYG5ehtJlZZCyf+vZ9aF/WEPlGscXL/eB3mHgo8+VxREIo/sbG8LQWEX5czam+NbRBkSoVsfGqSmLG4YX1O8s64NyRsxwkdINw7BKuriosiT6zHQFSm9d/KJQWRD4jnaZeJ0KedCj3vAAPbjLbLOgU44CSMpo5/jO0u5dzJWOg/LYfSVTYCVuVzq6RixTJpYWkgPVokb9RrWz87HmZ4tqcZYW3zR3NgLy5Yw8YEc20wJxtd4kaYrjov8Ita+A5+gMn5PhqVVcR1PIzBqYXHF30HsTNkfsdNtddqijTObBsGqH6O23tcRiRN39G66QkCLnt+I9zcNc1MScNVAjeVWidBTP78/6C9ycG+uhrKM67LGnmOUve+sUpT4AJRlCULt0dK+mO/yLXZpdgqNJO/0MjrDmkfGNBvPO+wp7J80yVZjyTQPomU0FUGCKSiZ;4:l0fZMJuzaUEjcSm5yUnDzzTlQcAa2sUQLBiMYQ/+VIhzk1R6voDYqHU+9JdoddtVyCCLWW6jMj1d/6QyxuBlVu1B0tckSDpz2DVQvLiXrFLUsUM9Y2k6LLzyebNKmq1Q+Z2OQ/UnwqeWSs+Bmi0BfY0RkND2BsJkEX43aB7nRP7KiRq/lw39NFjvZXX10MUHhwMQnIDtLsyXjltLJ6NJa/DblgwJLvrsvywsrHBQcpzBwMorduraY9S6MAk5vZ7TOqQ2YMHdirE0/jBfXW2nz1hrjEWVsdPQNS1fhWxCoudc0YpLdboi83KQbjlygu9ZrqCq1vSvhihiqZrWiC5Cb0T4jUKe72MosFwVSM/CIa92IoY3NA1IGKdYUCkf5FNDXk8pxhZtHEuVEOGeYGpeOOfZPA6N4lNXwUHld98nplE= 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)(50986999)(3846002)(86362001)(189998001)(77096005)(48376002)(47776003)(19580395003)(106356001)(105586002)(53416004)(229853001)(4326007)(19580405001)(92566002)(5001770100001)(50466002)(66066001)(1096002)(2906002)(42186005)(36756003)(217873001);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:3EbA2+EAfGXa1usUADvSnA/BY2C0/LxdmG2DUoHWt?= =?us-ascii?Q?eEg2CGLStEquKJoNu5eq1ESsaYkP9yAnyerXZXvWI5hs3U/ZGCfrjTXvrA8D?= =?us-ascii?Q?vWaA7veW+OPXgEbQsSYQfjF0q16/wVQnr13Vc1W4ZWXk9rM66qTmJWcQIqea?= =?us-ascii?Q?8VzHqqyn89ak5seV+F5XTSAp39WFBLLuTWeQzYW9nA/P9vviBjbRN8ILZz6l?= =?us-ascii?Q?zmWCs4rZ8HOoTDgxYZmHHMA/vovS+NxuKLjqnxO1fhVBSenPVO/4myJrQySs?= =?us-ascii?Q?F1secXiVVCKp8+tE5md8i1z86YUipLYjCzlQyOMg9+1KddrGpsy0TejX/fWT?= =?us-ascii?Q?0BNdP8YytY5f4gj5YhrR5dLaLuVjCXFItvKeFPgADBt6zRBxx6ecIYmkV7zt?= =?us-ascii?Q?0PU1Cr7LCyUlq3TZ2w/6hR/SpqLZpwb8AZyYXgxs5p5Gdp5Y+JzU6yorCE0o?= =?us-ascii?Q?4RDvlgizeRiE20LkljAtuTPizuylL9qdcDPzFCdkpJre3FXtvHsqO6bVPOlh?= =?us-ascii?Q?3SYWhbvSx9WZu8Y62JFljSXi/LJdS7N1zrF1ByB4aLCwIRswK/2l3h6L8SBj?= =?us-ascii?Q?1eMWA61lVZ6qY2THxexsdzaGJ25XLmlQS5H0OaSWq1hKgmbA43y2UmvnMixP?= =?us-ascii?Q?qfVQpoHT8SwIdZfiATnVczOCMvAx8V/VpMUFkOpyOeinX5p0O1jsr+NzoPPW?= =?us-ascii?Q?1hTwxiKKH5M4R7qmklZVf4F0vFuSLB0nBj8mGE7Riv8ehhmrc0B4UsLYMdjx?= =?us-ascii?Q?a2KBT4HAJ7wYOhDYBg1PhNH+frOhBXSQTNi5SmRFTrzABxQOn+JHheXUQ5Yw?= =?us-ascii?Q?y7yLJ09eGADR8LesVvHRk8diSCf5bZQxjbDQIF5h9dds23z+7Z0Oz0mCvV80?= =?us-ascii?Q?MLvKI9qVmm3mkXFDtTDvxjclvm3TKETzuhsw6AqC3kefvj2MVkkRH9vCQTeI?= =?us-ascii?Q?fVixlJDiGgnNwWxYFPBGt2dyU2h0hx5s9q1UjhY8X2r1BHgnowAnEb8G8bn8?= =?us-ascii?Q?hYut5uToMQq8meelb0Ho48NBH5vTC8H/LvLR97WPJuzh7jO9anbW5/lldUkm?= =?us-ascii?Q?WxXFBc=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0427;5:4ULeAGvx9ywzba4dDDObHyHCS6NyNyjU1G/PX325CuXH03gqI2dVoUKbmb8ty3JA8M8yupMki09BvLNWmCK9GYfTAJLRFxgmHdKiye0PdlnhAsC6zbF4eugyqhBY6Uf9CBN/sLpXd+OjlHulIWWDiQ==;24:PJZX8GEr3DpZgnjX+Z8C6VDztz8K/JGzddTcD5AzuluyfWy89phYQEXbUCSgK86pDgjP1hWK4rmmRSMeeCW3zMzSff77bLra6JyZ6xs4z9c=;20:DA4iSM2Wzssy05QhFwR+E3LF/E2Ui2lchxET4QdcADB4J6XjLajw3rHo4PrPkf9XhP0kADW9Tj0+ZfvENCqiZ6ydXpUGGaoUpZBD1UpckIBAT8KZpXcDdb9ktT6Kdhki9kB6sbDtFe0yx1Y3EvoiH3v4U72uST6kc9Pe6IyICwSrnZAyf3NjemC6uB9yDVmG6kKXtJ3l/91jgeD0iJiSdW5pHm5C6sOxSblPuDkR2FBnLnLRjhG6Uz1zK2aXHzT5 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2016 23:42:21.1765 (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 In mce_amd_feature_init() we take decisions based on mce_flags being set or not. So the feature detection using cpuid should naturally be ordered before we call mce_amd_feature_init() Fixing that here. Signed-off-by: Aravind Gopalakrishnan --- arch/x86/kernel/cpu/mcheck/mce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index a006f4c..b718080 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1617,10 +1617,10 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c) case X86_VENDOR_AMD: { u32 ebx = cpuid_ebx(0x80000007); - mce_amd_feature_init(c); mce_flags.overflow_recov = !!(ebx & BIT(0)); mce_flags.succor = !!(ebx & BIT(1)); mce_flags.smca = !!(ebx & BIT(3)); + mce_amd_feature_init(c); break; } -- 2.7.0