From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S942861AbdAJDfO (ORCPT ); Mon, 9 Jan 2017 22:35:14 -0500 Received: from mail-by2nam01on0089.outbound.protection.outlook.com ([104.47.34.89]:39794 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932316AbdAJDfJ (ORCPT ); Mon, 9 Jan 2017 22:35:09 -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 v7 5/7] perf/amd/iommu: Clean up perf_iommu_enable_event Date: Mon, 9 Jan 2017 21:33:45 -0600 Message-ID: <1484019227-11473-6-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1484019227-11473-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1484019227-11473-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: SG2PR04CA0045.apcprd04.prod.outlook.com (10.169.49.141) To CY4PR12MB1447.namprd12.prod.outlook.com (10.172.71.139) X-MS-Office365-Filtering-Correlation-Id: f5d79ab7-f6c2-45ab-e7a1-08d43909ac10 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:CY4PR12MB1447; X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;3:1Kz5mE9lWBoZZb8h6BCKWyej/4WedMX6XdCdvrubvaZQjN3j0w4NXnHByY3Ak9578y4xiyMyBbghsqmJbPDV+NEkITKS8LutfBHndDq6XVvBsrbU6I7lbQ7Xmpjoz0MPv5SnDVICy9cAM+WyHgGYZ0E0gp4Mq0xxHgi7uJZqmEuo/k0WagZdFn7on9FQxhgx1aqtR4N+ip3RQx/IIVFa0LERDrGptwc9KN6tqndoN/CVLxROzIVIJFadqx4T6f5vdj9NEJX96OK5mxrkpFBEQw== X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;25:Vv6V0PDfQRMIp97clzdJtY1X/Wm20QKs5ohqoM5uxg5Dblnke/sUnD3+AIZOdZdBOUS/1lV0X5gLMPV6jP+nKpDp863/Oh5D1kvwoiWWT1+do7hpHP9NlysoRSXGdGFgRbNEyySOdnyA4wgx4v/xc4Z4IBX8O+eHRwJ9qsSHViEdHgsEq2Ayl5U9fHglX3u2q1w2ypKww0GuNjqM8qLashxZGE7oTtfb5fwA3iEn0HrDNIlBwFNKD0udepIeY5ZARclwOUfxJbKG11SNSuMtxuXbuMP6NYcuuLXkwCNJLHz7/onogCyUlIrIowtcEPFvK1T4K6PhhBQIukFQKADB0J1/INXI+0fHJxpLbvy/rjZ/PD65CFbViT08b/QsSgO9rqKlYQ6Fl/4AQdwAUSS0+8pT07cA9vjyG4yWFjfpAQyFsWA6b8DG2C0H3s6i46gVVABNG1G6G3dLmXEP0iSL/JxTJOPVClNu1Qd8Pgd+JNGVWDyOFKwChYBJXWKxv86Q8eY3RIk3UQP99NxFEn2zw+L+xDS38fmAimtOGdwoLN0WalW/wmq7TKulCs+eKegn+n+avcDCzizweqAEXEe/D6pt+dpRnLDDlAkLJgqQ4mycdgmCmfHLdrpjJqPSwEApyWePeN21UslUVZXY+Mhx7J3aocICCeLVhTi0qQZ1I2fVQrGMFDpM3IPQjkKZdp9PmiVN940Xrub7iHvQRGCt0iUXrF4ZlLP+iGc0+GKnTYHozJCvfM70hAkBZQES1Ar2vwKUz+MW3DW2D3Avurmo2ePHpl4+MjwzwdnX7paToQs= X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;31:7LqUShhB8yqESTJcZTaKLZEtCLe/yzxCQ3LNQves1gZfYHNqhZoqODAjjUgQ6xhMY/pkTeio7vdmAsOo7oFN1dn2rX59U+WENVh/wZPrrSpfJc4sS6LAQd7Nu1zbI1f3qycvO1NPz2uhVBdtn8IhZqEWPy2cKuPDu3OaVLqwX7Ifu2lkmmJCKLTd+PyZGObW80zJ2zOZQorehpgBY8aoI/Mtsqga+y70/VC1C+CNOVFSNpk/UfgKqIW6TTpfPK6VzduPRLdWWDzD164zX/WRpA==;20:2WqXrFXXxNiQ+oqP8Ls45er/sBoUcStMk7BiPr9HgVhGQ6k100OJY0sYUzjwvCRRZjO/XxgocfnPpvp9vIkxC4yulUDdmSnDJKyoip7xKgkd1CcYqEbZB3X927+BhQdXOQT3KOCQvwpy3RsIOjNmkghcR2ZzvVeLQn3u8pOzIfeKZS8CI7mBCG31iVMtBk95t1s49oHHcY6ejil92T3YFOkKAlo0x4XGHvsiKWeJ2mJHpQ5a4X4h9JXuvtMITrnNJXPjq8uSZJIyIthvyDdYay8210vQYbA/xYRg+VAWEYgZtxKmK3EH6ET5unlLlFm/UPaMWkqfMFhrvTkhReXWBbqpOgr5PtdZc0JVx6is1FNHZFNMrKs6tjv8Rf2JjNk8jqESo8bZDriA262OCJ4bzrwPxMabU+7PwJO+T4zXi9BQVw6MfWmqojdTpbDonmUXP9vAjv1SXuLuqa300FDRgNWFUwUEiepee4Cm5WC7HVsz8h7lG+abizTzEh/y4iCZ 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)(20161123560025)(20161123558021)(20161123555025)(20161123562025)(20161123564025)(6072148);SRVR:CY4PR12MB1447;BCL:0;PCL:0;RULEID:;SRVR:CY4PR12MB1447; X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;4:p/n7RkvIGKDZU8RbeAwGjCSi/TzDQrStqGEe4xM3kjFVTU1/9tPmBOnEPfxtS41y3wuxGDnx8QAkh6wopGb/TScwFoqPXCdlcPtNuCDAbA7d6k5MoWSYmwuACq84iLL206YYvKn+bS7ycev4LT/P7GZHZSnHwjIw24V6BitdQL7djdidmR9zeD9EfaXlCx45+gnQcHBuGm/aYGLifZlebEXZG+7VT+fvoa5GPBtA1zA4zreQ2OPo7jxYonlwk2qMYUFHHxeiOG2ygVa9pqTaTlJCwRXUNRaxJTmOv5Bbw1odfDA1a5Od+cXaw1Jv/PlnjbQySkuJzyRG6I/bxkkD21N7INp9aAcG4sE2sc77nvLIVpDmQh4Zxkat0Wp2ft0aXq9ZUEH3zvg0DXClZg4U04m9rmlTpMfj8jGog221C+uHzW3M/j8fQhVxYHZuhfVY3iN2Ybd97kPL5tZnZxEfH0+XLI/141dMd2UdTIs30AqaMzTSOkahCQOzM8tpMOSc1g8CxASXKv8N0wJlVzN+MU3yxTwxIXSH4LOyf01D6TLakEaVkRjNPAvY3d6/N60ljQjxp9+29SZWpFUNZWQlfMX6addwlrTUk4i7VhdfWhTM0/rTXsaLtR+JBtA2Bj5oLfxuKLVMkH08ljJ2Aahqbeh3VMsTPl0xOonCV16H2Qg= X-Forefront-PRVS: 01834E39B7 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(39410400002)(39850400002)(39840400002)(39860400002)(39450400003)(189002)(199003)(38730400001)(86362001)(54906002)(48376002)(50466002)(25786008)(305945005)(7736002)(189998001)(6486002)(6506006)(97736004)(68736007)(4720700003)(5001770100001)(6666003)(5660300001)(6512007)(101416001)(66066001)(92566002)(6116002)(3846002)(47776003)(2906002)(50986999)(2950100002)(76176999)(42186005)(8676002)(81156014)(5003940100001)(81166006)(36756003)(50226002)(105586002)(106356001)(4326007);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:ewMa2d2cClChBfovopUwTTzlcPfHYeSZsrOHMqbvc?= =?us-ascii?Q?yUGQSx7VDJn9RtAEZeqlm8ZoaNEhqVKEe8fB+QSZ4XEDxHhxdrfRcrZnGprO?= =?us-ascii?Q?iJjwoIn0pbZpcl00mwds2jaT+zWb5z+NpDiPuKtoiEkoU9VMFdkBcoofpZ+6?= =?us-ascii?Q?rHW45iQoVC8T+PgXln1J4bu1dpD+WXNjrPSPmJEp7pVwF6VjlbjvoFhHI0EU?= =?us-ascii?Q?XqPpJMBLh8X5prRoKhKKFGT6g575mWq76kGzL4vbjnmKONAiCTk8DY2zs9rL?= =?us-ascii?Q?Cp4UkMhVzifcYeqPmI1IMEJXq3VCLsCrRhjjFITEW/I8DOCgu3beyeGExdRM?= =?us-ascii?Q?9akEnld9eid4QQAQ1bMh1zcW2TUEtU6NyFzE8R806UB26ZQqn7AyDFDk1d8s?= =?us-ascii?Q?uNgKZK+pvsHmJz4LgnGwq+qm+qo2uNWnHMuTcmKmPhncJ+AkUsxS+Ee3b3lS?= =?us-ascii?Q?s/sDRJ8+scf6UqkhEM1qOl2racjf6mm4GehhJr39f0FkZ/BhxRNsZUMpZNhw?= =?us-ascii?Q?kjCtq6ndVtTslgM3xPBeDICodT3eC/Umvh1h2KxK5VXxQdN/8RhbCHZtkCB5?= =?us-ascii?Q?oDSBGEOofIcXQGyKtThRwt8vtXTwatrU+mK1ZNHe+Y9jj6mu3XnGG3l0Df7Z?= =?us-ascii?Q?YJheM1zKSCVQ6/NCeCDfRsWlwf8ZxhAMUe9Axuf+3RtabBfv6TYBXeI7yVXE?= =?us-ascii?Q?JyPDhDTwpF6SuPKnzFGYjKqjpmaqnkd1VQVeuqM6qpwdf+hs5mvTAOfMBTKD?= =?us-ascii?Q?1kdSOonwX9eJgzJbFF3An/sMxCi46Bn0qQxvmF0G1e+dBsRkBUNMSR7UJ9wC?= =?us-ascii?Q?2fDLm9Ilrh66jNE25cSH5QjEugPMmwpFUQvXAXj1kPUtGbbF5aoBuSginE1e?= =?us-ascii?Q?/Qu3p7UAks3qeH/FlnCVTmyNxL9nOsaKoxzEcdsAGz05MJP/SIDWSI6jPdRB?= =?us-ascii?Q?Rg7Tikk/NXlOi0wkv/v8kS9flg7Tx/rNtpMBfHxp4P3/N8x+Ulg0jSaYWfT5?= =?us-ascii?Q?x6NmXu2Nm95uTnjpsPZY/BuLvkAhiDTKLQJdqGGcniasI+S+G3r+E+qXmzxJ?= =?us-ascii?Q?wholKp5JRUX/k/gVd/VZtr25IM9Mjze4Z5cUMHKzZmXDsRx2pkCFRnOsHJhG?= =?us-ascii?Q?NKw2K/gU/0iiF6z8sFfc/TI5s+uNF1JpQZMKTiqhLtbKRgUPcs0S75ET2LIj?= =?us-ascii?Q?vGJryStBWjEpwJQ+oD71pzivqDSMcgSo34J?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;6:NjSMXIUyBMyPokeDU8rKo9U8Zq6XKgapTQO/7zTmBkWg5d0fHu3VaIGaEHrmiyUN+9IdrDDuOhcCJeZI+1F2N2nZVMgEEGgimqP/TtmWQH+DNa2n0gc2BKazfDj/kO6x3ivmRKnK+7kW/Ih08voI5WlTGxuNGfbI4rGFGKPXH8RNcokfANXMVsLCBddXbHFWWnM2RGHNQwJC5hAgBVcaSmo/OHkVqoOlYrO8c1bbQbUBKAsnh+ikt0g17zlIY1ixQcQ5iitZ/PKQTEEEA5qXLxXblayTTr6tGj9nt6IgPp2TaSGhVB73mWNHpd6NIQ7UKBLT6RZ6htqifJP3NpKr/DqEAa5FuJf4svAOQKbiyrWLyL+vyk2nRs+e3JinAJ4bNq5xL2nBT1CgfywZaahNGa1+9OICSz8hMBl5TNdK8B8U8rzdRDjYcJuLGmPvnuTva+9olP0kFxyV102AYvxwrg==;5:lebSyTn1ZtEZ+P2dXIgWrWm+7io6LgaIFQuec5IaouMfwK6J3igMBAozpLjjyZvvJxVOcrV5JuEYbNHmulMOm+VG1+rnF9SA6NiTr3gMailrx2ZsryHUn4eKwhht0KK6i2Ug3x9s35ZxnN9+PudhapIM4EkVZA+6Amhe9LkN87c=;24:v36lh7JbEkIqg0q+t9DG1ICuXKZWY5ImKO+MpxbkHUBK+q57kiwKkIL4EvBAmOiHO5mIA0HWeOB6WEX4a3oJy7KNJ/qvXdXwwXJ/+LidYyo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;7:x7FOpCeM7JVYKnlfxyVmcTVpVddOTF2oxJ09KI20G2vCNmLE69I5rM/cVExR2c6MzJC/W599r5rnwbnPpnd5mWcX/dAcCZdZEGY+GCBV6wOyyhmi9WfoE+aIQ528mB3SzSmf2hgYq3irNZARSQw6rQnErkbyGubtMcBERqBCAvhn4oI7Q7UwgYFeui2EGSAGtzi1DC3USJZCVHVeUkumIDBvqHopfWppB/0QJQzfJ4m+8o2T+UdOeplWd/Gxd30wWNO8Jo0uJdQrZ9LfxRCcCdFSF6NJdgY4O2P/IU61VjSPpzJkmkzTS7vpFcn201k1T83VKOMohWEVIAxGPhKnjUcLj6M939KuZTcQxWFarRqKLqvdLGwVAayAuG/nUtLC5RATDREcQRPKRcdX87v0Bw0cl2HFQXqFhJsQpq/StNTjC4BXVomSAcqi8c7FklFw97zXjhGB57ghwk6Xq2uI1A==;20:ISokjrGgWApv7dRWZRwnE8RUi61dfL16SH4MJkFiYVFNM9PnvNj54BFwrzDNQmmdNYCaZj+11Z8OscEXyaz38k2VajtXj7PN2kry/+wh1S5Ns6AXYa19dJYLoZPCm0kJyH18uxQu/uSzdAxBrOqeWYeI93Cxs6LC/EdWbs/a3qbdL9v5/3y1A3x0Zc97pnZv/hm9SHA65oWa7o3HeaFSbNsLnsOwPA5t50KEjphYce8xbzNMTWMLUIp8LHLYWm0z X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2017 03:34:59.3736 (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 This patch cleans 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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c index 9bff41d..2403c78 100644 --- a/arch/x86/events/amd/iommu.c +++ b/arch/x86/events/amd/iommu.c @@ -258,21 +258,21 @@ static void perf_iommu_enable_event(struct perf_event *ev) amd_iommu_pc_set_reg(0, devid, bank, cntr, IOMMU_PC_COUNTER_SRC_REG, ®); - 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_set_reg(0, devid, bank, cntr, IOMMU_PC_DEVID_MATCH_REG, ®); - 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_set_reg(0, devid, bank, cntr, IOMMU_PC_PASID_MATCH_REG, ®); - 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_set_reg(0, devid, bank, cntr, IOMMU_PC_DOMID_MATCH_REG, ®); } -- 1.8.3.1