From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030476AbcJ0OOn (ORCPT ); Thu, 27 Oct 2016 10:14:43 -0400 Received: from mail-sn1nam02on0070.outbound.protection.outlook.com ([104.47.36.70]:27693 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1030219AbcJ0OOi (ORCPT ); Thu, 27 Oct 2016 10:14:38 -0400 X-Greylist: delayed 938 seconds by postgrey-1.27 at vger.kernel.org; Thu, 27 Oct 2016 10:14:38 EDT Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yazen.Ghannam@amd.com; Subject: Re: [PATCH] x86/AMD: Fix LLC ID for AMD Fam17h systems To: Thomas Gleixner References: <1477496590-2396-1-git-send-email-Yazen.Ghannam@amd.com> CC: LKML , , From: Yazen Ghannam Message-ID: Date: Thu, 27 Oct 2016 09:58:51 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [73.35.89.163] X-ClientProxiedBy: BY2PR1001CA0021.namprd10.prod.outlook.com (10.164.163.159) To BN6PR12MB1380.namprd12.prod.outlook.com (10.168.228.138) X-MS-Office365-Filtering-Correlation-Id: c6e643fd-4bee-47a8-34d7-08d3fe716629 X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1380;2:ngQyL0vTM4riNez7ge08edmIRaLFDhg5fY/KveCBiVKlytKd4JlE8nlgtD4fvbGcPCm8PmPZEQj3P5zlmuwGet/pEWEr92W4TaaI2JG8QHAaKIaA2yeZQO5EIDDSayKj3I1qBPB0ZpqhGXL751JnHv6hsU0NS3bCt8BMgiDuTZhG1LrgP3kovNUqlIMWLX9JvcbRa7rtZMB8OoPJTyzN2A==;3:AaSAqxiuVGdi+Xj3ReV5Gqzv+zu/0jXYd6odo18wrNf7RtEHPEAeWofZtDjnZ4YG+TcAkNM1Zfro1UTfZu7s0jaoKkWiS+qYcb6dJprKOXuX+dve8cCUDOaTy9qR364Z0jSXPiv8eyzPvtnklKhCNQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN6PR12MB1380; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1380;25:mt6HSeSKcU7J6Er+rJTYPJC+v5CcgQJ78Gd4h5i/XBuyDd1TY+stVXUTTFCpenrFiTWVQebL4gNBOW6wFrpFUTQCyZJw2CgryVBX+nMdne/NS8Cgjmx2TBt9igFrrk6pBUIjHp/lX+SW//+k+mD9qnJKZnxq+OX7T/vK9i38CLh2r6rp/fW+YXh/alAFeCEAYj+jMDZsjy/tTmZ2+/ZScV0UlH0WX5olfosdTcMpDAaThhJO5VEzfaR5pNy0BMfN0zwJR1oPApco0Qr/hbZ7EUMlqHXwVPK4h8nBfeSbLTPm0Gab3LiHKHTxOQYpqsfiNplyUtoi+e/4qxQdWkhg8e+5eMSvuo6zNbeLREyHm2B8uTRzQwNljaO9+zn+nZ2oaXqCTHXPSGDSCvMwaqPiN/MIWtAGvJjjfMPEySykqs4dNzz7xVLD3dMd1jCuMsCFrjqnG96wM4xZrGekwpUyMfKOjqDXC/zSkVpQiBde57cMcywCqCg6QcW1SXGzSi5ygFeo7dpaRbQlGDHvOivoZ7jSUTYFluUxlF4byJyL76SKSRrPhES+0rDF7vzQUPKuSncubCAUhgITkmS+ZuKdhv7lzJb0kolw87EMEfN1fdMoUjrSKjpvTw/HS8Jcp2yE2thtFg3EM4TlFMxaj2qjz7o2/KmoSfI9uDVSXXzSoZ5cUsYcIv45P6/6DgvbmcqVYzN7bwY+Uv7zRfIKKVKDIw82HLu5z5tasWxWUZ+3oSsX6JBeo6DeF/SUmREstaqtJZVrDMWV22iqnns7QDG78UYWH6qQCPNx6mvT76Cj1d1rTldj1MeaKikKbGgpunjC+5lClo10SMUpLbOaX+OtMg== X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1380;31:uUI/o5YWAxMpLtKuaD7V77hgo4h2FGx0PSGZd8YaBiWoAJS2twfhxlYw1mVo3kRWaJ0nfAM2Zo63WkqUqVH24vkyw+9qrAhe7xoBDKlAqJhkdTmcfW3fIEnseIAGMbpjskkX2rXI4D+Gye2jdZTZnQWFq3akeek8t8ahACsKG+aPo/VrXJDOGJZSGLC41DJ6SsfXqBqZFau5D0kfoNUn8NsxmkT9YUDaxUMszZjK8aR4QEqUFDRgnHzvYoEuiZ5+RoZ3nA/QtwonaBQP2XXoyFVijCJYwzsJrNg3AaJbz4k=;20:e4aUgE3wkHA8SpMp5q8K+7G3epIhkS2r6JG62pqk7WsdzT0o4cunRkYmWMh8orqaBLEhPjAph6rd92Il3/udbn/+yiBmyTPAsRwGEsuLA2rQ09TRlw4fmKmzBTKLFr/+IyQUZQUHArXJPv6m1krZsR6aN6rJz5Qo7nZJJf9IiO6SzkIgtfDRkYVqLQR1o2zTxuVFrPEIek/9KgCnivNCq/+SyQxcCOdR1/T91jEr6S84DhFvI6YsU02jSzMt6TpaaJgqY9SsX6r7kz5LqWQBNY6xYSGyL0Ah6i3Dweah/4WLCCEFwoyyaNBBTefcahx7gz39cn97N2na/VJWSOqUGLp2spr0ydgG9HxDdgKjaRNGHx8gmXB7kn7MxFs2pvWVk4q1QjWZPXGJxR9qpBgwmhl1zwl6uvBZq6QgE7sCuuAtEKiOMP069E3pCGdohhTOemYVpY1FwOAJK6Sh2TviVkeCk/suFJg1U36gKs6nuL6YTbPN9gyOcp3sIPyLq+Yo X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026);SRVR:BN6PR12MB1380;BCL:0;PCL:0;RULEID:;SRVR:BN6PR12MB1380; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1380;4:tP91omgkRFNsW6+68X3iv8uJcevWpByS7dUO+s4oVbs2uD4kPfEp3pmxyWZVf8Sm7OoEct0cQ9jNibjYbHRDdr4WiJd3ZZbisMQQopeEL1bfTJj4XhioS5N5T7VK7ogz6i/eixsqfoPO/XQZGbvbTR+hHYIfcpVKsv8d+pRNJU+v6YAdGP1dxPxGRa4v5CZigv9v497Y1i+v6/8J6TiDCmm9dNhZFWdenNr8xqzwkA72E0iBjE2MiSEhbWAXc6gV7jzzcFqqiC/+VEHdV/svMtT8fSWb9SE4aNGpOp1gJmZ+eGTZjAAEhnJBkLV1SYsikF0lai/JxnEo8tqu+uLTiDvZcGqQpHZB/eXegvK01/7Km78gvjcpJGLAxHYqMQRQFYwZS7FZV3wk7KK7eSsRkOZskyjxLrCAyUpHp4lHmwc= X-Forefront-PRVS: 0108A997B2 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(6049001)(7916002)(189002)(199003)(83506001)(33646002)(19580395003)(77096005)(15975445007)(42186005)(64126003)(2906002)(81156014)(31686004)(8676002)(117156001)(92566002)(81166006)(586003)(2950100002)(65826007)(110136003)(7736002)(305945005)(7846002)(6666003)(6116002)(4326007)(3846002)(6916009)(5660300001)(47776003)(54356999)(76176999)(31696002)(50986999)(68736007)(189998001)(86362001)(65806001)(106356001)(50466002)(4001350100001)(105586002)(97736004)(66066001)(65956001)(101416001)(230700001)(23746002)(36756003)(6606295002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR12MB1380;H:[192.168.1.175];FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?Windows-1252?Q?1;BN6PR12MB1380;23:UrfBwYUqluZG4fd+EW+QbDVSi/jZyzDY942nf?= =?Windows-1252?Q?atmONZBMQvfWJbz/qpMK+MA4ZVK7aTEar6/JSi/Cb8/xNCadRfyCuqmr?= =?Windows-1252?Q?1PaiBQjEOWuLFClSlo+Ztd7Kgw1oBMMOazjroOE5vi7ebPPblbu8+2ez?= =?Windows-1252?Q?Os3EoQvztbAzQjoSUknIytPIatPqpMOdEU3BCsgtp8f87jfZoFZqKxLY?= =?Windows-1252?Q?+Yn1yUH88wbMqnt0ExVvgR7+omwUtVN/BsMDKf4MxpRNPZkOh0LkTp3Q?= =?Windows-1252?Q?XSGPxMPrNBdlg35BAQTkNKVicPev3D+ElzVA1NOVF3ITtLPPAq5WbEAl?= =?Windows-1252?Q?GgbmumzpoTpGrIzXU/iGeBvD50fEtlnqTUY3RMNDm9Gfu4MVrKonReYx?= =?Windows-1252?Q?uU9JvRsqo0E4W/yZ8mqQ4towVcvNCPbX9Pu0+/ciIRL1E6RSRo+3DV1T?= =?Windows-1252?Q?MKKWNDmKsfV8p6LjMluX/fSDSAtB1VfTsfDJbCRDQIDSeyuQRqqUpFd8?= =?Windows-1252?Q?vr6unfPNXfjODNDjJmDnqJGcJ5JsW7KosvrfcB4La7iuPTZcWsXvzI7x?= =?Windows-1252?Q?arW6YMcAdWTd8SKdgdWZ/1EzdVooWbtVsxKHNjgSBscfZrKhjVRjla4Z?= =?Windows-1252?Q?TLx1FgJPzoaYqosRxkiYJHol2iLedU8MxIkGdcGXDSHUDoL6xgTQazVd?= =?Windows-1252?Q?84VhXrhpiJmCUdqs9aHLLZ7zLeMQYVFdK9D5GqofZ/xLqY8db9PGHSOX?= =?Windows-1252?Q?971KsWQR9Kax1zcFYzkMjMX3E7N7jrkERGUWb+8qhoFP8PSPhfqUWF/I?= =?Windows-1252?Q?g5pHQ5VqGQbBggalaryE2HrACocPQZ+BhPqNmHEVhe0zHTZjK4pDjuME?= =?Windows-1252?Q?BT8E/9WlIYxzzPPmeWIg03y2umJKbkPUZO0KdrejzjS29Qcr9LfYc4Zc?= =?Windows-1252?Q?dVeWOCGQPTm8LNpNoAlZnBGfGSYBg2j67txxpw0pAlfqkZSzYJoGhR7+?= =?Windows-1252?Q?vFRsbxKLKunlFRIIyS186VzdysyAk734Z/K1aT4sPC/e9P2/6lEAJ00W?= =?Windows-1252?Q?XRWx7wIrIzcxxtimvUoWFPsjUEgWlOddwXVj1XFOj0AwOx5bMZwS4No8?= =?Windows-1252?Q?JtLsJzdnn4iBObYS+CLceqvXz9m03iVJtRSR0PtpPgqv4MnbJmpjrHTI?= =?Windows-1252?Q?/mMS76go5ohHkwMJ8ybjKysSKDVPvRHvAH6+JY6/f7ZkSo67g21eK7/Q?= =?Windows-1252?Q?5k9KoszFcAmqyabEwA29KzUnjTb2nYALVXsEx1vr6OPdgk4IjWQetlZF?= =?Windows-1252?Q?oY/M80l1Soxtq0wNh+PLalHSW7FEw4qyh+ioC0L6UU+VRZzIfW8+n/bH?= =?Windows-1252?Q?iRNcN/kjGMRxEE8JAf+1tFevVP4r6JcC2CLTTWEi+QssnYgGdEvmDBRd?= =?Windows-1252?Q?cMCrye5vfbdMMVmALgt?= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1380;6:m1TxvOOsKMhK3y/b8bqht72lBOgBOhi2ZMbfbyH2fsIswEzBjpXlPtFr+BactK7FxYejQsIaxShg1CdaQNKvhslrNQbZ9Y6sauIc7TkVi6ZjtFWHGfEFbv9P2XMmuIRXJ1q2kR+SZwNbBuCv7dgfDY2uDGgB+pQFl+ogS6M2duM7luKLS8eCmGnVvos/kg7HBPBF4v7kvg2sKBvGffsb5Jah1uXJfrqVszvoOBPio/R9jDFavwFWHSiFVt77C5HVJ3OtMa06FEDjAqPyhOaWf6RRNkVoGXbiwJvLuG0lSqJ2YANEcWyG6oVCJLSwVV8GukrRhNM2g4hEFLdb/cESlW6R8ZwdDUZkoT2ysUnImlk=;5:khIEvBTpzSUzs0uCVfKwW8KS4GhqwBTHE7L1Yf7AyVC1R/0Xv8PgeYc34KsvklL1nr/AGy3XbXRXaSHzOpE2SDX1QixZGwBL5Z/8iwiX/27FXB1iW7sWnNfbc6fryDDqZrOXYjAnllJ1NZ+YaG7zFg==;24:F1gEMsiFC0qPyINSwaZFUUmfrcd4Z+gRhbFabSYjJClCUGjFa5DszX1nd8qugG5x4dYvlMIh5wL1DSXyMlzsuzuH6Ci6UkB22N2u0iM/+Lo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1380;7:QRIXPSFon+/9yJBlbLlOMJV955oKWe6VJ9b5ygTUlm/9+uGyz4ZOE7NT5FlyFw0BD94mubRqPEJSUt7hFO0k9dzJ0Q/osfB22zMHkTRTtGRDz3EuBM2Ivh4imBAH+QLHHuID156bGwV+Bo+c9b3hiWxJCDFP2ILCnrf1v+iLdxXmyPhuKO6DuGB5Lj11D1OlMPC//QGbfZ6ANnoryt7HPKaW/UY+F8JjSuVQFv55EP/xT40jpytgM+WYDQacg0f00HSVOvCs0+SB8sqZHsRvNOW4IcEE+1xH3xov9gTuEVMWSATFMCulq/0JSaPSMdwxgTgJwzEL4bKYiZMY3LDVmza+BySn/BMB47mhklt6OCg=;20:WcO+OVFzkhhlkA+tldi1ttQfbrXZgxuhEYjq+78Y8dI2KfMbYabuKlmnLbfi8yH6esn3QaJrgedsRtL+diAJr8E8d6XOTbPbHOzKIASz8uL+06Elj9j0o4aHcaL38YCDRdfMHtWhAo0mZ4JGYB3GeIbylgnEN6hgo8vlAR7Sakn/2K1EBlS+nW133uYpGm3dZViR50FdyfhFLap0I6HFs21ONjL/vtl/jjSLYLmKJMD9zrmi8k57RLb6y5Ekhkkg X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2016 13:58:57.5887 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1380 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >> + /* >> + * LLC is at the Core Complex level. >> + * Core Complex Id is ApicId[3]. >> + */ >> + else if (c->x86 == 0x17) >> + per_cpu(cpu_llc_id, cpu) = c->initial_apicid >> 3; > > This whole if/else block lacks curly braces. See: > > https://marc.info/?l=linux-kernel&m=147351236615103 > Okay, understood. >> - /* >> - * Fix percpu cpu_llc_id here as LLC topology is different >> - * for Fam17h systems. >> - */ >> - if (c->x86 != 0x17 || !cpuid_edx(0x80000006)) >> - return; >> - >> - socket_id = (c->apicid >> bits) - 1; >> - core_complex_id = (c->apicid & ((1 << bits) - 1)) >> 3; >> - >> - per_cpu(cpu_llc_id, cpu) = (socket_id << 3) | core_complex_id; > > So if I've read the patch correctly then the trivial fix for fam17h would > have been: > >> + per_cpu(cpu_llc_id, cpu) = c->initial_apicid >> 3; > > Right? > Right. > And this one liner wants to be a seperate patch with a proper > explanation. And that simple hunk can be tagged for stable. > Okay, I'll make it a separate patch. It still wouldn't be a one-liner because then socket_id and core_complex_id would be left unused and should be removed. > The rest of the patch is cleanup and improvement and want's to be seperated > out and explained proper. > Okay, will do. Thanks, Yazen