From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753544AbdBGIlf (ORCPT ); Tue, 7 Feb 2017 03:41:35 -0500 Received: from mail-sn1nam02on0078.outbound.protection.outlook.com ([104.47.36.78]:47320 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751618AbdBGIlb (ORCPT ); Tue, 7 Feb 2017 03:41:31 -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 v9 3/8] perf/amd/iommu: Clean up perf_iommu_read() Date: Tue, 7 Feb 2017 02:40:31 -0600 Message-ID: <1486456836-17428-4-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1486456836-17428-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1486456836-17428-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: SIXPR04CA0023.apcprd04.prod.outlook.com (10.162.171.13) To MWHPR12MB1455.namprd12.prod.outlook.com (10.172.55.136) X-MS-Office365-Filtering-Correlation-Id: 5b20a2c0-2495-40a7-3e33-08d44f3518ec X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081);SRVR:MWHPR12MB1455; X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;3:5zikB9mc8H+/70Pr4MB4PZgY3fHnxBDPHI6crTOthKL1xgEVKZ3lVL5Cy4/mkP2NWZB6AfOXFQBDl9BhBfQhE/i7DwNh/kV5OtIiLuvqKJd5K75r3Cni37opw+DWdd0aBPL1D6OM/69WRjHgLu0PG2qb69U0MO7Hqw6jQ5+CcRBmhKYMi4pVUDMQtwcp7DbkNXyYfR3mmJAmlk0oyOdSjT7+08VFETmoMXHS3YtvCKy9am49RxJG1o1OlM3FpqPA7hldbMrR2dkaGTtb05l2PETqs04qJPiAQmLBp+MTGnM=;25:Zr3wrw5nPTGwvqrgS1jaAUe+ccz6BNVey8nPoOX+eWtljThhtPn36iO6TShYiKh77E5fL5XcyL9DKGw0C0bhVuqk8eiFuic1hA/YYj0z7HzDSNVtze7wW6MOx0TaIlyJPQIZAjOzL7nTNTWpQaEEzcd0iuYJF52jUfK+2KsCh/DiEvKZ02lPHm4zuXCPeiowwnuv7n5IP0iyyT71Jj+pJGiRUitPAZ954pmIPUxntpWY0VIY2wLgGBu82A6RLLOJchJOjIZcyQnyALvpDAVc/vgWDUM6/UqvNUqfqXwqPNsw85+/e6cXqbqcrNk3XwEIGPXv/CO0eJoObDcSzsgCvHmiJ8Ce923O+URNf21CiU0drTOwvm1ryRQ+BaVGEzo8DUK/Khe4BJdyd7bxqQ+VpbmpEb4rHVhT6Hpr9ldGmw195/ufZyjR5ddO4sxfHX2leI4kwmY8E+0xdUpuDVs6TQ== X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;31:8b88K4WLoiXgHPQuVa3yQaVj2O4/ErSejjuX2fJUxzrD9bFGeYASYZ1KETw0Gx7amBi29uPRW6TNwgsq8H0gNEH2Mt2TDdJWFKZli5gGlaj2u9EWZVidfNGlSYnUT4GfYuWTwXfSORzSjvPkEYRZmw0Ld2etdnOjKKjkchy4+JDAr6zCeluRo8AE3jGwMfpTh4+OG0L1re5uJAu9dzkp+e4E2P2xcA1CTa/SuayKjbUwn4yboxMTF8IlhSRxxX5I;20:wJyc+XXq4pgXAUB26wr/gTajYYMKeICvqaCrEqeo1VofoS3+JXNGvvAn/nijPGAL3VHG7PCQFlyDmin5n4RQDlAcq51UlGv0bzTz5nWLXxTmMq71IqgpAi2HcImGP2QdGVf/LQobfXwx1WVE570tv6WIMAQ8L8BbcPxnOW6I0k9QiLKro00j6ef/F1SSSRjstBZ6B3S8YEX2D4687DZ9rtgHcpWkLsZ/vuvTiF+MQW183XqDgpmBLcA75BmkjquilBb6nkV4LtCwItsJtc/WF6kSh7MJcf5C6CsMdhiIBhcCnPKg3y2IrwgkVa+EjUk2fto44pdhJqGDs1ct2kcr9meL+YxDKG8bCHpnNRJ2IbbBd3JvOsjtfIUmAk7gCHIIW91ORVxy7UBhLtmg5V5o1HvdWVUYuacoudJLYbMR/6mbJae0wTXs0V248QN8QpY3z7XGdN4vzfZ273yu0Sj//karkwSbt4W1VBIgaWCoHPjOel4xOZN6g16H3hPk+XHj 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)(2017020603029)(8121501046)(5005006)(20170203043)(3002001)(10201501046)(6055026)(6041248)(20161123558025)(20161123562025)(20161123560025)(20161123555025)(20161123564025)(6072148)(6042181);SRVR:MWHPR12MB1455;BCL:0;PCL:0;RULEID:;SRVR:MWHPR12MB1455; X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;4:YSIhqEqvUZd5wd9E0ylxwT0uzQwugRZgOv8+vDybqBfg/M4CJAScJ77H0acXtbE8knoTB1BtWU5WwAquBPrh1jxiHeUWaVBCm4CovKJMVRmkCG05yAvKLL3fmK48uA7cx+bIhj+MWXi/LEkayAvN8dgzmH+nf9YRkyDgZXhVq1mTIlWXKY+mD+orHJ1ohA3+C9wn/ZXrzqNHly0oNPZRHla6lWDPTLWn0NORuBW55S2wAVEoo0t/zhLhOodtnkUdeGVacymhlF4/Fhwj7eGBWSVGALhyQstmfq/56xsezg0gmtVmHa5npzTFD2zUoZ1S5Y+f+kmo3RrM71o/lsmxv7CLlpSLDStcWpdCWyLuooPvbqzJSuRoG9BaaonKQoQDB3aipi93CGZe0bytTRKTByMqmVUnLpTZTBZOVuyFpA5WuH4EvUo8+HDfFeAep+aZDeEzTfNP+E4WBiMa88D3IYxyviDF19wUc0tu4s7lkTvgLJiswfvdI472vetXYEloz5riK2at3WYIEd8vzFjkHG86RUqK+gFCOmQmubNo+2ziAD+CaSuXYrrCJhc5xqBvolHM0VzknQ4PJTXyZPKI2Aec+COhB2YPhS9wcnoBPjTwD7EW9IEIau7wgMZ7XKlPjQAH1KosVdduA1dncTcLuEb5CHUWqShHmkxe0hV5qtt/yFFVdOePBIMe9TO7VWJ+n0L2F+hnCFpkdC3idtF+KmfpTMDH9SKeBCjnlAqB88ru/f3gs+TcCCFNi2eveVlJ X-Forefront-PRVS: 0211965D06 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(979002)(6009001)(7916002)(189002)(199003)(25786008)(38730400002)(5003940100001)(4326007)(6486002)(305945005)(105586002)(6506006)(7736002)(81156014)(92566002)(68736007)(2906002)(6512007)(54906002)(53936002)(8676002)(50466002)(81166006)(36756003)(42186005)(106356001)(47776003)(6116002)(66066001)(48376002)(3846002)(101416001)(6666003)(4720700003)(2950100002)(86362001)(97736004)(5660300001)(50986999)(76176999)(189998001)(50226002)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR12MB1455;H:ssuthiku-rhel73.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;MWHPR12MB1455;23:pAszllIdI2y+kZNaczYZ4SvUpwclu4de3Y9A6nkY4?= =?us-ascii?Q?VNjoI3V7jhsMGauWfMZhORNx4X0mAoXONA2r1EXNX7+LlwbeXLEjt7NgPwtq?= =?us-ascii?Q?0u3gwQmRB87jgurI9DqdE6PIv4LwLVLaCyz/nOSFbV/mQaGzjL0ZsMPhnBHo?= =?us-ascii?Q?WfceOAqPTWlycfFSqTWglsfE2Ly0iQJqJAsWqP2si/9QqwU6Kib35B91K4RS?= =?us-ascii?Q?0cFckbV+2tEg3CGJT50OrGANAVtvfqW89p8eUIpBfE4axBz0pAnIafkCLcX2?= =?us-ascii?Q?NWmerhuuMABmekPaUqhuKqs81uxergsyrDsH3sS5nNdKEj59Os8E/FdMeVX6?= =?us-ascii?Q?TlEuI8DoqZI+AwU9qOuR3pUG/SA7q+QjGQYJx7HMVZJcmmqntB+1t75cg6r3?= =?us-ascii?Q?BdD6zLSNOPesigAJmo+a6Rm9y4Yxe4Y/5Hn0gMqC31MSodzEA5GBCAumuXWu?= =?us-ascii?Q?U3uxOFsbWCjh+tsPqbV/qCgAv2AOOdtRWvGdvmkpaHI7el8S3XvnotNVeCpl?= =?us-ascii?Q?de3hbfPuExeyFlcNhDj6zOjloOaTjiRMvOLrRFHKhXbAh/sogcI/n27cy2FH?= =?us-ascii?Q?AVmFrMDN2czcSE/cT5pXH5xmKHf1x8T3aomet2yGUWpEzfN3SDxauS55Qt9H?= =?us-ascii?Q?CB/8/LKpPVzIO9jZdDP7ASbZQTfz+PRtfanUFlALxal8CJN/L6kAejwR0gJf?= =?us-ascii?Q?bjyVu/4PNB9pgDj0c7vDTiVU7qicns8u4KX6ejztMGaWezuNKIj6FL8bq/bB?= =?us-ascii?Q?mAbdIu9tmfDnsRH2YEs0DBW+lmzojQ+RrYxPFxWuDINsAlWi+OaDy57uEit3?= =?us-ascii?Q?pCh08ws0UZFiFqulBb3Fs/eegqX/523MNOTBVm8k6RyLC9Q0jSVwWqUhm5FH?= =?us-ascii?Q?xT91LR+UVgVqeFrUAcbGiI65ZJBY8Ntngia9LayCYAPd+mKzEvj4rvdk3U8N?= =?us-ascii?Q?QWG3b4SL+pkjQAQw4cuofFh+J3HDOUgxvQ7Rj3iU6GEvXFHANYsXT+u9wxav?= =?us-ascii?Q?4QfQsUsxqK5WvIr6Nk2NOL+fK6rd75K8wYLZ3VOeAIpuFBjXkqfqmh6jgEKy?= =?us-ascii?Q?HlTdZs+KWv7u6rKn4qJAk6IlDpuX0gnQ62pijzJ/LjpB02xvdDaZd2iGEhi9?= =?us-ascii?Q?yD+XOWz4SbsK20UfvfenWyNlFU3f5EN7i3HWnbg8SBQJe9gxk4HTQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;6:/ZIGZTba+/BPNmdFQ1KFKMpKJOIL3x3SLTsfy8dG3MmdTCI4u1Mv5b60p2L12QNVtleyyKyhvM/J3YsrApl7gawwBKToQFCCUEC76DtW19dEtpPcmeDWrSaNSbCebpcUV0ReJRd6M2QWLEO7ApxQFGpLItgd0q7FBf1NfFnkyekqMAeqSPIEDXa+exCHqQPlevqq6TdULQ4Id+PeR6oq3uT0yJuEpFVTYZOaPYM7ROjJhSFQJ2vHHZNJHeLFzeN5ZTPGGDzsGmg9BvA89FwdwlJskrzTi3hFWGwP+D6b3bPUz387OqIXcjH2b6pADv13F1/jGkJc19reV2e/ozOUnG3TWjnP48rpeSNFRkrWnPnhqO9pnMbm5FwbTCwkhBoe2IVzG/vgaaarsMi0spmQaN5UEqt2XrRQeBI/vNT2rUY=;5:ksSk/Duuqs+cmkwTyyO1L62VY37qMfnRzV69Ur2A0a3kplvlOUNYRAtXkcJY7P9Xkyhy7VZcDPIFii02QVms80z1OaThncRQoQ+CA+ljII487+HifSfsuxIVlCoYx1RaVSB5BjitgWMw6uywg/8bIrUwH4aq3t7n0rWoz6mQODI=;24:SPl1BQ4RHGZ3zKN6EkPqP0Cc2AZoogAWh3cGuo9PJXcU0kwXM4eqtRlqQLSVVvZWRCpleH34Ni3UGf73QTN7FRCpnD8r4nRUujDa9boTWLU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;7:K5ww2VxhIOllbGpuP/TjUX+kP8Mvob/yNx4ZgM9/xLbpg3gwEEDxk0vjZBrihpqDxUYODmjQSMIwIT0+2gazGQUsz5ENFlNXDkIv12ybXtR5v0zaILu71f/c63wMyi2m5S86mt5bPwaZdTx9UJoZmU+IaQos/5QBXWJ/GPfOCtmzvxfaoti0qGlErtpb3cVyXBO4uUjXDdaPzWGjVxNX5Wo4m0el7vGL0y6a8UifKQr6lcYNRN6/7SHAGdbaxKSb7UsLD22olcp9vrlqeJy8QDQh3w9373Z4GQkhvMonSQJ5MGjY2UBiESA+VKt0/WDSDdvgJSibh5C+b61o0qq3FHvlJeoZh8dW1pSasaCsK30NCi6wW2+yAI3b39XEeLXBIphEcICch2jzGNgaQR7oVIreEVsiN3C1mkwEa1QTI8ZEPKbcSJxEtAr51ZgCeQhqUW0SzbbtvJT6LqZwaI25esdBn6HLt1qKKORSIl2ZjD3Gtot0wrY5P9DFXbPoPQF1C6ipQWYHwAmBFtjzI5JiBA==;20:U0yF7iTxdto6o6HIksmDY/2nNeXGBlo9h26puvAd6nJJc1jRcjRKr46cigp1O3usVOy4+pMXKE0sxkgrLRSkP/XkrVzcuLKBQEqE3XgemRMRl12T3kZhXWQN7RmJ5s+u5QMZlSrDxMicPY1f3gok63heKYMderlUUPPtQ6KNbHkqrrd4SGt1fXbm79rNmDYZhmguBC0BDjNokARcC0MAlOpNN6TLe/gficb15DgnB9ShyEEuiNShh+69C1HgBcpd X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2017 08:41:16.2947 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1455 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