[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 6/6] target/riscv: Use MAKE_64BIT_MASK instead of custom macro
From: |
Rob Bradford |
Subject: |
[PATCH v4 6/6] target/riscv: Use MAKE_64BIT_MASK instead of custom macro |
Date: |
Wed, 18 Oct 2023 16:39:14 +0100 |
A 32-bit mask can be trivially created using the 64-bit macro so make
use of that instead.
Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
target/riscv/pmu.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/target/riscv/pmu.c b/target/riscv/pmu.c
index 5e89354bb9..81b25ec11a 100644
--- a/target/riscv/pmu.c
+++ b/target/riscv/pmu.c
@@ -25,8 +25,6 @@
#include "sysemu/device_tree.h"
#define RISCV_TIMEBASE_FREQ 1000000000 /* 1Ghz */
-#define MAKE_32BIT_MASK(shift, length) \
- (((uint32_t)(~0UL) >> (32 - (length))) << (shift))
/*
* To keep it simple, any event can be mapped to any programmable counters in
@@ -455,7 +453,7 @@ void riscv_pmu_init(RISCVCPU *cpu, Error **errp)
if (pmu_num == 0) {
cpu->cfg.pmu_mask = 0;
} else if (pmu_num != 16) {
- cpu->cfg.pmu_mask = MAKE_32BIT_MASK(3, pmu_num);
+ cpu->cfg.pmu_mask = MAKE_64BIT_MASK(3, pmu_num);
}
cpu->pmu_avail_ctrs = cpu->cfg.pmu_mask;
--
2.41.0
- Re: [PATCH v4 1/6] target/riscv: Propagate error from PMU setup, (continued)