drivers/perf: riscv: Use BIT macro for shifting operations

It is a good practice to use BIT() instead of (1 << x).
Replace the current usages with BIT().

Take this opportunity to replace few (1UL << x) with BIT() as well
for consistency.

Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: Atish Patra <atishp@rivosinc.com>
Link: https://lore.kernel.org/r/20240420151741.962500-5-atishp@rivosinc.com
Signed-off-by: Anup Patel <anup@brainfault.org>

diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h
index ef8311dafb9189c867509a49122094b75445ba31..4afa2cd01bae49add6ce0201c4fff5f1609f6141 100644 (file)
--- a/arch/riscv/include/asm/sbi.h
+++ b/arch/riscv/include/asm/sbi.h
@@ -233,20 +233,20 @@ enum sbi_pmu_ctr_type {
 #define SBI_PMU_EVENT_IDX_INVALID 0xFFFFFFFF
 
 /* Flags defined for config matching function */
-#define SBI_PMU_CFG_FLAG_SKIP_MATCH    (1 << 0)
-#define SBI_PMU_CFG_FLAG_CLEAR_VALUE   (1 << 1)
-#define SBI_PMU_CFG_FLAG_AUTO_START    (1 << 2)
-#define SBI_PMU_CFG_FLAG_SET_VUINH     (1 << 3)
-#define SBI_PMU_CFG_FLAG_SET_VSINH     (1 << 4)
-#define SBI_PMU_CFG_FLAG_SET_UINH      (1 << 5)
-#define SBI_PMU_CFG_FLAG_SET_SINH      (1 << 6)
-#define SBI_PMU_CFG_FLAG_SET_MINH      (1 << 7)
+#define SBI_PMU_CFG_FLAG_SKIP_MATCH    BIT(0)
+#define SBI_PMU_CFG_FLAG_CLEAR_VALUE   BIT(1)
+#define SBI_PMU_CFG_FLAG_AUTO_START    BIT(2)
+#define SBI_PMU_CFG_FLAG_SET_VUINH     BIT(3)
+#define SBI_PMU_CFG_FLAG_SET_VSINH     BIT(4)
+#define SBI_PMU_CFG_FLAG_SET_UINH      BIT(5)
+#define SBI_PMU_CFG_FLAG_SET_SINH      BIT(6)
+#define SBI_PMU_CFG_FLAG_SET_MINH      BIT(7)
 
 /* Flags defined for counter start function */
-#define SBI_PMU_START_FLAG_SET_INIT_VALUE (1 << 0)
+#define SBI_PMU_START_FLAG_SET_INIT_VALUE BIT(0)
 
 /* Flags defined for counter stop function */
-#define SBI_PMU_STOP_FLAG_RESET (1 << 0)
+#define SBI_PMU_STOP_FLAG_RESET BIT(0)
 
 enum sbi_ext_dbcn_fid {
        SBI_EXT_DBCN_CONSOLE_WRITE = 0,

diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
index 1823ffb25d3583b1132ea8571a5037f078e4262a..f235018986575e016ca9565bc7bfb4811b304246 100644 (file)
--- a/drivers/perf/riscv_pmu_sbi.c
+++ b/drivers/perf/riscv_pmu_sbi.c
@@ -386,7 +386,7 @@ static int pmu_sbi_ctr_get_idx(struct perf_event *event)
                        cmask = 1;
                } else if (event->attr.config == PERF_COUNT_HW_INSTRUCTIONS) {
                        cflags |= SBI_PMU_CFG_FLAG_SKIP_MATCH;
-                       cmask = 1UL << (CSR_INSTRET - CSR_CYCLE);
+                       cmask = BIT(CSR_INSTRET - CSR_CYCLE);
                }
        }