From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933787AbcHaVxy (ORCPT ); Wed, 31 Aug 2016 17:53:54 -0400 Received: from mail-sn1nam01on0059.outbound.protection.outlook.com ([104.47.32.59]:5408 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752234AbcHaVxt (ORCPT ); Wed, 31 Aug 2016 17:53:49 -0400 X-Greylist: delayed 4641 seconds by postgrey-1.27 at vger.kernel.org; Wed, 31 Aug 2016 17:53:48 EDT Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yazen.Ghannam@amd.com; From: Yazen Ghannam To: , , , CC: , Yazen Ghannam Subject: [PATCH] x86/AMD: Fix Socket ID for LLC topology for AMD Fam17h systems Date: Wed, 31 Aug 2016 15:21:40 -0500 Message-ID: <1472674900-60688-1-git-send-email-Yazen.Ghannam@amd.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BY1PR15CA0005.namprd15.prod.outlook.com (10.162.17.143) To DM5PR12MB1388.namprd12.prod.outlook.com (10.168.238.139) X-MS-Office365-Filtering-Correlation-Id: d8b1f540-ad29-4d13-56e6-08d3d1dc7a9e X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1388;2:xYMleL+Vz1IHWR6Pm8rsSiv9DIR7De8uFpcUgIxvl8HMi7xS5myeYNSKnZOMrFfTYFuRd+EZbUFBb2vK4lvzKALwnvwCOaGh9pYBa2JgBP7EWhI1EBSxCl5cMulddtNer9q68bh+trsY+E9w5pv5tGqHxYMuLH8e9e4RTRLJkAWMqcya2wuqjFAzv8UzMnh+;3:k0ziIlUDzB04HZeXxKMTThTdbPTWgIy0mtXbyI7qZtlfs9+5/lfzxxLxuD9lcXV+Hq1CcluV/bmx7QLkeMvIJI8OFVLjwUakbx5iL2C79E+J/Xl4Cbk7vZJSynUrNUlJ;25:csvyQCwFz/KRUMkUPcETSLKTwqpLDrYT67eVeKtdcgpRPNckW7YytnSwLtJ64CJbJYTg64gRC8vSFCIZszl3Sxeltd+x9MjMU76UwU+qDzCpEzO8UMOv7PhFLE1KR8b5MUBnyF7PqC0jI31PyHLn09s8a0iKLNngZxO5Enhf/sDQsYre4P0Jzi+T1NRwuiwakObTHUxgRHA8HLr7YLGNWfXoh797826vlinXPFFKM8tS6698rtNkD/MpB5tm7tVUba2vbDpxCuQZG64QkBZmJatckx+yFcXmZPcVTc4aDzWBareWGf91R7fN6qvPOAUFAyjCAfVWFYXfBCHy0nO+oT7lE74tsQbiV41Q0WlYi28hBi7+kfoZMxkj+87bBIxkQ5/f0yqspR2ag9+rCzAzqTLdWH09BhDFT6ZBNn4mpv8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM5PR12MB1388; X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1388;31:r0Z+BmNz2GeABCFVrmGHqd/nMpM+Mi4UC0hHokaKPArUSLo1fFpELgQUauhLaAz7RzoaVI1zjrKS9C7/ly79UCW7jJLQOo6VyPUqVAxcxKY81f6xSWrv9kwKKq6ZApLfsSzjEAhl2a+45OhiRmoiaFda59v54w06DPjW/FrlM5nWpJQXCa8EIgl5T6ptjFAkCRc6o+yH1dytnIYCWmnZOoT4cju+16TGcLVs6JsEyB0=;20:51mxrr5+9Sx3UJUAhLXeaYXCQmDDn0l0E5RWdNhDGQgfLKLQfEKYhEGj4/JifdYjBwYmzOVMNjrL632Z8YJ6aulDWF23LMO227Om7ORZovGVV2wj+RauOQx/bnak+mG5SRnnBNG4o7f3XVobuD9ahsAUeBhPefZ+qTFdUoehLqCoxrbih5aV5a/250pJoHcixW1Qrxb/+gO4KLv0+syrGwtx3td+OkJA2UWEX0+cm9pAMwiGCCSIm2A3Ty3NjkgOMiHAiVZHtDbVfdvLUJfPZDYPsryHbYP2vFqy789A4yERtW3C+Amn44hOGuHnQZm14Hcg5IcQFcvKZOCvnVlFTXGqNUdf3lI77as9uV6Q9TE6UzQqqIg5wvwKPf5kivZ1QCswB86yFrKXCxeZgFvX2lvsX07wBF+8NClbpXmVNSclc7tmbUPxIQ4wVP6zkufSXnuLakWAKy5UOlatsnOL/OlDhDlH/+T27d9MakNC3Zm6Xdew8kKv4N6jmjIEADQL X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026);SRVR:DM5PR12MB1388;BCL:0;PCL:0;RULEID:;SRVR:DM5PR12MB1388; X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1388;4:fb4mI4L7zaTRopFdqICv2exLdEGcx16wXsU9Duvz6jRW2JOYd02FtYbSkfr+PkI/Rk7ayiv2spAiU233wKEeVHNhRUXhriStJ63iujsCD+HdTuggnGxc0voDzrTMhS9oJFDAUwEFUiHA+cSAnCf3sUEkrz3f2NfP2uBuQKDgZa+7prAWlM0JzQ/IHjRhZxKuBgHRM7Dj/vXSjXpsp/M2i2wWKw9/laY/6Eagy0NFeRjk9PBxklR90inx1FqceZLNQu12DzqOJ29uXUQ6Ra72zPN2l2IwJwM0jT+nyMqsYoUHgPikAeaVq8lF3sSnDm2yaB5m76T95IAK3qx5wUhogGmjHHvnW1YPUc83S6Ow0pJnwvOyIb4e38aiC+CZ7SJFTk2jRCRmaeES6NILw5Y4B6niqvkpw/6smd9NmrdwDAEjWgGr/v5zOSaUycU14q/B X-Forefront-PRVS: 00514A2FE6 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(199003)(189002)(586003)(4326007)(229853001)(97736004)(8676002)(36756003)(81166006)(50466002)(53416004)(50226002)(19580405001)(5001770100001)(81156014)(47776003)(5003940100001)(66066001)(2906002)(42186005)(19580395003)(2201001)(5660300001)(7736002)(305945005)(105586002)(6116002)(92566002)(77096005)(7846002)(50986999)(68736007)(48376002)(3846002)(189998001)(101416001)(106356001)(86362001);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB1388;H:yaz-diesel.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM5PR12MB1388;23:KTCKhGSfZz0ihgpswhySD6IibM3O7uJOrE9fYVBai?= =?us-ascii?Q?twCdzpP0rcosl8u/PensSvl0+jEq7+O48IaDIW8/iPpGiwZPdMZ9Iz8cd4rI?= =?us-ascii?Q?o6NjSVaWX+rT6kPWsuLNMsae63oz60bWWW+4p4+nRvi3cbQgSPfiIyXCwDFU?= =?us-ascii?Q?Cjt3X9/4dz9Xy9ZEZ5i+CiB1rZeorAnJqrhTsD1itVOKxNwwFO6LHUpljtzS?= =?us-ascii?Q?+CNYf+k9YTFoxF248ofgUOxQ3NhaEYbHHvnqd9NhBmKcifXTcP9qp0OE+Tex?= =?us-ascii?Q?8isMLybbKAiVkVK4yjnf86KuTDeJSgUsvgeJxmFFiXqH3/a+ENp+4pNP3Uh0?= =?us-ascii?Q?4wTOSFIPR/5uRryPrE4ud47DHHknOcxDDh9Zck/St3Tmm4QBiMHso3jG7V2z?= =?us-ascii?Q?SknkgtnNIUhr2GvXInmw89jYkOsE/zOvaTIk5XuDF7pEQQ7uDca7nhIZqG0T?= =?us-ascii?Q?hCmjD+oLKr4Hl1o66viR9/QMpXkrhtzyATi4v59Uw7Rt1Nd25trBEIwF0CiF?= =?us-ascii?Q?Zid72VAo/6E3/x+FTAHN0wOxV9ady794CAPSO8l+ZKLhCWAfV+tl8083/tya?= =?us-ascii?Q?OiDO2s9SMByScKFi3JWwPm3gYZxK7hKUQqvJtQruFsqohZeGQflqFyZDJ6Ic?= =?us-ascii?Q?jdtZL5yUhmU3IUBAxr63rjKhz4a7Z72oWAeYzhNzTf33+ZVRZXeJyQ7+ad/r?= =?us-ascii?Q?auql0cu+et0tSC1uInEmzdq+bWYpaLsWoRFvb+FIkobgEWgmJ96RYyWCANcQ?= =?us-ascii?Q?jYAebDX+RjuuCLlbtSSRXg3V4lqENDOZBtor1s/Vb/Sv0A+iFJLqMbnI+Zag?= =?us-ascii?Q?kjc0YxvItMWnJCLKvRHCffva0q3bulIpQC7MnoAyYHTIS9ZO8Wfv1Ftz2wQC?= =?us-ascii?Q?uRw/Lid5x/W7eazf4L5XsRx3GQU7uvxBy0H1P84a+h3NMhVcRk4io3W1Dnbr?= =?us-ascii?Q?YRdrbxECCp9BTBOkwHHAPJT8BNduzg7hpIJrq6OK3nuTtabG2gYR4VcNqDaF?= =?us-ascii?Q?KCKQZdoiO1Rc2y8C1e3RXky6hFaeBoshpOmuGTtU0TbwDNx6KvE5c72QLi3c?= =?us-ascii?Q?m/N1ig=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1388;6:s680pIWeQa1sbRIqMsaebNwwzncwNN2Hj8HqE2gGKcjHLzi3P1J60gvnPQUhx7hoWlkqXoPwUNPLbyyCTEhgGp9+dl+tlTHAlRxJxUn26jVy5fwlIJtQ+cQEQBgnvn4ywZcU0hsOXlOQIuY1CA6preGmIY7c9zp2Tw3ea/CAUr5z78zYsqh2S5dWXS7CzZJ6jLvL65adXH55TqKDs9gzjZGk+ULgZj713q6DobvzsCP+kH45WIQtJvcVffcGAvDPHTf0sP4DSvt7GvRYrI6lsRmdbj3OWeq3veGbAkrw5Gi39XdGC0PRokA3HunzpKHhsEDQL4KyHNSaqWsIepIsJg==;5:Ow/eRB+fnnkZrhz7Hgdd56BQt82VFPs6xtU6Ylo8/bTumiIn4eJ4+mb04SRKYzUbcJn+qda6wIF6NFOlOTIcOKrrS+SSzsne7oo0g56fEHAwfx7xKl0scWSr5SDzD9qDi63XRpgQJZRlnCyF1BPBKw==;24:Bq3ZTj3TQjsUxe1UvmEZt3tuEGkF+SQ/K4PPbY//y9CbmHF4gt9ubUa7UEJZu9rme610OIp/8J16uweXxc9b9qojIXSprehs+bkPWAM/zvE=;7:pS5B5u9mORFq/jEdgd99WRrBFIJ1Pr1ViwfCAqCyBj3+j3N7qRiV3kLH0G9xdB08kXM2XYl4Ex/kM13eS//8aQLnY7+UtoU2+bkMYVhrAkBOh5yfS0BgYrA3doxd16MwzQ3QXi1VYlAzzCa/+jgo3mAMrcD8pb6wNTTQryCQ0CoqOC620UDI1VwH8ESD30SnVK4Kmjc60rBZnTvdEAgLzgVYtrDdM/OHCMf9SkCwQCM2wWj1puPPQN/Op/qWPxhf SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1388;20:EV0sJ5nPGWHhuEIvqVKuXIth5G0CybJzTyr3tM1ePixAd1d/wixNalBuISrtQGGhVpJ8L2QW5HJ3r1Wx79zxLfQTAV2Dsmeq7rIzW1aRJUqr7NJa+VheOxvcH8K8507YmYmNT5kOoYY3I0ZhMLeNYUHdRiabYHqSBzIgapU5yDsoisi4iY7DWFuCGu1O3RcNub6jBD/TyfzfPItF0RT/hQ3BdALyc0OqwdmTG3SkxtFY8NiqW2JEJIYclFmZm7hR X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2016 20:22:06.1592 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1388 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Socket ID is ApicId[bits] on Fam17h systems. Change substraction to logical AND when extracting socket_id from c->apicid. Signed-off-by: Yazen Ghannam --- arch/x86/kernel/cpu/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index f5c69d8..479555f 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -365,7 +365,7 @@ static void amd_detect_cmp(struct cpuinfo_x86 *c) if (c->x86 != 0x17 || !cpuid_edx(0x80000006)) return; - socket_id = (c->apicid >> bits) - 1; + 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; -- 1.9.1