From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751494AbdAPHYf (ORCPT ); Mon, 16 Jan 2017 02:24:35 -0500 Received: from mail-bn3nam01on0089.outbound.protection.outlook.com ([104.47.33.89]:22499 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751112AbdAPHYU (ORCPT ); Mon, 16 Jan 2017 02:24:20 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Suravee.Suthikulpanit@amd.com; From: Suravee Suthikulpanit To: , CC: , , , , Suravee Suthikulpanit Subject: [PATCH v8 2/9] perf/amd/iommu: Clean up perf_iommu_enable_event Date: Mon, 16 Jan 2017 01:23:29 -0600 Message-ID: <1484551416-5440-3-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1484551416-5440-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1484551416-5440-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: KL1PR0201CA0003.apcprd02.prod.outlook.com (10.167.53.141) To BN6PR12MB1443.namprd12.prod.outlook.com (10.172.24.20) X-MS-Office365-Filtering-Correlation-Id: c4662365-effb-4612-4439-08d43de0aef9 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:BN6PR12MB1443; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1443;3:O121hvU12A1ei85QbBpZb9eZ/HhtJq9pUTRSs1f+QtAvwM428+HLQhBMeqE8kVoHTWlpP7cksBN75I9p15SoyLQEfOg3mxaRQxO8QCOPvKHtXmoTOo4QfsLaLrJ1AjK0y1JKHka6GIkWmT7JzXa5csINfRBmPZcV4jplQaVIN7IMVLOrkU4z/ISkKBMLg7bNIzRSUvrljtXPYCqjJvyUoSPNGBxs5g8Kz5lqgruz0+Teb7QKyKDpp0u2Dyc6JRt9MRLwOFNEvfN5PoQgkEDLRw==;25:iTHAoaeOXor1m6fIVVrwswk1hTwcZc4hmXgeFpUkKujR9DqZL19AGWKInV0lfFz97qAJLqvmJn/U8UTux1YfkKMBqrgfkVl0iEgaVzcs2zv310YaTUxNsG5Q38W1pHY6gtuTV65uFLR7rAh2RF00abtpiWRFB8Z6siaBI4lb/aSCyDmQ6BwYfHw3qSzV6OFTDPXnwqZ6kmYndfhS5XYY2eZk77Km3f7CfoRdkqdPUZHNytSR8DsZk7DvaqjOH5uwTLLGoYyo/S+4aDCNZS0t1EbaA6hMOuLFsmt57MuRAw2P5y9rEeFcZjp4gsqQFMAh0+08Kuhhfmizyi8MNj4pGatboGUShNVTfAu8BWae+p0buE4unnpizyKuCyqE8+E/sgiPr3LjuVhAyHILPU3P0FGKCoZAGkhrP4019LA4iJMe1XZ2lnSomH2iZcVWXK6JVNyGRkm3eUc84b9P/Zs7Zw== X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1443;31:C3q8pgerGOGXpS3ChU6+hitXh6Cp7/6UUJB6p5ITs9UlyZRBXemE+db0L6JeqP2orRHZ83EdhRvXdkIafO3iPyhMKjZovAwcyU47PdlQNBZ+WHgz6T+T628wsQCKjVrxP13QRGeEYmRScLAIEbBZ+bf19AOn908XULsk9uu5ECdO5tf32HWBhrbyP+N8e0fKxlXWVPXIPMxcIOZeXASkOxMOlyF2nJqf/p9n1b+xud+sAetoWONX1z2SHIXf24I3;20:PsEe9BB142Zw6JlrJB7sdda2Lg7mspa7HCGl8BVCje4t3/HLFxDSz3x3xgvjt4eU8hzuiIa4SKiH3EyZjSGQixCfrjpQywEm8DKLlWYQW5Z1NNbqeQ6Pj8kConR2mSqyD8O+RqcqlhtKjkinNPV/geJ23OdsqDFItd2sXTgOWT6o4TLXr5Tas9LgzCZ77Un6Fyw/Im2VRbCyRiFSC9W0F4NufHTkB2JNFVBLBpzFTB0hKSttK0uP1R4ulO0Np9Q7D/Ay9jy1DlXLm7xZOdnf8FNtkXWnIqa9QYt032aImwHIynMnYABXziO6g5K+DNID170lC4csi62apeBDpKcGrV7A/pZcCG6LiF33ivtO5HWe0BLotRcPcc/QJLcN47xHbShZPXbmQUDlQ98ZwLNj4SwARAOBb0ORAQXkoI5u2afgow6aM/EV32tetMXtq3HRsvBNCf9eukMXbstGhbR0QJGaUFQ/0rHU2IwyT4Wdbf2OPkrojOGc49+voNqJiHIY 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)(10201501046)(3002001)(6055026)(6041248)(20161123555025)(20161123564025)(20161123562025)(20161123560025)(6072148);SRVR:BN6PR12MB1443;BCL:0;PCL:0;RULEID:;SRVR:BN6PR12MB1443; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1443;4:AZtrJZIpKoS/DbxaxMzD/GxaofzAaglJmylW2SCjvv0Rq9yKVdpBDE8Y/CKGzyOUmJTHC6IrjwDF2pkTAg3s6syl2SX0qrBhqZ6CBji6jYzehh/yVtSdhDVEjrRSvVvV3O18oisjpoURgc6XypiHQJe474bLlbgaatdfoimqPjqzvH6BnfGA52plxP3TnbmGob/3YLeuzexmEzbSzoPq9Nc6K7rmemTznvcE8eorI6TNsKFkjCt+r0yBKWSVUSvJtSGO2ZeLesLsi8Ux1IGFTo2vvPPGRfthWUXBwp0I18p/ej35gWdvmLBEjO9yL6ZvwX/8laU9hBJE2faNu16rHUGFkw3oavAkDQRJiQ0O3jcHJJL4UVZOd9gbHjBo0R9TVRSUXSZHX97731DpsTsqeD4ESSf3BqDBW9bfblKjXzQGG2k5PNuUZJ1cH8SyhwdquHfTTQg//uu96IA87b5Snewfi8udZ20KpUNqgVYEfPmvV+gKkQnRJnrH9R0jllnR2FrvyF6kQb4zAcK/07oQrF55f9lBiebMI1vWBK13EhbU5Ss8lSJ1UqYYKa6ita+i5eAroDTF5ik3RCSlsJK9Sj484/K5V1QvKs1FZr7Vdpflz/Yqu8JByuXs67bGU4/D X-Forefront-PRVS: 01894AD3B8 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(39840400002)(39860400002)(39410400002)(39850400002)(39450400003)(199003)(189002)(2906002)(6116002)(5001770100001)(86362001)(189998001)(92566002)(66066001)(68736007)(97736004)(3846002)(6512007)(305945005)(7736002)(4326007)(27001)(42186005)(8676002)(2950100002)(81156014)(81166006)(50226002)(6666003)(106356001)(5003940100001)(105586002)(50986999)(48376002)(38730400001)(101416001)(25786008)(6486002)(5660300001)(6506006)(4720700003)(76176999)(47776003)(54906002)(36756003)(50466002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR12MB1443;H:ssuthiku-rhel73.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN6PR12MB1443;23:OWQJOzI784WOwJol7BiLpdvI3Ob7b34JhRqqBocKZ?= =?us-ascii?Q?sGnNz3kDnDze5CWdsi0nWoTKgH+BDnTwb+6Y2IxZPPzP++tVAlXNdTe6YnVA?= =?us-ascii?Q?gGDpO9NWrxaT6peP5rXZvn70PHu04KrLvV/1gi9A3W1+o7UllrzfDDgjige8?= =?us-ascii?Q?Mvqp1bAPzBiT8CYfFhN3P6+VllK6Kc0iqDFRXLqgGU+sM8ToB2aNwHcbeS2H?= =?us-ascii?Q?uOZ7u2ONv+UqBuqt8GpwJVJ8JxWliz9edo36L37vVL/sz/Xyt4MPDqOU1msL?= =?us-ascii?Q?THDhKcE0XZGfe+0RQU8jDiBiegJyKicH0au4hu8TZmknD+X7Vggeu4yr8/Sb?= =?us-ascii?Q?qtUPGrKS4Caz5jc/HvHVLqb7THseD5wVjQSJtwh2Qj/TGA7qA6erNf2grbrL?= =?us-ascii?Q?yKMo14v72P8jAjhgtBS0uOjR7niaDVXG9tXledFRg8nWG/AS47t/rHH3R2z5?= =?us-ascii?Q?fvoC5J4WEuK+rkB1M1WcHd3XdOBmRQNP5WMdtwDHZ18MZt7KASrbzl2FVVC0?= =?us-ascii?Q?Af+RYCrZhm5FCJBJ65RDDTxRcZ47WNwoqcEKkMYuweha9aWzyPFrMTy5lT8T?= =?us-ascii?Q?Ij7pc7rJmn344kD8G7f4yyKASfFmTNOUwZjlOQHiX4C88NzdeqDDn92lRaiN?= =?us-ascii?Q?mWPdrs6JMQuZBLHcokbO5QvzQsNxvIuFDL9G0jEgaIIphcad2a6+qTyb5j4X?= =?us-ascii?Q?Dqc3ZZ81aS3L275uab1V5ylDk+/rhE2AaCPMK2GTwjgL5tuG5403/lGqSZ1m?= =?us-ascii?Q?Yb5UfNhY9ZsgqJeHu+0pGybiiV76s4qcFqlEHJgwQp+qZ3JKXUVLZmsKRHyo?= =?us-ascii?Q?ixOpKkRhAC2rk5PFNMNZ+Ft+BvViVr0nWcIA3CmgRjdpO1dQBH5UWaJ6Nk9S?= =?us-ascii?Q?oqDCU8nNpauwtJwO9Sq67RcbCPLqDQawNDt2iGSErq1NLiTakyrDM7jg0XqT?= =?us-ascii?Q?zbh+X79BjqqfyTJUJFaonOzhJY0qI3b9rtDfCL0pkaccORSCewqjEig3VkdZ?= =?us-ascii?Q?Nx0avHVPaTleG221DWsdEZjhT4l4zZuYtmsLl0LYl6tA7RfzI2MasLq3XoWX?= =?us-ascii?Q?BY/mevKCNXq5Efah6r4xrwTD/2YjHmsMlYoYZozVLf6C1EOxji4jqYLkg+a6?= =?us-ascii?Q?Z8r5GIiQyzxuN/iUjqjNzl0I6ljAKUfAD4GEobe4RkHRB91MZNxwRj2QeKqc?= =?us-ascii?Q?gx3VvEzEXmv6YSbloZrZhoc6hQsQavh+U64?= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1443;6:PBUkzwJBQs+R5F3TWVMFXj+E0hjhX2rOXoqOc500j198X2zSiOgNaOuIBhQZgL7U2UpczfGrEVwRABVC5sa5NAhz5P3ihyfg8vglJqlYcxr/K2Z8G7j5eh+yoHmD24kkrJh2m9WnS5c0Kk/bk4g1vCbynt4I71rEEsWOI71MGDr6tEWTtxYm/Ox5Po2cXCSl8KwQyaobPQN4S2bLuZm/rdCH85eG+11/fVZnYtrGlyTHJvWTBxc4SDTTKCEU7TccMtC+3DXwcdebafXrwoBxdCJTbO12bRo8RdcyDVVbAp9ylpnu3hFIwZq1yC1PXNgCLBq6Zhu/RvugdqgLm8nHAdjke+pCkVsY5cNu4+vi4mgJNNEvCT8+iYGrVf+0YuVXwa2OTSRlifR3UGEsnAuMFUM5RYpFwPAnpyXWn5MEvK/+YpuTNPR/ii4EsASOnWPFDLD7yuGWpTVWGuMf9SKJVw==;5:wKaw87U6U+OBz05OLsRJfkTOAhBJtq+TwAx6bSm0UA1M5sMaG55RfJH00+TjQLiMzFcffv+CX4d/l8WBmaMuwDNXgg0vpiq0nEYVylExQKOHf6E/s23ALdLFHoD/M21mhCk6ZvMbMGlZrCnel3Neanivh2eo9G2azuc9XjGf3aM=;24:nYrd3HMT9TArvgbmz8dHc6Bbs56addndaOsU5cbCxfBQxXJLQ3qDI9qCbnl2IifjdBURiHXYp0L2GBaIO+7Zb49IOQB8IzaYo+Jvab3cbuQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1443;7:IFwJwlqt75eruZOGbeiL1olhj3CLjGzG4GfanQuE4iogpnB7FTD0vBpT7Jyr/o/1ldc4u5WbRmNFaJFdX6YiQoOfYCUw0TyTy8q4yHIotwc1+cDth/qAnIYtZKmEEajm8YRuE5nuB/KhE380V0BGPOM7sOesLu8KTCLYP1VtR9hjEw0wtphbGAeRqOPU1bqxLeUKJ6OEqqw/B2dJkg7jYoz30mfGNADrx53LSlCfzw1XDkuz30XJONzFnGquATTe21NTDBU60t0BbyE6gXNeG39ryfp+SYaQizuyizCbcWgq84ycRlUuyKptU+ndBMscLQATy9k/+j3AOkzM231rgi3QVFd3cmy+GKZpuzjc2cXfDB/IL+QtNCsz7CmRklT8vILEq+MqPQywdTsRizbQL0XPgnBwQHAsUdhRyMOVBkRO9hfSybbuoE9Z12EJTxF1F3B6RKxPG0RZmwRraAJqiA==;20:kjzP0kLCE+604bAJgNWzq9HCBvIip0632uxjRHzquv+6PfV22DWZFNVWhu0GdM3QW3RxIjAJSVcE0+TzTCTA7EVJu6Z3QwS3OtcilxyUPUG/0mfcVa4KurEtxbgCYp4s1iejjRjt9fabY0oQhaaICQq9wczjabWAJVspPQ/jKyW2uVRvwy86MO20AuRFLGRoPSTD52TVHgIqOToo44i+WeOfCEqb8JXoaZ8eYPfAMY79j1WC1mHGx5SYAbyl50qn X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2017 07:24:15.6630 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1443 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suravee Suthikulpanit * Clean up various bitwise operations in perf_iommu_enable_event * Make use macros BIT(x) This should not affect logic and functionality. Cc: Peter Zijlstra Cc: Borislav Petkov Signed-off-by: Suravee Suthikulpanit --- arch/x86/events/amd/iommu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c index 44638d0..1aa25d8 100644 --- a/arch/x86/events/amd/iommu.c +++ b/arch/x86/events/amd/iommu.c @@ -164,11 +164,11 @@ static int get_next_avail_iommu_bnk_cntr(struct perf_amd_iommu *perf_iommu) for (bank = 0, shift = 0; bank < max_banks; bank++) { for (cntr = 0; cntr < max_cntrs; cntr++) { shift = bank + (bank*3) + cntr; - if (perf_iommu->cntr_assign_mask & (1ULL<cntr_assign_mask & BIT(shift)) { continue; } else { - perf_iommu->cntr_assign_mask |= (1ULL<cntr_assign_mask |= BIT(shift); + retval = ((u16)((u16)bank << 8) | (u8)(cntr)); goto out; } } @@ -265,23 +265,23 @@ static void perf_iommu_enable_event(struct perf_event *ev) _GET_BANK(ev), _GET_CNTR(ev) , IOMMU_PC_COUNTER_SRC_REG, ®, true); - reg = 0ULL | devid | (_GET_DEVID_MASK(ev) << 32); + reg = devid | (_GET_DEVID_MASK(ev) << 32); if (reg) - reg |= (1UL << 31); + reg |= BIT(31); amd_iommu_pc_get_set_reg_val(devid, _GET_BANK(ev), _GET_CNTR(ev) , IOMMU_PC_DEVID_MATCH_REG, ®, true); - reg = 0ULL | _GET_PASID(ev) | (_GET_PASID_MASK(ev) << 32); + reg = _GET_PASID(ev) | (_GET_PASID_MASK(ev) << 32); if (reg) - reg |= (1UL << 31); + reg |= BIT(31); amd_iommu_pc_get_set_reg_val(devid, _GET_BANK(ev), _GET_CNTR(ev) , IOMMU_PC_PASID_MATCH_REG, ®, true); - reg = 0ULL | _GET_DOMID(ev) | (_GET_DOMID_MASK(ev) << 32); + reg = _GET_DOMID(ev) | (_GET_DOMID_MASK(ev) << 32); if (reg) - reg |= (1UL << 31); + reg |= BIT(31); amd_iommu_pc_get_set_reg_val(devid, _GET_BANK(ev), _GET_CNTR(ev) , IOMMU_PC_DOMID_MATCH_REG, ®, true); -- 1.8.3.1