[PATCH v8 2/9] perf/amd/iommu: Clean up perf_iommu_enable_event

[Suravee Suthikulpanit]

From: Suravee Suthikulpanit <suravee.suthikulpa...@amd.com>

* 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 <pet...@infradead.org>
Cc: Borislav Petkov <b...@alien8.de>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpa...@amd.com>
---
 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<<shift)) {
+                       if (perf_iommu->cntr_assign_mask & BIT(shift)) {
                                continue;
                        } else {
-                               perf_iommu->cntr_assign_mask |= (1ULL<<shift);
-                               retval = ((u16)((u16)bank<<8) | (u8)(cntr));
+                               perf_iommu->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, &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, &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, &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, &reg, true);
-- 
1.8.3.1