From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751430AbdBXJ0z (ORCPT ); Fri, 24 Feb 2017 04:26:55 -0500 Received: from mail-bl2nam02on0050.outbound.protection.outlook.com ([104.47.38.50]:39822 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751296AbdBXJ00 (ORCPT ); Fri, 24 Feb 2017 04:26:26 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Suravee.Suthikulpanit@amd.com; From: Suravee Suthikulpanit To: , CC: , , , , Suravee Suthikulpanit , Suravee Suthikulpanit Subject: [PATCH v11 03/10] perf/amd/iommu: Clean up perf_iommu_read() Date: Fri, 24 Feb 2017 02:48:15 -0600 Message-ID: <1487926102-13073-4-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1487926102-13073-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1487926102-13073-1-git-send-email-Suravee.Suthikulpanit@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [114.109.128.54] X-ClientProxiedBy: HK2PR02CA0037.apcprd02.prod.outlook.com (10.163.104.175) To CY4PR12MB1447.namprd12.prod.outlook.com (10.172.71.139) X-MS-Office365-Filtering-Correlation-Id: a0461a55-ce61-4a03-e815-08d45c92043d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081);SRVR:CY4PR12MB1447; X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;3:2EsvUOelzsRe3hX5S+g5+4DBT5IS+6O1LszloCQ0FSKl5QCPACPhuM0ua9b22JGD4+IDt4+aYJjt5ilUCIwD/YUxOaodixtgQoubNmUXWp15z8m77j0BFu+LraGvB1or8BuY9m9FVoPspy5prcOaaREaw2EB+dNbJXUO5VYFUqf243y2YZeb7prTrZM7U/8jF+USyGbtIIWOoCRJt8rJM7NFQEKoRjtH8jVqC10WWfInef33eMOx9WT4h1k1PdO4Fu4HhSu9MAJyLIyuLxyIZ/6JhAqYaqSgVHZs0a81nWk=;25:W+HQ43EMTn/2FvcAADBCCSpx9KL6M2JRlGpnUCByR6dGplC1uIMB037LR4WCtL1NWIJdbeR/OX3gwfmxzT9RqoLrSih50jgUk8vTCTc0LEQe86B8ILDIbHiQM0XEL2h/RZns9uhRCAXQCTJ39BhLDCfQti+S21yWhaoiOFwh34PQG5pggISwN1Vx44USq5Yvw7dUsebGuSFHcUyZSPVHL5tCGlSzmcFFlysVNJ0Qh0J5ESwTVJCk6xt8WsGLRLC4At0r/L4kCCOnzih04SDAP0jEEAdUoiUAj8ppwFJ7n0Qn1sjjCTrXjuZ9BRJmr7Cz3ByM+m0HjM4tIuYiOYkvPxMJzr1eDPQfuKp1Zasg6jb0d6Y2Yrb9wrxqxxttnqk9KcxVC+4YuQZHl7tlBF+2eZKm7MmeATgkUacGljW6Scb6Ww3OcpG6x7+mFSy6q7aAc8vBSAAUsSNIftLgpP+G7Q== X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;31:qC4Rcys2IfoJg7FuqOIBb9xBYTNGrp8BcdqKEWTWSxrNGO3BmIyLluZ25oNNCdCRAU2dbFgxt6dnULYxFKZvwT4rnQZLILcpehTgtyrWndlHHeWzdwSnoAjSxGRlad+MK/xveXJ5UE6N1hHGhf0GJdthZaQxo5Yb2n3trxcd4NvzZWakcTFPspIwj1TJ3/eXFgrOMvPpShoOGJ77KTTDsKC2xniwv8qPWlaUSvgTER7fDT9Rhi0gy1rqEmJ7dehO;20:I3DPXfO1cX2v7rvrW9RHNKzJMxQjrmhcuM4E1cgPJGABitJo1jeqAJC9QfzoOUcrgw3swq7kXqqSRAcIoJ6iVlL2yHrzCn49Jpv9+geCF3gGKCwQQR2hFYkaGwmaeqV3MO3fCJCfNDJfLxg3Vz142a5kY7s075sqexdjxF/hLTrXB4KhqhDIcb7FnOYHxMHuFTvrWJ6UDc0MVBhpvXc+2rOinvfvomRFk5/nKXhf/NQsUgkfD6BkLxVQN8FwrJJ5EkhPN4TQfpRTQog2/KhRWLBNzb7hp0uSczr5gWCy+L5Nsvqkkug7P8yeIlU9iIjm/Hh2K1YCN2KoS1csT6/oOhGJLGp1ZwfMaQAHbEhG99Bl26R0zJtQ7jZwZeOThep3Hoz1YT2zi96MDZPCCaqh3WyfqKLhLGKxcOGnuN3sz9mzmQ1y70JL15DjPoNrWMOlqUmS6Zx7Xmafn5XhCin6sqQBaqmJFp5eUcJtrw4StfDO3M9H6juZRuU2vD5atcjF X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123558025)(20161123564025)(20161123560025)(20161123555025)(20161123562025)(6072148);SRVR:CY4PR12MB1447;BCL:0;PCL:0;RULEID:;SRVR:CY4PR12MB1447; X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;4:iSsxbDy3PZTATzty3Utx1WFh8gziYYcX/vZ9zXikOhwVdqXMKcRmOLe2c7EzArchY75qM395F8GDxQYQ3PagSKln/Qnh4grWYPTUgHt5zsvZyut8GhqwOdv1d2SO54mNRI/U6RsCOoCqCeFZc/Z5SE+Ov5yAFT+Vi75yG3MQlE3JUaRdU0qoFSC+3cJr4sT4HTBp1eMIWjQsTkx27cMvV36pmCK/eIo0JUlDAv5Tdp+9fitSES1/Yxm+FXX8Xc3H9EGt5vHHjUCsI49udvy4HAdMqwibmRETRqEDbJQLaKc8BtmTjTijC9zYkVXiQrschaJHcNd+mx7drNFpQX5lRr4kBF5On0RuGI2xI9x5K80juUDS8fyZNNGQCeOHzmHXWwiKQopFCl9NsZ8Fb4huHxfJgb9lMyDK5JV91IT7ySQ/nLW2i4wQnrcFd/K4XOaVYKXnDMRnuUDGL6FNV5f4e3jC0YWbkI+QSd7AqdcKfgvdUoFJfvyWXyzQIXSU95ArWFcPy1jNepHCizo0FxvUoqBxrtvvN+lz3p65rcYVQ2FpQGT+RWDYS0K3sbHdEMWuDUjeNrll//e0ocJ4mMjd84+HiMmYJO/vMBP/Iz3Tyqb4lk61y3LfL9oL/onBwNYzXEtkA2HXl5lWCJaDOg0oqVoU914vQ2WFIK0R5Kuc9gI= X-Forefront-PRVS: 0228DDDDD7 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(39860400002)(39850400002)(39410400002)(39840400002)(39450400003)(189002)(199003)(3846002)(4326007)(105586002)(47776003)(6116002)(76176999)(305945005)(36756003)(86362001)(50986999)(6506006)(101416001)(106356001)(38730400002)(53936002)(6486002)(7736002)(66066001)(68736007)(25786008)(8676002)(48376002)(5660300001)(5003940100001)(54906002)(92566002)(2906002)(189998001)(50466002)(6666003)(81156014)(2950100002)(4720700003)(50226002)(6512007)(81166006)(97736004)(42186005);DIR:OUT;SFP:1101;SCL:1;SRVR:CY4PR12MB1447;H:ssuthiku-rhel73.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY4PR12MB1447;23:z6MUm3RRccmMnSSXTp/QKcZAh+ieud4hFR4cwe16t?= =?us-ascii?Q?MA71iYl6JDSQno+YYf4CEfL2nb7MvUZiqziUgK4Jmc2j/ZB5EpvL0wxGa5AL?= =?us-ascii?Q?hqIealUdjpld9dV7T6xrtNNYpd/alsIDWMy/pnZFiYvaLHuERErwusMX0rRi?= =?us-ascii?Q?oCXT6W4iI3jiHpoKxSAQL229PtsxOrILK5qcCyzDTUYgVN1yoAl2xoijd5yO?= =?us-ascii?Q?kt/ioxdplzoY/1kXl0zgDwTnUkxp8n3asy2ek4g06AN2gJgUFZVbeX04Nuyc?= =?us-ascii?Q?moKMuerHv1YQD+vfPmCvjv/EdmYjP4vp3NrMIrQfIS/KI3+dE+r9ZgYM9l6L?= =?us-ascii?Q?vhK40owgqbKpytkAVxCmJy1mYgW3eRu2xCVSpxT+oAki2WqbAa8s+cLHnY4j?= =?us-ascii?Q?zJxJRz4SREiORai9+VCjM7SyL1BqJQ+82mKsirPb2V3rlwJKx7hQqlQJNOCy?= =?us-ascii?Q?0x0G3U1cGvROtiGeV7mnG0SWtUUUGdbhUis5y2NTlmvMSisr2OmDf4mQUUgp?= =?us-ascii?Q?4BFpFtM71l3IFyEOeX50c62ksmJobuXTsfYJu+BHbc56dYdnY7hVBaEd/K0w?= =?us-ascii?Q?dPlalC2XMVcHGyc8xSPICTEftuElli+T5+FdPfLSYPMm774cBI/JkvOF8/LS?= =?us-ascii?Q?pVLDRCqYuBqerP+xtTd4pnIVQJc75pfNbR8yoXX7xnENKlauk5VGK3/i435h?= =?us-ascii?Q?QbtmGloUUnRqG54tUuaRPzK7hK51FJv6OE4QjBhswZyFJWIi3P8Bj+1ZE1Kb?= =?us-ascii?Q?q9kwYN+FpG01Bs6+Rg67Qo0orfW65R+2YatG3fU8EjQbYs4QQIR1CUNkxGqj?= =?us-ascii?Q?FsHn6HbQYYwL/TTa8XfHVdKBRZ70vuhZ11ZnAtyCf8SCuiy77lanC6tGOivo?= =?us-ascii?Q?pBx1xnT2OZVhZ/7cyPmxDtl65lUSC/i7D/esTfWaQo0KJTr7esh3RH2o0nva?= =?us-ascii?Q?Sw2535955c2NXnmHIAmZd7dgvw8uEk/Z8bOtWa8UvKTVCR1hCLSV/pYwXMqi?= =?us-ascii?Q?11VvuM4RGuilgYTFW0eRXRy+9B1KMxDz+wCkxhBEvyZZYS7wib+WP5WCkbPT?= =?us-ascii?Q?lmDutmg9HsdfvdeizkyWoz17VepfpiPKXU10YctxXHDCLoLMqDd8/mj4InhW?= =?us-ascii?Q?IhlU/dacYmyDeqoiZD9+FUknrNOsFSAKcmapD3bmqjSWUAErD8XkXRtPmH9K?= =?us-ascii?Q?yESNEGkI2s9iJQ=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;6:ZdZ5ks3CZFJ4XdbeUH0A5smrQAUUaAcmrQ6Vz7sHYcGt6PV18hGJtlmmgFWIajYoZKnInYN2O1LfgrZq5enI/zNXnQvI3Fzb99qMqO7ZbFw9iMrVtZLszY7YjH8t1L/VW/Oz7uEFgWy3dqpVsK6gzEh+KG/Pv/xY4Ckrka1bvl96uSR4dxNQb66cYKgh/23VqFpBtAbUcTi2BRVWk4qYzv1spCQQg07ccD3xsigJ21qr24lqP3IYSHooYmki/DUHiAaAJZK2Xu0esiGyRq05xRNKLIHpYMSNX1m29EFbZbJQjK3gT/wV9l6bqa+EDoZM7fi/UbTgWjpVre1FSzx3udoXfrDmLRuXVz1DfG60qxb1/1aTR8lpnreAB1SMxHwvLV6seFCCxyx4kW2mBUKhAyYZ8PEVA2aLFYPcuQrWiDE=;5:cvnx8arwbOeyEniBRKugR4d5b8iuKM/EqbUJ663GaUx7kCXIFf2SXJp2ps95gRVxHrxJd6WeCJRgioTrJ2lRQjusXwLcRflS9+YDAHQ1aIqY+cXJCf9DZDOu1/TU2JRtTTKJhE9D2DToJAhjOvKYPQEH4PM/kvzm17fzkfYzIMY=;24:nOcFyCPfE2hC1/kFaRMQhQRXqRKI694zGteoRbfpHukCdruuSswcC5kdi0k7FoQNjnJfiEf/rSMVs0sEEN9r+i97GFaDYNUKddNwNqQqO7U= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;7:fTuxP7Knl525JFu8jdYmKB0PBP75CsNCQuTVPPgMs5eKNG0E60cZifDUZ4OT4RmELYJ11QeDwJlgpncbzC2X9FMn1QZ5UGX8C7MZhxk1Q2XXoNeciWZO9HtnReZP7m+c/I2rPZpObN5goJNJpVXVLGXUclFknG+jwb3KLw1J8dPFuBjCkwjRxg5LwuaAmbqPJ0j74BttqWmznU8b8ARFiAaq8EHCAauOEoMaJ1GY+ut654JsAWXHVzbI6wWktKgBOSyLduWSB+a0Pp2L8luAHGRt7m+kfvD1TOlSQZ00vXCRdoVAnQPxrF+SwPtMBJYyTBAahunQFv7Dp7ALuuN+DA==;20:Ohz2rBp4l34XRCru3mZ6DBCRHmpdWhlAIcwG3PVZnuW+cABJ51aw2V2W5TT83BbR26+pqCCEFhcOprNV7MGua5a0x8tziSs9OX+I9HBA0HxmrV2EZgWQAv66kmHv47dgS5wSgwxBcIw+4j3b4knskUq31I/pX0oZJ/JlEnv+vNEaqbFZFvnYeWJFYJdL6hsHTGdcmo7dd0c5zws3dVDB9Q4n/WHBowJBF8H9xzMoyiyBDFAYbhzaYk4PnCfcGQsO X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2017 08:49:09.5394 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1447 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix coding style and make use of GENMASK_ULL macro. Cc: Peter Zijlstra Cc: Borislav Petkov Cc: Joerg Roedel Signed-off-by: Suravee Suthikulpanit --- arch/x86/events/amd/iommu.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c index e112f49..d4375da 100644 --- a/arch/x86/events/amd/iommu.c +++ b/arch/x86/events/amd/iommu.c @@ -320,9 +320,7 @@ static void perf_iommu_start(struct perf_event *event, int flags) static void perf_iommu_read(struct perf_event *event) { - u64 count = 0ULL; - u64 prev_raw_count = 0ULL; - u64 delta = 0ULL; + u64 count, prev, delta; struct hw_perf_event *hwc = &event->hw; amd_iommu_pc_get_set_reg_val(_GET_DEVID(event), @@ -330,18 +328,16 @@ static void perf_iommu_read(struct perf_event *event) IOMMU_PC_COUNTER_REG, &count, false); /* IOMMU pc counter register is only 48 bits */ - count &= 0xFFFFFFFFFFFFULL; + count &= GENMASK_ULL(47, 0); - prev_raw_count = local64_read(&hwc->prev_count); - if (local64_cmpxchg(&hwc->prev_count, prev_raw_count, - count) != prev_raw_count) + prev = local64_read(&hwc->prev_count); + if (local64_cmpxchg(&hwc->prev_count, prev, count) != prev) return; - /* Handling 48-bit counter overflowing */ - delta = (count << COUNTER_SHIFT) - (prev_raw_count << COUNTER_SHIFT); + /* Handle 48-bit counter overflow */ + delta = (count << COUNTER_SHIFT) - (prev << COUNTER_SHIFT); delta >>= COUNTER_SHIFT; local64_add(delta, &event->count); - } static void perf_iommu_stop(struct perf_event *event, int flags) -- 1.8.3.1