From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752269AbdBOU5W (ORCPT ); Wed, 15 Feb 2017 15:57:22 -0500 Received: from mail-sn1nam01on0089.outbound.protection.outlook.com ([104.47.32.89]:55072 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751934AbdBOU5S (ORCPT ); Wed, 15 Feb 2017 15:57:18 -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 v10 3/9] perf/amd/iommu: Clean up perf_iommu_read() Date: Wed, 15 Feb 2017 14:56:19 -0600 Message-ID: <1487192185-31272-4-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1487192185-31272-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1487192185-31272-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: SG2PR01CA0102.apcprd01.prod.exchangelabs.com (10.170.138.156) To BN6PR12MB1444.namprd12.prod.outlook.com (10.172.24.21) X-MS-Office365-Filtering-Correlation-Id: e93241c1-dabe-4585-ef21-08d455e5338b X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081);SRVR:BN6PR12MB1444; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1444;3:WdRE83868Rwu/KJ2ohgyJcONRyD5TY+AyQyMo6vh769lyF+GyjzOQYsBpofUaTBU00SSOJ0JdZY2YOdVgqNCkiKC6vXoJmHEgYr31+HvFC2tLLR8DfqWxZI9bnOZWyf227RUnG4090hGjcfHbgLyOCoRSZAPvJ1VQ8cf0++eNjrd0RAmg/olEBKS6i709+Cr8DAFSzjBlYB0uZW3NNk7+dU5OyWgBLBSEh5By8mcaNHPXQZgQEx8srAqeLk+Uc6aLrV2z6XmmFvdobaRwZ0knEmhh3WXXE4Lxy+XQPosO6Q=;25:zRcTgN1wmueljBoukhPm1K7fBEb0UR5sL6evP/v4vg3Gvgy8AUQORWyqydkFjlKD7Ti9I3XbXW66PCJb5lhlwJMMhjRmA8AOgQL8unHJHYY1C/6kdixPWX3TN7SnNCRm9GWpaFUL0S+vgiK+bkCyi6BMpqxzkAXS0HgRiu/AaHXFSaHuf1MwwBoBA4+nyGqyd0cI0QS7/t6l3NZK3bd5Y1TCeh6TYK2keBoPR+XOiYJ5zjgpd1Sstt+GkD6Wvjzoiwa2ORleb7bss+j8EgAbRklY0l76mFDW0luTox1uffnuqZycTW+rh2ezseDnNe4+leTjYJlT6HW6ptZG8RlVNVCmEE/I6qWU4OAgIvpfWwjT+6ki6IKuXW2rvdj2J1yq/Ml5jbol5jYasRUqCR/KA5lzakmZanaMH5ExuU4O/CdQmQeI/Ymdh5OgRSGYafFobLngEwuB0Cd9uuI+lujGUw== X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1444;31:jV6THTOhk5Lz/i9ii0qS1P2SsvVX49zgftkb9kOfwJj2I1v4pAPeiywumvgLJvKqvZz+MW1fOmSiTjyVTcCCMUostoTOruI4M1vkpbRYBlS+VGRXrE0YZUrguHqBQL4y+WJHpOQkGLHpaIeButTCKxIUp6n6EbmN84wEsSlOmwZJ/pvVkBla2KjbJe+nF4DzCd25A0Kc2Mu/uWvSQ8YqerGNrcSlWHG3CJsva2gkyJOBj/PiMauoXAUcQ9K6TqV/;20:7+B3rdrF+XgkmqUtbuX2kJJiHeE63MzCp0nfEbwnbmbVMuwbMOAVM+JLQa2SPXP7LDY9wKo7DBaJfTn28y/31BdQaIPKCf8O4KjKWWlq3y5kq5qBrrVTltq9BHnNx/Y4+uo4wJkNGB3LqkDAFWrGhXhEFsBeMfx6U1SyC+yNuxHXZqDcYcIwUa0Ro6Lk+PtDtVN1OfyhCdCqh2cNeSh6wr2ukUR5LKNGyPqzIRuyQP9U/P2Lg4aNhn55w+6JT+WxQusP696Aovdn7vWwgm35G0cj1ZmOPWR/44ogT17+AZPyozxvcNKbvGIQ7MUYKnNk4Aj8ReRRHD4X87hDJrO/W59qWnQfH/xXgFrKxSfw1g5nIo5m+MW67TtkCDc770IbvjUq4NxUiIjHLAAfCWQee77tmu2LCLOCtYxE+08qziF5nR9pdPk1Vsu7nX7Bu4LJ0MtO9xB6MBFLv2bC8DVrxZrkK3j22KgLaeUYBAJPFRlt5posyG0Xpvpi9fqLtP28 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)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6041248)(20161123564025)(20161123562025)(20161123558025)(20161123560025)(20161123555025)(6072148);SRVR:BN6PR12MB1444;BCL:0;PCL:0;RULEID:;SRVR:BN6PR12MB1444; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1444;4:CUrigyC6MgoNuiQK9x0OBQrGc/EQMQmdtPG0lOWApr9YCDm/Kbk+cQAsk65l0qyV4Q0F4+EBvLjzsvkZE70nNNwR2S7h4VvwC/sDjcQLvefzKkPoEnZWCu8m1OAfJAH/75sHKHwFsvUtfyqgMVOU4NmqoJwAbLVpyl1jX8f///09Q9JeNVq62yBWXV6roKChdItCCgaktUJ+w/5ZUgbXk6DWZormppwQdB6rM6/X3FXAr5RS+RpupnHJp7O8/PlOM1x/zQktgUQzRrBP+3IACKRhfSi+ctRBQFLEwZJXkCFNEJ70/HyzQyxjDQ/5lY4saBA3lXKX8yKvqdK/RDMp9mkil+kj+w79rnLGaobZ3w+PC27eryjpNtjTVgiAL0ykPHc9sI/usZDUiESX9XfQTQgzbUVna1GvkEgZD7nqigY/dsJ6rTgb0XM3WGDxVoMdlj4UnhkvqMy0NdtIWmBkApmvkxsN9sitGy6dPL3m1GtR06cgBhTWrCJJ8gq7mRziySL5W7AMwA37TtqUu+IcB5edJIRTkCazc4viVGCEOTeuZ345+E2DsVghrH0cRLh2X7oha1roQ7rYP+tbb4OYg8DjqRkAEDW5dBKDYwqSMIVk/5LwlDNwFIDBRF51ytaw/MQ+VKTrw2gL4B/oZKFsqWfXnOcXjqi1vIGJ1wvfhis= X-Forefront-PRVS: 021975AE46 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(39840400002)(39450400003)(39860400002)(39850400002)(39410400002)(189002)(199003)(6486002)(50986999)(54906002)(38730400002)(53936002)(86362001)(305945005)(48376002)(25786008)(5003940100001)(7736002)(389900002)(42186005)(106356001)(2950100002)(4720700003)(5660300001)(76176999)(105586002)(6666003)(6512007)(189998001)(68736007)(47776003)(50226002)(97736004)(101416001)(50466002)(81166006)(66066001)(81156014)(8676002)(36756003)(6506006)(2906002)(3846002)(4326007)(92566002)(6116002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR12MB1444;H:ssuthiku-rhel73.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN6PR12MB1444;23:UW3jFkKjj3aYW75G/IB9U3yqvi8AjPhgZoqMr64hi?= =?us-ascii?Q?fkuyq8kk7zPXxlutqNKQ53kd5KIV0RQ7jFMPSW2DYQTJp+awFayBPZEznNy1?= =?us-ascii?Q?R0w0gCWjqPdUUVyCYnr5c15Dwle3rsOqgsAJULQOTRBIBouCUwFzFTyQS/uT?= =?us-ascii?Q?Wq6envrc2MGX0f2KmHuIaQ34ZBC/eZAjVLtvrdYhtIJf31iOXprTsRaBZUJ+?= =?us-ascii?Q?K0mM+T5GH5MmswBBeFdayS6S3Wvea+Gc6FL35fPcM63cVYsNPERQo7/+4fPq?= =?us-ascii?Q?3oOwn/eecZEFsI9GlzccLxuLM6WS3TARwDNBwd1wpkeDa9kjO7/iBN2YLaPp?= =?us-ascii?Q?jDOj6+Iw47XZz4uoWXUrTgq2IMC2trzfsZ9CI9WAcdAT8z0aTPE5ifjXgdF/?= =?us-ascii?Q?V95LLv45lCfKV567H/eTaHP9HgjnogrT9OWUwvSGG9dTrUp4ztEiWSy2sKtu?= =?us-ascii?Q?kyeJYoIkLI6ZN8oayesfjpplgCdIsf9uQ9+9LgnJLuI6uMXX3ziJUWvcpuia?= =?us-ascii?Q?cG4izY0aKo0D4a6JCztB2wwjm/XLgyfzWsmJl9rJ6d538hf8OO9cg0t1j8w6?= =?us-ascii?Q?N71dkNT4SN8ItUMQSpNoMcC/lsRQdf2KsRzVY39WEIytPhOFbV9t+TaZnQ4P?= =?us-ascii?Q?Y/GborxLxisqJOatY4LRmx+eOtQS+WsWlokSjrpox0v0r53oWvSERXnDer5T?= =?us-ascii?Q?dGUn1jWwrp6LneKIUxrDC3j7DOjgJl/d69vxF0ydPQUBQ+qCIPX4yTrOVncd?= =?us-ascii?Q?n1rQwRQCmaAo/aWjYARxKXzXdWeBh5qOzJkgz9BmEyHCJvaePZPA1PfmGNJ/?= =?us-ascii?Q?cqqJ8oCAplGTubB9Xr78XM8VvSVFEvfIxN8Xr96HGBqeTeLNJ8GxsPdbOPl+?= =?us-ascii?Q?O0458C5IoXCc/MGDRbLiRP56gkTgbfCjqCUswx6IIgoQlQdRg6gGXW5Dn4iq?= =?us-ascii?Q?Vu6xiABYOMH5U5GRKYsTyaG0XVrFX9ovUfTFV/VMX9SFf1jANd+MkTh9xDcJ?= =?us-ascii?Q?IAuJxS3NF4GxCtQO+uwHgxQYL0VbuAXKcbrKp+/i17OsHgHR6AvjQiYxqYyT?= =?us-ascii?Q?jPpIh1VCt1vEbeyoMIMCb2MtaFC7FaygcoqD4RP9/PagzusiR3PZKIt+KcPK?= =?us-ascii?Q?P+1eijE6OEaEm+YyAGo8RnUl+zVC3eag9tNKu7DhB0iy194xmreZRwuXA/Lk?= =?us-ascii?Q?WkKui5kd3w4t7Ai+uLwh97Zs4slTHqDDPco?= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1444;6:Tmf568mmzWnaH0G/Ni9Sbf2H7Y05fqeJ1LwihI4uLTGpY9Y4h17668owKPgH0cnak9ahOaiDwf3SuSeQvXHsE0gblw1JSQfqdhNrpG9RYWvBPbbc+2gty+Z93EhaLLIQHSHcI/IfhbGCFG9uLmaUofzvAqOxlknu3S55FjfY6rZEHkC189czQvMYeRRQjMHdeBsgaq/dAlPyc0OhYJBi04zBU5Y/j70R2pdWPjnMbxlMokWvwjOUVBR5deBkzUa+UH7+ydm/yeDcy+0vEzh7rVvJMoA7elm71+igfzVlwpkuD5i6736Ch30sAo4C3PLtqJw9FiE6VmXDrcpXzZSKC+C7j/EDVoG6k9ehPeBzr5c9qlbUCGVKqZqbw7WPGcFnxotAueiDt95SbKwM4xSJOx73aiPUTDNt524l3a3BZPY=;5:WJ+akHil44Zvs7ErA+lWMdMQ2GYbD7qTLR+NyuoogDdzoDem9txvuZjRnW0ksYXdskXoWUdyjonP4c+hwSFj4ZQerH0HqV3bWoSy3MKECJemQ3ZQWJZH50dzA2vPkdhFk1DgPakinfayKR+QyqOnzw==;24:/85Vydzqs+XKo58M6+ChEaC22MbVbo0RK3AYC78aBjyxBHzMQHlfjPXvggD3QePTDGacF3gwb9I87dv3zqINHL5ZWt4zwcgVzFkFbEQIVgA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1444;7:pvQJ4FPrLuHcJOiugGdZheC5xkMUwSEUGzvIbeIPNZVFueVdyS5otO8Zyt9+26iJocHI0ZvGMBo5oUrqUytol3sJPmN7uhwCWUUzdVBgYg4nCIGqc4zaLZhOxPBzbhw8ozoR7tdoWobJJvxXRbrwTrhSnSWIwcuMzuRCpj/8O9fmdHOC2ntNLGQy3mIGjlzJqQ9vg0tCZ1+1wCREE6ldprRL68gUr3eR9Wd8PCTMT0zVJZt4+LUaoROcd9k4MYafzkpB37O5Wk0TgC24evqH0sBlllwkF8Y+6xfMTu13/YeM+oL1Dr434CkUq4CFE9pwscW6QwUdjXheY1gt+AaDRA==;20:nP2oZ8oImbQp97cn+1IeGimb9vkXpXqdUkMkLpkS00Tn8NKhLXcqChqO50OVbltRSW1lK3LgiIVj7G1WKl9EX7Td/wq+cxuI+tJyO2Wzot0XH2eu0MJUHRzURDn5IWHrJtsu7bDNVrPIJDbxfv0jfsFdkJEpK9Oi+RPxLmMxFyIBFTSsn0UoI0F/4AzTqwYDwbCDAPxcyMisRSeYqEp8IL2NfG+/IOKmPMGwM9DSe2AXT04q5GkXEEQSgL2tOP07 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2017 20:56:58.8548 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1444 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 85b634e..5bef429 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