From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756751AbcANWbK (ORCPT ); Thu, 14 Jan 2016 17:31:10 -0500 Received: from mail-bn1bon0080.outbound.protection.outlook.com ([157.56.111.80]:25686 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756577AbcANWbE (ORCPT ); Thu, 14 Jan 2016 17:31:04 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Aravind.Gopalakrishnan@amd.com; From: Aravind Gopalakrishnan To: , , , , CC: , , , Aravind Gopalakrishnan Subject: [PATCH 1/5] x86, mce: Fix order of AMD MCE init function call Date: Thu, 14 Jan 2016 16:05:36 -0600 Message-ID: <1452809140-3328-2-git-send-email-Aravind.Gopalakrishnan@amd.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1452809140-3328-1-git-send-email-Aravind.Gopalakrishnan@amd.com> References: <1452809140-3328-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: BY1PR15CA0039.namprd15.prod.outlook.com (25.162.17.177) To BLUPR12MB0418.namprd12.prod.outlook.com (25.162.92.11) X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0418;2:QKLN8jkOQ4/pdWuQv2LeshKNoK4/7yb8BShvfAXRwCTanPexUVw1OEIkFNofbuE7RpLaKuBAY+AiEm9rqhokzO+iVfby3nwxwnY4qHP1gx/lKXGWYmp8ZHbPqimNSCrQYgWvz5fMnV5Tij60jYqICg==;3:1of4jAqDNtXWLABIvXwja1nScDwZZN0SoRp6xoBH+MlvhN14ncHyh2+2rAc2tgPjwokrOgcz3hQ1/NrJQt/eA6FguI/VSaiKd64j6QTIVHzeM0MiPYPCKHX7L9pWBeUu;25:j6KaMoOXJMnFF0MNGlHK8dmsn3+kJNOQaw6NGbWUhzVjyOu7dAiYeI0UgbNZbw/55zI5V3UANVCVD6zOOUIjO+Z4+JOIX16gxsG7r97DsMytNdyyATU7wu9ps3SSEYU3u4JAH9S99XjfGf/y/wk43ki97IDb8BX7PTFAxkovl9VNrHmFZFiSndpHeWF8172Xsf3RFQE5DNdYs2heAdFDF+XAhV5HdgOO3PgSbs+hGSO7i1tl/pLeQLe7zsVs31Op X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0418; X-MS-Office365-Filtering-Correlation-Id: e81244da-8cda-4858-1eac-08d31d2db8cb X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0418;20:bsuI9tq82tq+uM5UP0Pg3L15/l++j21Z4Roh72G/0HCtGhwVyibYjvPHZl5GU8XRanaMoXfBfQlshRq32J+pp47d4zxRZmETrKl3k81XJ6CyLXu3dnb/KjjGpNhL9MYcaxLhvYUhNnaPnniguEhwOIdJRYlWs3QPYcyUB1ysx8dfi5W5SVl3GNkzm4PY0gNc7UYGYP19xQkggc62JZojyArhawdzth6oMYGk2lIMML/kmQJo8SOMKiS76Inby6vUN6QLYdMvVuxFmqcVEVX6dFVi9x8H3WzQFMFMMK7PtPIWX0rxz/+OKIDI89SwynBM4tlmiB6W/H2fA5pvI2ouxJuZGd910fvNTUmpdgFWQ8obTmOTKh8YBsZ5IB2AcUcsgaoMRpslqNi/70cfVR9K3VpJoplEd7x43yc2cwjMHK3lB148h06apgmwmuR35nlXPpDBlAN8k88uvR3HQp+osyJZQDMpT9atDYRktIABlmQH0QPMxXpBDGiKR+sW+lJo;4:/rHfIHcPzMP1+3+UHK550ihSKMy6P0uPJmWlEKQeQOrA7mQHMcUYkLin8YXPAKA1Z7rN/Go9ZhNZOhyB2zC86pUYQNDD5gkdajml2/y/8EcSgyFXbiEsKQEteFcvYLWGlkRXXUEGTPHARKdJw6Cmdfyb016siPcd+X+mLmSjgsM9k9hIBLTFIgmL2uBmJD7UCr0kmeZWT3LvPsWB8duHjxCUSIThTEKlDixoCfOFxAZ9iYjY72AcG7wNxRNlpV5AcinJ6OJUUQX4gRw3VYuhxex6Q0rBLX86y5MFth6oB2Xyx2NtsIpm8EQW07v+Ijd2qUL9+y7W0oIS5Nb3XXXl2mE+NCEyOLq7FnIhbcPx+hRoeg2GA1maPtBwWrqvfQATgznxcE8dlaOFLxp9OvLIOm8GquK2V5GiJ0LxkNnCfk4= 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)(8121501046)(5005006)(10201501046)(3002001);SRVR:BLUPR12MB0418;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0418; X-Forefront-PRVS: 08213D42D3 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(189002)(199003)(86362001)(19580395003)(19580405001)(36756003)(53416004)(106356001)(92566002)(586003)(3846002)(4326007)(1096002)(5003940100001)(2906002)(6116002)(105586002)(5004730100002)(5008740100001)(42186005)(47776003)(5001770100001)(189998001)(66066001)(2201001)(50226001)(77096005)(122386002)(40100003)(76176999)(101416001)(50466002)(97736004)(229853001)(48376002)(2950100001)(87976001)(50986999)(217873001);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR12MB0418;H:arav-dinar.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR12MB0418;23:JZrgpXptGVBJ/gFmd7JNKTHXSQgDs7UPqOUMZLXpI?= =?us-ascii?Q?7v9txZUjwtYG+Or4TOP3IPk1xEG0xIh5KurMJwScRQAMUOAmKOGnncnjXMqE?= =?us-ascii?Q?Tk4A8r2t5Qt7k0PMI9qAfDKD3UmGrJnwTtTSsrfUEDj35IUzLnDtnIF17Nqv?= =?us-ascii?Q?sGynZfRmVpsTKOETDUhLpZ5qTO0udrQp1+zGTZx6rUxmGmpp6rR7lYaEjgs2?= =?us-ascii?Q?JsmwkzrQfkN/nuuZ2Ei0uyEfpuaoolh0yL6tCT+EABSig+owvlJ6wCU6aKIT?= =?us-ascii?Q?Mqyi3wdP/o5CQrVXb+UW6hIA48WrcVugnHmvU3X/+6KPi80N9R29kcjirlrW?= =?us-ascii?Q?eKWTtDj+AyW+2pbD09yCmFSg2AAzxogGevrddnMjsgWB2LCBT0TdDUTzIRFn?= =?us-ascii?Q?CQzzZTn8ZUvdVvRsn/OXVH0lPHmLwCrWvgZIl7/Tzqv9cI6fsQP7pgwe1a3S?= =?us-ascii?Q?9D2iCf5o8RhF/SfP5oSArcqH2Yj0fDan24DTal6HRAzZFhmRTt4gxanIYknz?= =?us-ascii?Q?S+KQBkB8+eMH4nukNsDcflJfbOT/Zdm+prhx15jeNpB5HTD+XVLO7mloZyfj?= =?us-ascii?Q?J/5B+8fGFe2bGDyKFfCeoZ9boE98YqWERznusrU4NBmC135ZaWYECBCkmkpX?= =?us-ascii?Q?cGqntu4adNPligilJGoKsYFIXYaKVKZ/4vPhaCiJ7QZgbv+No9IBb66UT9G4?= =?us-ascii?Q?KWsIj99D1UIIy8jhEt3w9vokVPbHfF09V6eygWBuXIH6/ha1jP48gBRt1Miy?= =?us-ascii?Q?b08S6AaVdg3lgzTr/BKi1CcyN46pQyyanfkWV0FcO2neLumec1tGUXYCqV75?= =?us-ascii?Q?s145QwtGSUYYfLGeS+dvoNJDIhDl1EqX9E03pxvJM3HI2/pfBgHETZSJ3bAJ?= =?us-ascii?Q?Gwj0GzakjmxBraz2sBdCe812oCn8nf6FxebGfah2T1hqMKYugB9YDbxtOw2Q?= =?us-ascii?Q?snAqzBLhPbUYoKRIsqxwrZOPeheuaZz1eTIzXCZz3NhI6SZlu64Q5Ai4atfM?= =?us-ascii?Q?PmgeLHobrqId9F4cqauJrNVix4XS2EfIR4jaVhxKp8fUhjAU/UUp1zlX1qPK?= =?us-ascii?Q?w4B+Lk=3D?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0418;5:l1Fiy1blYxRWNkT10BvorZTuhIfyt2kyCLiEoeOYaAq5BpCFejT49nvcFGoqRQeEPFvQl5LJVac5038iHDvYi2zcP1TaqxtYhivn6Gww9zMxj1JSXI4LVanwHwKpUAHfBDw/2CxaVsCQY1eiyFqpog==;24:n0RmXIm4z3CnZ2RKmj3spO3XOFbMc79kmL8fSBp4VIcaSs8Fr9fOHq849IGuXOL9sqcgX6To1bqlPVK2riNVKvU1ZAySqxqpqR/Mm9L9eRM=;20:/E/w8MrSRLAVdf7VNIUivFTC1gxbGDyvHQZVftwtz59f14/JoMRnfBMz0dVbgIBygitkJmLZMPza8quFe8sqOftxvBURk4HpJS/daNNedreFpG8CD6SejCJqj+wJKCiSs3zO++/5HMGE9u4i+0X7PPaylAPlSu0XOUOCnkatXKfwsMgN59XhS/bJ8OlqJ/q542mWhObpHCZ2zny8pTT0lkL7Mg0xAleo3IaineUydb84f7g5Rv5v+aUMR5GJz+wB X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2016 21:57:38.5893 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR12MB0418 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