Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: sbi_pmu: Replace sbi_pmu_ctr_read() with sbi_pmu_ctr_fw_read()

Browse Source 
The "read a firmware counter" SBI call should only work for firmware
counters so let us replace sbi_pmu_ctr_read() with sbi_pmu_ctr_fw_read()
which works only on firmware counters.

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
This commit is contained in:
Anup Patel
2022-08-24 11:39:02 +05:30
committed by Anup Patel
parent a90cf6b186
commit 1664d0efce
3 changed files with 10 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/sbi/sbi_pmu.h
View File

@@ -53,7 +53,7 @@ int sbi_pmu_add_hw_event_counter_map(u32 eidx_start, u32 eidx_end, u32 cmap);
int sbi_pmu_add_raw_event_counter_map(uint64_t select, uint64_t select_mask, u32 cmap); int sbi_pmu_add_raw_event_counter_map(uint64_t select, uint64_t select_mask, u32 cmap);
int sbi_pmu_ctr_read(uint32_t cidx, unsigned long *cval); int sbi_pmu_ctr_fw_read(uint32_t cidx, uint64_t *cval);
int sbi_pmu_ctr_stop(unsigned long cidx_base, unsigned long cidx_mask, int sbi_pmu_ctr_stop(unsigned long cidx_base, unsigned long cidx_mask,
unsigned long flag); unsigned long flag);

3
lib/sbi/sbi_ecall_pmu.c
View File

@@ -51,7 +51,8 @@ static int sbi_ecall_pmu_handler(unsigned long extid, unsigned long funcid,
break; break;
case SBI_EXT_PMU_COUNTER_FW_READ: case SBI_EXT_PMU_COUNTER_FW_READ:
ret = sbi_pmu_ctr_read(regs->a0, out_val); ret = sbi_pmu_ctr_fw_read(regs->a0, &temp);
*out_val = temp;
break; break;
case SBI_EXT_PMU_COUNTER_START: case SBI_EXT_PMU_COUNTER_START:

45
lib/sbi/sbi_pmu.c
View File

@@ -167,50 +167,19 @@ static int pmu_ctr_validate(uint32_t cidx, uint32_t *event_idx_code)
return event_idx_type; return event_idx_type;
} }
static int pmu_ctr_read_fw(uint32_t cidx, unsigned long *cval, int sbi_pmu_ctr_fw_read(uint32_t cidx, uint64_t *cval)
uint32_t fw_evt_code)
{
u32 hartid = current_hartid();
struct sbi_pmu_fw_event fevent;
fevent = fw_event_map[hartid][fw_evt_code];
*cval = fevent.curr_count;
return 0;
}
/* Add a hardware counter read for completeness for future purpose */
static int pmu_ctr_read_hw(uint32_t cidx, uint64_t *cval)
{
/* Check for invalid hw counter read requests */
if (unlikely(cidx == 1))
return SBI_EINVAL;
#if __riscv_xlen == 32
uint32_t temp, temph = 0;
temp = csr_read_num(CSR_MCYCLE + cidx);
temph = csr_read_num(CSR_MCYCLEH + cidx);
*cval = ((uint64_t)temph << 32) | temp;
#else
*cval = csr_read_num(CSR_MCYCLE + cidx);
#endif
return 0;
}
int sbi_pmu_ctr_read(uint32_t cidx, unsigned long *cval)
{ {
int event_idx_type; int event_idx_type;
uint32_t event_code; uint32_t event_code;
uint64_t cval64; u32 hartid = current_hartid();
struct sbi_pmu_fw_event *fevent;
event_idx_type = pmu_ctr_validate(cidx, &event_code); event_idx_type = pmu_ctr_validate(cidx, &event_code);
if (event_idx_type < 0) if (event_idx_type != SBI_PMU_EVENT_TYPE_FW)
return SBI_EINVAL; return SBI_EINVAL;
else if (event_idx_type == SBI_PMU_EVENT_TYPE_FW)
pmu_ctr_read_fw(cidx, cval, event_code); fevent = &fw_event_map[hartid][event_code];
else *cval = fevent->curr_count;
pmu_ctr_read_hw(cidx, &cval64);
return 0; return 0;
} }