From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758879AbdCVHEc (ORCPT ); Wed, 22 Mar 2017 03:04:32 -0400 Received: from mail-cys01nam02on0087.outbound.protection.outlook.com ([104.47.37.87]:25814 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758514AbdCVHEL (ORCPT ); Wed, 22 Mar 2017 03:04:11 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=amd.com; From: Suravee Suthikulpanit To: , CC: , , , , Suravee Suthikulpanit Subject: [PATCH v12 02/10] perf/amd/iommu: Clean up bitwise operations Date: Wed, 22 Mar 2017 02:02:34 -0500 Message-ID: <1490166162-10002-3-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1490166162-10002-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1490166162-10002-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: SG2PR01CA0012.apcprd01.prod.exchangelabs.com (10.165.9.150) To MWHPR12MB1454.namprd12.prod.outlook.com (10.172.55.135) X-MS-Office365-Filtering-Correlation-Id: 65920472-8f1e-47ea-f5de-08d470f18902 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081);SRVR:MWHPR12MB1454; X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1454;3:d/nTZ8gF+qIS67v/JSkO59eYKxXqTzjH+MrZmCb/vQDBUpJH+NjH/+Pe7cBxs/Y+/C1UWejwpvmranEDjcGU8X4s0NgAhegxq6+saRpwFOP7YZ0Y/3sMstoQC2g1YOY1e8K6qnveTJCpBnP3Cj/r5WngkGnQDDfqU6SMyGEBdDWlQ8FwCWZPls2xDKfao2EdE/6ASs21Xzj21Ex5tyt7myLap8fyp686fs7JYQME+Tnm+Gx3KJ85YcFqDg0Cem/K54Q6l+pC15vMxoNj/zGqP7I/s1op9C34mQlDOQKgYuU=;25:Ub9ST67aJj/9q+cbP0xezzX+xM/YlagyI0Afr5kSM2Vf1ubCSdce4+cWYJn5dRKbEx7r4J8yew07cNQZlDrwBjX1KVVR2OZa6eeVftOTP2nZyB2dezwZjRwAcdMfVAw9B3mJ5B7V2+6xp3dcB2b3QsgmluGcfNmDO7tldlBshQW3k1+6nvJ/2bbbTJ+RDecOrK+gnS3zMfH/SBtCCqsD4s6V524efv92E2FqOVfJdjgakKUJOXuSNCCDQvumMHSm226ZbFn4O1lUX9lpoZa8Tixe4wckWqfTjA0ZyMe8n4G0BaZpfr1akru33nAPpc9qEklalFw3H9cKLpYpAZoccPXYCntw3fEzLoHDQTZJgHV4cvX0OjuZl3hnlNwSJ6iArg7+qpyRCxRdRtK7WPIowAf8r0c/1DjsUOA7lY0GnpYwSLtlRp2ddGwXay18sqwd/eKLNFhoEw2ZzCZ1z4xScw== X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1454;31:l14DwqUb/cOpMaNdhGzk1MeWtvDoAemTxG/wnUcV0rd5QpDKr1tfcwLbxEkyA1gJbZkTz5Vsrqjktw4+PvFHXRNLSkMCn8yTtuQnj7NIt8+CtXjdL9Q3SSfNFMPRY8BLiS0FVD3AUDwdJeZ5Psl/z426IV4obY5FH5W/hknoBW/aACKWai4tjHsdx4uz8ECYMsqJOwcOVe93E3wwhAN41l9lalqIcqrY+oLiKLgaPAk=;20:Mze/mQbX0dGRfqX2KA/Perixk4FPY7nDkw38S8nqNZYw6g76S3KvluHI7J7cm7G4y8vkn9IPzbZtEPdt9R++a/9He2LrrXCoPl7RtYGzvCiaXG+vR3DCU5BCgFWsxmCbXR0zRsoQwivIj7GPKvqqVtEzOq4CxDVxMqbsyMLCHnZRj6wFdFiZRyH4m4m+PmHtIOO45O1nTEAi5dQaWRJqPAGIpJRBUz+g5A4sPPmEgOqcuoZShKQN5rmhJh0eYd3wm49TXN4mvN39PCnJQjdeWb7wmlBql8pOI50o9nN3gm8jz7Oawb4cp1KhrYc7jCrFISnOdEp4nQY7x+DNDrMyAP4sNWufvkzYNb5zexO87TrxRnHVsY+XUZbuA3ASvNYPB55v2Nty/u+SJ16F0LZ+aracU9CKaO0kH52s2JX4IEUPaMVUbztwt/2+QdZ9EvZdsEhpXidHZDQ6RY1mLcVHVcmZDxOo3jLNV0N+KGlWP25GiJ+EIn/vUV0gCJstr5CN 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)(20161123555025)(20161123560025)(20161123558025)(20161123562025)(20161123564025)(6072148);SRVR:MWHPR12MB1454;BCL:0;PCL:0;RULEID:;SRVR:MWHPR12MB1454; X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1454;4:kx217Nn29O3jyKaJ/EXW95sMLzZmheGtbs3kls9f+Y8w1kiAOAPcj1jLy5T6xAy1p4bhHkEydLtJok1xSOn69kM6bW2tNYXvlYT+MQn7Gf8jUq1esRyVf4Gnpik+ylaaQrYT8bq5MTZNmifatgVGEF2xwIedJfBaeyGgr5yZwU+gqmoyW7KXS9O6eizg0gP7hlmO0+9cb50VoSwMEJRTq2xf1Wh0rqtn4Y7zFGohQ23GCDfOtXd7FVYFSSO8efeMgbur9YNu2w7sbx2wougn3vcbjNl1cyanq45ymQC+sBk0mUo45IBAYsXoAiRvYtZvWOC0ZDkJ0lfvOcDvvTt6eGYfZ95/zLls84DKhKxG2lhjUfvmpCSIt/ctSxzQC7khGerRrPgiPdlXTMfxYQSQUbYPg9ARFsnjCufXE2d2aRh1r6TfkRftFghi4O1DYSIi16BgMovtcw3jRyGX+0NN+EK1pN2fRoV/u3r8k6d/aEzvKIH2U7dFSSPf0wiRE1HJTxdjRAfgF6vdIj1qpVHNPJCskz2CStnne169Rv4lM8U7yYBVkHu4b71j4DlAZ1rIam2oM/uXkLb+Af9h4WLn5zWG/ViHC52YykNm3coY7iEerYO04tzl30oNZztFShEV8MX1ovRBuO4avXQkFZTm0wuvrZmYWw2WV25B0lDPnYI= X-Forefront-PRVS: 02543CD7CD X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(39410400002)(39840400002)(39860400002)(39450400003)(39850400002)(50466002)(189998001)(2950100002)(4326008)(6666003)(6486002)(5660300001)(50226002)(8676002)(5003940100001)(47776003)(66066001)(81166006)(53936002)(6506006)(50986999)(76176999)(4720700003)(54906002)(2906002)(42186005)(38730400002)(7736002)(36756003)(305945005)(6512007)(3846002)(6116002)(86362001)(25786009);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR12MB1454;H:ssuthiku-rhel73.localdomain;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;MWHPR12MB1454;23:e8KVXvrWYzOirGLJGSPtcLmjBaL+RZ1M6eeJ15mlD?= =?us-ascii?Q?6WaJN57LKWkwKp9EUuLPxxtHyO/i1S6YK1ShbZXpOH3RFPxx/mnYBIHaYNfp?= =?us-ascii?Q?wHBTReo/Wo77AsW/5PqayKlnIBl560AvRQrv8WhNku29ICOD4oaLMZQ0q+Qb?= =?us-ascii?Q?UztHspRW08uT4RuwGm91eMUSO8C457Ye1FGNWXgf6aFck/7THpQsiIGXJ7d0?= =?us-ascii?Q?OV/1hjPIvRzuyNKtEtTv44pfuccf0xV/IJ4IiJbuZTm9YkXZKw5kgcaqTAB+?= =?us-ascii?Q?AE8nevyI9iyBqQn/m4kxvx079mJiMjyVQLm6bISmGihVbf68RXbLZepb46pB?= =?us-ascii?Q?FqJpUrXdA2i303YFKOcNoYNQsLp55XR/lzSJVU9XOCwr5LC1XpKai5yrXxzC?= =?us-ascii?Q?8B45tuxHU5kXKTxFelOnlqwVRik6vOWQi885xtyujId2w48xabqlzT73Q01z?= =?us-ascii?Q?2KqtRbFsC25AkZ1kIT5o36X/4qc4TbbeGvLD3cCNPOZgUF9gqMgVfmSriys4?= =?us-ascii?Q?MI7sbIyRBVa39Gs+HHxqWgl9JGIK+YaNtsIEQ0l1sTnMyeB2u1ltFIOc/xmq?= =?us-ascii?Q?TWB144aes9s0WryUg//erYrBTTDogk39d6qr7YoWsNoVUu22swpOJubX7GjH?= =?us-ascii?Q?j3y0Eqq7ufhcyM5+YFRQdg+bJQETAWEolM6PlEMjxf57ljZMSBvFYGi6HtRf?= =?us-ascii?Q?YOlxaB7eTikYao32eCimKist3PCn7KcSqSSiCHnGr8/HQ/KEAt8q8FpX2JB9?= =?us-ascii?Q?qLziwMK69WmFAPx1z7AXrubwdqXnwLOCC5EgrMEKyDqIzexwPgfxUD1GB/X0?= =?us-ascii?Q?Jy/D8ezh7bOjGM4ZVUXvx/XWCu9Dk1SjoT+6Vf3alooG2o9jbTk9rAetnSz9?= =?us-ascii?Q?iCkkQd/LajxKLNP7xnAQzDwudEorWYhSrCusv4oYX42o+WOdxRU5SUXaxslj?= =?us-ascii?Q?Aw3DjFX1v25E3Hq4utppDB4vKepbnP2z+abIv4RgA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1454;6:ZOyxtvcjvE7XyhA2U2O22jksg33x9/GH1kr/BRBtYdNLNVN2B3gm0DReGqyX88UX8lmsYM+cKCSjRxCsyktOEDsoRiuKdW+XP9nF10CmPlS+4mzhw4tKTb+KDTN/sIAWw8klITErw25gdkwFTbHlwBJFuQOmZxhINsBIUOknU5TA2jRj6/HklffZHS49ixBBq/W5YS199V30JgDm3240NOBkjZa2NSLPKrxaNPtIo26y4i8f1DnMIjnlhQEBzpFhQ3tXefo5xklbLkaMzQt3of4xOHVhm/fkbZLujf5NjOGZvRipKuPV4FBw3mOXpYBVUDhKm/AYb8j5GgPidnez55iFgtrFksycsDyRXOASNPU1rNB24JU63pPxtK4R4BZT5Yj8g55yialRrr5woO7sMZLAByxvSJ9BOGo6md6COvw=;5:KMNFhtP7C1l4rU5zc2Isf03NZo1j58+tjvRRxf1UR5e78PczKuEYHrdbFEPnDAaSOnXB7Hpg4xOHWjQXbt3kIZcvBnxprzhQEGpTTUnIpYIqstZYK8D3+r3pJ8GD+DGQBAoybz4wDvXYYIa9TL+LUg==;24:LJNWBb6rMvFzs0+WBLhvXuMU/+Od84qqIxtWM/oG82FwquHHMpgQW0pnRBeKx9IC1PzEFlXZZ5sIK81n3xHFEocFu3ZPUa5DcDdLIJjNm0c= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1454;7:SugMSiOktVE7Tj+Xsd57Ta3owaO0UwmAuud77yzEeJasMBPOOMHwc4T87+F030UOdIFPNKzfF3OW/ShWr9hhwDHyTx3ZIBqqhvAaIfoOLHfeUAiqxrlVIeeT5ahiM4ZZ5Rir99WxldImfYG8VQY/qFEzA6Rz0RZVaLCsA964bycNFPhFJuMHv2831gxmiZdIWtnndJFAY9yQws8KY3iielh74thkq7ZSkZ0JZtsoMoBG3kdHhUEvNsxN9KaDeiIBLWd58cTvrzarUyYC+xMAXB6Uu6F9Ljr0hRjXdWOqTXEaJlO6uzKmHe4FcZOtuOEeH1HWrWpKsbKX8YmCIBF02Q==;20:jF+mOYd5XxFNyDY5fBTt+TkMD1EdTiv+DBNjdUrhQQ+1GlVXK7i0UKjUOAXllHJKAgTl9/Pye2q0rCEEO2YkdCCKWZ89GQMdbLUnOmThrGb4kNwgh6hoHCjrJp5WtGtUV31ztj4gbd67aJUTGj+ZpNXdGydbx+rFGVh3JEndaL4urPZqO6vW4iWZjo3rw9VHoXpFThEt8FjYH0KIuH+omBAXjELKKyE3DiKeKkrjjwDqrd8sOou0mdeH0i1Ze2Im X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2017 07:03:23.3507 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1454 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suravee Suthikulpanit Clean up register initializaton and make use of BIT_ULL(x) where appropriate. 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 8d8ed40..e112f49 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_ULL(shift)) { continue; } else { - perf_iommu->cntr_assign_mask |= (1ULL<cntr_assign_mask |= BIT_ULL(shift); + retval = ((bank & 0xFF) << 8) | (cntr & 0xFF); 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