From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753530AbdBGIlV (ORCPT ); Tue, 7 Feb 2017 03:41:21 -0500 Received: from mail-by2nam01on0048.outbound.protection.outlook.com ([104.47.34.48]:52096 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751618AbdBGIlR (ORCPT ); Tue, 7 Feb 2017 03:41:17 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Suravee.Suthikulpanit@amd.com; From: Suravee Suthikulpanit To: , CC: , , , , Suravee Suthikulpanit Subject: [PATCH v9 2/8] perf/amd/iommu: Clean up bitwise operations Date: Tue, 7 Feb 2017 02:40:30 -0600 Message-ID: <1486456836-17428-3-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: a2eec9e4-a5a0-4518-ac11-08d44f3513a8 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:r2yQjBNgKNs1eV5xr2jeCmUHXPG54Wyr055rdWLOWkc0BGtg+JAl+wQsy0PkiKIcus2s4Xgxt5stVwZba8rwWpUsbgHTw0nnUngRdKITk4dIg1XoyXG/bmIburGxA6tlOJTHsBw5SnUCHHcTtH1DSLCsWrDzEIhM2n39lL0Tp3ybzicAz/BsQO4bkvvHrh3D77aDRddaiyEEiAn8yyQMPtuLfWYvBwrSuT70wTpq1c0XDSDY1coOA31ZqmP5gT747k7H4QWJTmBrpo8GrbdttZyfQjBg+E8KYsZxvGZ3kxo=;25:vWU6G+F0cf0mKHgQXPogoKlgt0h7Jo/Ecbz5OnOne7BOBuS9iJc6ss7UpUZCbFaVqK1Oa7Iq7J6ENn2S8ysRamdMDa8cjKafYJFAXkjUKZGAXw9PmcJD98CQhqpIEfIL81g0MW9E30n7VDj2iu8o0gW3BVV7fwIpkpoD2Dy4vNzysQobffnhNiyAFl/Ua4Z5gD5Ng2JHabc+b6M0/sFQKNRgdCCsT4a8IZJN7ppoJr5Q9s/Bq7+TGlnFBFCUY7OClMd4/mkSuj6bgQpOokArlX7irR6uxR2lR01cowdL79V34kThdGcamyZB+0JseuCSaLSYhC1myQXq2KKSyEtCMHY9qrabJtQiU57ghGCSigUXuhJUteqxoH3HcT0b9KAWeq07m3AjM2DrennFHmdaMWG5SEt6kWtsOxbmKI0S7nrtNywTCDcdvOqRbjdQxFE54zNEuMe0CnOVU9TjUKCT1w== X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;31:WsVcb2bGc7mX4P2hU1SNXo+0iU9OB22L8ROqNoHEdyz7jQBGkjhW2XmDnTuBiRVW7J8EKrmorqJ5bpUVN9Pysj+TMNY7GL8z4th2spTCVJ48jrAadX0JDivSq4VtKR92rlyj0UWZ6KFYs7TfcglrnRYGtT/kgsSMezAPj4GpV5Kq0TMMz7DTfhEqD4Z+ZViYyDUQ6rdmhM7haL1L439g/tfNZ8Ym302cDuJiMaPJFYaKYHHreLf3RsBPqo+KW+HMuXlknDuLsU6GOg2YgctOwg==;20:TE05+WF26WlONbT+XyfooBChQj8eT9+80Qg0zhbB4Tlwkk1nuvcyR1PF47Qj9tTm2E4qV+BjkeOwDosTqhDOLjSwQfDW1CyL45e4x/1Y/zkt4cAY7AUaR1RHUg46vEvi0TojhbFomd+irA7W/3LPXjdPDOA0EjB75TkpZ7yqT3Zf2tBW8rAU1jW9n3c34lPvwvEoJHPpzrQlWe0/WDsSTBc/R6EvWnCm9gTVEhHhNmU8XGxKZo0Ac5DpAidL+piug7IfLf3/6AWPguVybiaO4lOlhyGX1WWto36+roXQuyDiUYAViBuWMzfRIRBWVAaNxkQjqw71AKQaOGabxhUgpC6hYHhOMwNPipsfPEFzRpreCLgAkV+zPt2Ar/aXcPfd9K9yfZjx3Bk4vUzI/4q/4euHs7wuBDc08pxldGn8e6CuQDxq5SsAl4IL38CxyXcJNbNwUIy2Japac8PwVTcm305Nkw194f5jOKXnqg9IciAnC12nws/1rzxZlFfA5N+O 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:8YQ2fmwLAe8r6Pf9QG0L4ES55vSVdp1jSfD14RIXRdFCjuQ4DiD1YzNmrWXMpqZwQxkC2MLzk6G7ZG8Lk4itFUHV73fMwVunKJvEu9DgXCt68nCfjQdu6K2h7oPcduZTqprmjKnKUjmicUxZPbSz5blQhCY6yleSw5P8naN8YC3Q+Mce+6Gcd0FHREmM0Wp6JquQBPTj7qu4f2MK85AaAhbjU18yxLpvstauK9LDipJPOgkeejMwXqoTaKwTuiSaJrl2qh+M8llI0oqjbiYLbIlTVOYdZWyP81m9r5pf/8lHu6mzocAOBzp5rSCrtLg3PIV0rr3CSx0oVAroVBR90ZZ7sEFqoHg9rlVdiRxSODzrY7PlIVaeSD+0jE8rZctxO6+c7xNiCvh9hUa9IxT10K9JZV8Z6VLTpaG5rycCaj4WA3rsgBfr8jpUurYkcYDYY3J21WnB1YNWKsvBIBDDS7RAWbATorSYSgQiuuVnnDg5nER5f06oQ5icz0zzKDN+6mcvfklGy91VHRIQ/c2tbM6ilFLGqCF4c5F90Ow/cFQQE/SZw6ws2Sc86h0DNoKl/QOI3iq9xds7v23JDrrhA4h00PjQy1Z22fq1uLTIPQfzTUWh6in8tgzQpzJ7rZbFNUlGMnHnXoY0y3kU8jzEtNe5tRs7g606tTm58kcWpyGAYBrMm+TQ4iC59jX59TAMtng4TGvhK0fpnpwzIVUV0rVp0Mn3F0tcqTj/iwRrLYVIFOuSFRToT/2B/uspMIdo X-Forefront-PRVS: 0211965D06 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(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);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:XZ44/OAb2KARpRO+LG4MH7ptPxrCX/ij3ZSTKfEIz?= =?us-ascii?Q?S53cQ3gTjebcWDsjRu1XGtb88yxepedWB1yWMgPagHO79sf0jUN2/rn3xTM/?= =?us-ascii?Q?FoDD2JHGc/ps5P2vUjaGTyL2aS4NH+/yLnh8YLO/Uan/sHNonVoViR0MXQCU?= =?us-ascii?Q?lZDWrm5vFffEwwUe1OCj20K2aEkhxsnvQBj1pfwU30SBLbxRSNvRaIt14Msr?= =?us-ascii?Q?VVgJtrSc4eDMo0oArPRDOIZC45dYBCjTz2nFMjJO9Vxxxl961ru09I7/PRZH?= =?us-ascii?Q?3JBGpdgPRn9Tgk1033Kw7Od25cCbuxwtI+QkGzkIj2SLfGyAT6zaxxaahqHL?= =?us-ascii?Q?julznTEkihHGousOXvo65T19IP2d82pOAYXc1F3RvOTouZvz78S7xolUx8OX?= =?us-ascii?Q?pZRWd3QOKZc8Lh4aovStFpKPpGB5FgcesxkthKfpiNOJRg7dAEncxdjteBdY?= =?us-ascii?Q?Kj9T96ERDCZO0f9htNdWFbO5H8rh81c85GsTgw0As4aTywfWokPUiT6yJIME?= =?us-ascii?Q?bMNRIM7glZoNvdJK+j+iLHo6WhJD/EJb1OrlcmCORdMwsahOJNqAvAeMG6nu?= =?us-ascii?Q?Fo3V203w8LX/P8E3BtT0CBkolH2yH/LE6hGwtJLUTlcSEDEiwEbUSnPR4fjh?= =?us-ascii?Q?QMjw75d+VP/cChaduLC2ku14ZIkA6UJ9983fL45Je4F8YHm1k5UtQsJI/2Ll?= =?us-ascii?Q?4gECL5g06D9oOizVyk5W1hbsGNl4LqJEKaZh4YF44GcbZAke9wOIkcBw8jk9?= =?us-ascii?Q?6/yPMfL9LjE2H83o1xZ0p0/1HkH25yvE++XYdZTWR7LAY8kVRse1XREEIyFj?= =?us-ascii?Q?L4D0eadHjvzGVInkBjRQHYcNPQrgrUlSoEiXxlqSemj/yJZlb1x+uJPnp9l0?= =?us-ascii?Q?LQmPnbnpkifNuRLav1LExkfnLVsQ5UH6uLah1EIA5wKfq4xZ2kMOPykjr7am?= =?us-ascii?Q?jtPq+/2iWuk7C3NFacnQILOnZ70zdbeKZUExwL+ifRmR99hBUJbcawMRjEN7?= =?us-ascii?Q?sNwNb79UJQqIKQJf2B2P/4NlMxN00+te0ZI8KFPaAfjZjMLt5sSB2B0xmOOt?= =?us-ascii?Q?nbg290=3D?= X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;6:nPNurM2CdMyZ5nGUiSl4PsattJrGcIpeh8C+nrmSMbMLMp2v0JugeKZx0wjBILy0doLUKfsSAJenvka3JRyzZSsXTJpVQoXIDRPVLoYxKucYnT0xfxxoa0E3TUJeEf36xNNLbPfePrCu4NtPDS3GsBGHQazXN0Z30BjMfeOuuL86u0SObbVKA73TrxkEvkw5UP7dvMFJMW0J53y72SHz1iB+ZM/x621qiy8VNt4UAyxHMaWiVe7oomFUS2xWEnwDHhnWHMQMZD9t94M3NhqF6LMkET2oXCTPU7doiFW/Q6owg8ychRRpjD/4rWa/fpmC/zcDNqoM/y5aGxPu43jq9nvfGIzThFqUbZ51I4dBwIlFgQhFZwU6t92GkT/3Yq6QWhxdb0lm2EBnL8yuqR5Rh/r8w0BKH8SsGcBZnwb0eSo=;5:Mo32QuXGMIyPRbgHRaAxfh8jIq2ifNpE7pIWMbRWpB/68RQ4Tl/kNyiR046j+MwLFLoIsXOrM46o3ZMR6GWJ9zu6+wJH8ly8YrZDmPlbcBbvzzptQdY8L3/dVNoKccADEKePlViH4wrf1cS98nG1bSiNp9NgbuL9ACpSKvcXqYY=;24:ZhuXY2SIIJMbI8PMPltVQtJW8GCIeeVeXRFac95V5bK6Y+F81rljT5xI7qy/DWrYBdoK9iLRhZC1l5Xn3VFh/hwjO5ldM7kGWYvMZWSnrgQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;7:ZotmQ51ZMCNCPr9VtF0vdwrxzTG7laPXzOVJ+nZozybKmw/vASCyCyCtkVe+XwUFDjL34uWBtZH3HlNpW4Nz18MIQl8+AySyUvLjtUqYVQBcfqni8ShfBbWeIdNkBybx8n4wVA2kQzedkJw151gOProXbDpQ0nXxoU5+quInBK4VOr2NvhN3aMdiZ1oYfmX/eRyiDaTcichpvdVGg9vK6ucmRUipZXYwLLH03o8HisOGiddWb+0w1/l+CvIV6Q3+sb13cYZ6TRukuH7YA2y4OJokcHv3Tpui9Bjk7Bgp1URNqYWCXq506J+X9U0k08/FS3/kHfe/JxgMfgX3i6NAKnHdVTxIwQMt1oWts3AM0GMtAkY3L7pimPichkqzHeVJI1nGz5cFUcDOHZtlFgjwpgOQubEbdFLPX1Bb+Jpy9xtjqrdnlHZQyTQWsYH6nMBYSi5XIN6wKyX57Yv/72XnIgEAun2yACBhAmHAVAGJuIq/4+MpE87/r5OJHIppgGBscnw0eFt228u1cGqQduohUg==;20:u91UddgeWus2wJ3Vqa0p9zutXtv1Mzpkr352cY6IMsB81Ha/GMjR33yBLa4IsC1DYvMfZNp6Zi+ZYQt4jVN8zDmcWAhv792NtY3EYnUUP05OZ1VpF4IBeqp07eXxTZFwHekoW9ggRmGBnOKez0lU+JFsg8Mu6NWGBTa0sphIT1UKTBX0NYeumcCL1yVuhjybjmIrhEGzc+jNbi+eozzBYsNzDC08RR/F0cXxcFqIwOjSkday+hKAqndKKnx/3Min X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2017 08:41:12.6827 (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 From: Suravee Suthikulpanit Clean up register initialization 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