From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752203AbdBOU5D (ORCPT ); Wed, 15 Feb 2017 15:57:03 -0500 Received: from mail-bn3nam01on0075.outbound.protection.outlook.com ([104.47.33.75]:60320 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751338AbdBOU47 (ORCPT ); Wed, 15 Feb 2017 15:56:59 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Suravee.Suthikulpanit@amd.com; From: Suravee Suthikulpanit To: , CC: , , , , Suravee Suthikulpanit Subject: [PATCH v10 2/9] perf/amd/iommu: Clean up bitwise operations Date: Wed, 15 Feb 2017 14:56:18 -0600 Message-ID: <1487192185-31272-3-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: dd46e34a-19d6-4f17-12fe-08d455e52e0a 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:QQ3HjdBJCNiACPZ57J3Grp5o175kFm+iI9Mm/Ka46x6rMeLsUXY7WrDWib9ouZMozbZvCrRXwoanKtUG2HdNF24UXPPpmgv7KqvEq3xCWu+frbhJqwN/q1gASjUSdGINxA9g5TbwZMgIy7/lEVXMH3d7TGi5kAC90rUGPmPmI7Oftsvu02qICCCXL1xxNYNgboeoifGhXYRJo/50arMf+TjQ1YTRNm6wnFcJi+3kf6kSHpchuU1C+Em1QV0nPVkJnHLT2SFrtBGXT2Zbwn7gCpwPF4L+PTNQyd59RRMFXpM=;25:1G+mDj1Em7ZKIEWlUuwMO02/wT16uHB6yBp1vgpgVSzSdXS38O8G+CbEhUGnUY7Cl4CdvY9VN0omeSVXETPPq2/NdjCepDUtNN/t8E0s+eRzAe08zIn3RWn/hXll1l17WmsdlxOfEuo/L/vcLWP54kkCgldQRih0OKDPWOG4akh2JfLfkTGHAPjezEVMqjtkpL13qGt3xDQnn/BQ5SPr4iwzHTRm0G7KUjsJHXI6NY1dpiAHoATlwr1gmvD8VmGRq+HEh5ZwD69y/ho6AM2uSr/zoDJ5poPhys8aRpr/9FcfXYmHJPQL+KYUWmN1FQdLxoE+XsxnNGJsZla710BSR7gylqX7Nc9WMdRWpGKgtcPaP9ZRxyDfdEjo3cOyEnhytaaeB+uhdNdDN6nkuaDKLtJ+QLT0hZrHXFrdWuoavKoI5ib4W4o6k5Tda/P+TJoAe1iALit4EqkN/pxLI/p+Rw== X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1444;31:zNhPGs3/8Zv5rAqgKa9xd8tLPFW0t1dXES69s3tFp50NHtzgkdcp2DL+RzlvjapxNHwEFDPw4Tvh1TmOeC2eWTg39w4A7ho0iuM+bbDlXo/hAFb+iWJnc2TbP0NogZ8XmCF3iLwrKb6qML18xP5UDZ+SCbSlP23tZPHcI2P7rjsppYur8RaKMmaOWQwgFHaMjzWpuWSPHTFBHMf+xc3c2Ia7gOMbSe1B1poi8BaJehI=;20:JI2ub0UrILL9rcR/RhFOD3rsD23x3KEvETZDBQmF/9H9VeelPJID8acw/+6qFAptnNdbxxH3W20O9dymFIvNt8AlD/ciLSygO8hhdzF3uiam/P/vOMKEXAO730h4mGUTcB+VMRNGq6qmNbCBzyGWN0ADWaTRfsohElAf8bKJxPVEkUEtn/528br5BD8GjzgIFX2pmbRebQ1PrG//nraZ2r2Zb9KawYHVaoV1O/KT5Jl/kyXwKiG+6e9v9Qf+nzZjy7LthIKXUmQKtfutEI2XnR06peY+0FsLOInx3XU5f/silh6s5f+DNTtFeSjjHHmd+v0d4UspPMI9AeZ+eZVHU12xuaAex9Nak0WJESnCtg+GV9x95N9mKViMzrvBe/i4BVhbJQbYYE31+PBDKHUY8NPgXHIR6W14IPIpNltQRqK0uGHaqz2hruoPlgSyS5n2PjzM1bZkHXiu0CXuNuHVDkqOa4mzUXND6K4PfHo82k/DBpdN3xsxZx0ksGs0rtPI 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:MX2YXNqJriyUO9vp3ZSzdblJ8IdQcF+dI52MPeRB5Hy/frs63zKJLtL4s/fQolNzzY2y2UGvUAdBb4Au+AghWJE/aqV0p5rNUm9lUIjZRWTvGOe9+TyXAwyvubyEZCbNGq3hJyOmDOgWCVFPV7Ic5vB0Ekph4P64C103PKm3BiJyRmzJiaBC7YqMWtLjpIZQ4qEXqUIzETbvnUY8H+W7rNqIU2R+Tg2tFiydydzMr5YJbkQp8RTZZ9Be5dXhDRpnbjIaBaxEWocIicHdR95N5cLKHS0FXeiiubelMQHaAGTt0IOQ9I2+amFxgyeoVE10TQ5lmSP6vdDzgZSZgxdMigxdE1ybO7ipCSRDBsKwwEfGqeZHNhISvbcBJ4PEWwq8dL96Ioi23cwQ5o6OpcNpz+WQLYOyaYxKLjvqo1954u2xRYxiROogEOyJV9TGyJtskBhfJ/7ObUSCy49CXOZBxdh66MvGUEK+aWgGBJSdpuxNblo9/6egBXWaEtGFBecINXLLZ1DA9pGmS3c8xqmdcHeHiGpC77GFwGb6qXYJ5gTnZTy94naock2VDQ8hoTuc0MImv9uEuPMRUHrn6QdEW8HVm0z3kAtl/UEYmMnUH7dhQ0uVjU2fil3NFn9hWs+KhBTxd2QPMyylTCk4psoAHTdXWiWf6jeYeuvmmOAh4HM= 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:ftD6HlMVxtYGImIBHag0fixw9+SorCyLC1ExbMu5/?= =?us-ascii?Q?lnoqemzqFdBaVCxUZcFceCY+wDl1AUKh0UT2Gid9bNa3ODbXXl+63+1NvOoM?= =?us-ascii?Q?y3LAidrYrOpgDRQJxTA8790NL06OTovlhEu7l+J5qHq/+8vrG7dkgycGPM9M?= =?us-ascii?Q?5eSTOzQjXmvaDBBHwUss7zFECMtg0rxvFB5wuOMw65RLYILtHl+GQzc2hetB?= =?us-ascii?Q?aH+hhrj9ZBzhRqV0zv+WF98HnzeGRYWjBaxYro15pEav2aMEH8G6Ojth3GZK?= =?us-ascii?Q?Hv48XR5en7jaJXKeHl/ft12feITEUwMK4zL7ARaqcJ5WFROFdHM4ZjjPRIuV?= =?us-ascii?Q?LA/mgvTIqPtUNEysa0K4EnPxXZLzNz0oqjADno3tOhdXTcvlJEk96PExADRR?= =?us-ascii?Q?D7Y30kKrqPTycTKJYZDqypcbwUjs/B7lh2ARqDY2Dk0WMgQ25/4ulff1hgIz?= =?us-ascii?Q?9Xp/kDAGuqyMiRTaekRSOcBmIIbs+Q12YNi1KvcMv3kkgB8xo5Tg+VZPTv2H?= =?us-ascii?Q?pjEfadR3gusjeQzXpfVc4GsDFZr1CCoOMbpQldnQLehxSAU0hpOxFj2VYZt8?= =?us-ascii?Q?aEg6GtRBbsDYy7IINJZh6ztH2OtfYkXDGRpM631lmlTc4N4XCH/b0lvB/xN1?= =?us-ascii?Q?6IgB0csL7kG6+Z6+NVqzGXjovtf3dVH5lufXiVYpz0HBpfNFCwLRbGu7H0pX?= =?us-ascii?Q?OYVb2cx3MyS1fMqr7piO00hKfWkzSgX3QbtID0YO+PN4un79lOhb7IkGfpPo?= =?us-ascii?Q?G+OLw5K/fiTELM7a9Y7bAYN44+CTkDDompsPafezQcWeKs0dfEXnYdjR1gWP?= =?us-ascii?Q?zRESkhAQEt2gmFth77RRsYWAlmVVxwieWAj6mBsxISNQfsNdES8Db5AuCB4a?= =?us-ascii?Q?eLwrWRg25KCHlacoddFcyDx5o80vC3jVlPoTp2JfjRYJqHpZEEJxFCWv6efK?= =?us-ascii?Q?xFjc+GLW7ZfdTYj5oMLbA+asZ4RoJQ7wt+kltb8k2nYmAxDf2ZPGGpqLG4JQ?= =?us-ascii?Q?44WhVSArp2QCxI8+UGpOXGq1xfGgFX7C0wfqqFHMBELSUU37hHuQ/qWQKL5/?= =?us-ascii?Q?9rDyfkq8Ba/KqdIEQ2+gzF4FS1CZ/ZFIBEgHFwwWM5YGCT+hTy9cIetyVjGA?= =?us-ascii?Q?2PubMlRRRe+0cXFQ6sm2i+sVVdoTDayQrHm669noD7FWaTAcnF9ZpKQ3ZMdv?= =?us-ascii?Q?LDWGVDMUf7qKIaQhnf7HoSl19nxuHbMfpNP?= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1444;6:CcGsp8mUirOg0R/x42akJKgFWJTERGBriadMuBO/olA4hK7D3kBstOUkoN1amJBDf1tMPbtPJY+KoYmHb8Y1Nw8YfoLrH+IUcmn1qGIBz/oRgP2Mra6bC71ElXOrpm4XdGID5Jtbqw/6iUJRcSm6SQKThrNhCLx3tsIxXCFONrc6ahl16cKXgNvQZrCrq5KaiYhjF+KQQT+y9cCyEsFOJ3WSzs6qX+Yz759e22gf4zCfMInLY2gRDqEoblOev+pHoMvflW7yk82TBs2jKa2alC1EUX1Oa72hCZ/EKZSkds7NhiU71A3VLi780GhwtPRq9Ayp08/MPW9Itl5tAaibun02+xcC0Q0eMeAsHV8rrXQ1F7/ZRnc6Wt5B36hWrWPquIWC2JAHEoOuHeezeCuQEvOe52VeuwGjPKA9BlnGd/0=;5:M6Y82qMm0kklnKw4Yn3J9SEzugfW80e0Sv7bnutpVoNKHVXioNTzges1T/PxCYsDH1wbM5BbTCr80hTCqQzpeuA97j5+2sLVQSnbGPDGef4eRnpBDfNSsyWebzZujhx01UViv1hcWx5CDNBg8kZHxg==;24:Zot3UHpfeN2WcKmE8N5WcbbNmXMM5DhRlVl3EIofF0Nee+yuEEP1sAhCzNzqUEnDmRyoxnUHC1y+RW7SjamYdeP99jECm8h5t9Wx3ogoiEg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1444;7:l+vAskMVap5zXYuSFuI9+KBwG2hUeY3Khn+rBqE06HOeLzipA3bKUkqpSyDf+fT8qBhrZyydI1KVPVCNUzcNQ1si0TxcrfJI7EsFIZSppaL+qyTbvixTZ5Ql28k3+Da3H1WGs6aUChJktAtPwdyD5K2Te4s+PHmbGhyTM+an+dHPR6nH4fgb4gdfGR6RDbCUmK0fCwymGH76DfTJ/FXn58NUqQiGPhpbEamq1Fo3WIb2kJFHuzGxneq9jmpm4sunfUoSBG2Tlo3d++pxZIBkKGX15hwRCVyG5dyAP+LQ87zw8tk5yD5z8qPMY9VmrG7GoyKw8AxFWpNJX1aeaeaTbg==;20:LPCJoBUQ3gfanlZedO0o7m9y+DktFF0Gx9+RIFQSEtJgpILpP6yXoIONW/c7bCkhuCOC6w1kvWvSfnkVnT5DAEJAVCpuIxs28KtzuRKtPWbAPHEwmXwPxjWBI+LU/d58gmmUnzwzuy46ZaDOk/Jg73ACMCCTuSdC+97GLcQcoM+sPNAccmVrF9ga4cdDtxfmKXxVJeZnmDS8EQUO9BKG6edMGbuCO0CCMIPT7QcT6VTpgfd1GDNCASCwHVwJqv+n X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2017 20:56:54.8945 (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 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 44638d0..85b634e 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