Commit c69f9cb0 authored by Atish Patra's avatar Atish Patra Committed by Anup Patel
Browse files

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: default avatarAndrew Jones <ajones@ventanamicro.com>
Acked-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: default avatarAtish Patra <atishp@rivosinc.com>
Link: https://lore.kernel.org/r/20240420151741.962500-5-atishp@rivosinc.com


Signed-off-by: default avatarAnup Patel <anup@brainfault.org>
parent 7dda24ba

arch/riscv/include/asm/sbi.h

+10 −10
Original line number Diff line number Diff line
@@ -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,

drivers/perf/riscv_pmu_sbi.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

		}

	}