Mirrors/opensbi
7
0
Fork 1
mirror of https://github.com/riscv-software-src/opensbi.git synced 2025-08-25 07:41:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

lib: sbi_pmu: Rename fw_counter_value

Browse Source 
Rename and reuse fw_counter_value array to save both the counter values
for the SBI firmware events and event data for the SBI platform specific
firmware events.

Signed-off-by: Mayuresh Chitale <mchitale@ventanamicro.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
This commit is contained in:
Mayuresh Chitale
2023-03-09 18:43:54 +05:30
committed by Anup Patel
parent 60c358e677
commit 548e4b4b28
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/sbi/sbi_pmu.c
View File

@@ -65,8 +65,12 @@ static uint32_t active_events[SBI_HARTMASK_MAX_BITS][SBI_PMU_HW_CTR_MAX + SBI_PM
#endif #endif
static unsigned long fw_counters_started[SBI_HARTMASK_MAX_BITS]; static unsigned long fw_counters_started[SBI_HARTMASK_MAX_BITS];
/* Values of firmwares counters on each HART */ /*
static uint64_t fw_counters_value[SBI_HARTMASK_MAX_BITS][SBI_PMU_FW_CTR_MAX] = {0}; * Counter values for SBI firmware events and event codes for platform
* firmware events. Both are mutually exclusive and hence can optimally share
* the same memory.
*/
static uint64_t fw_counters_data[SBI_HARTMASK_MAX_BITS][SBI_PMU_FW_CTR_MAX] = {0};
/* Maximum number of hardware events available */ /* Maximum number of hardware events available */
static uint32_t num_hw_events; static uint32_t num_hw_events;
@@ -185,10 +189,10 @@ int sbi_pmu_ctr_fw_read(uint32_t cidx, uint64_t *cval)
if (SBI_PMU_FW_MAX <= event_code && if (SBI_PMU_FW_MAX <= event_code &&
pmu_dev && pmu_dev->fw_counter_read_value) pmu_dev && pmu_dev->fw_counter_read_value)
fw_counters_value[hartid][cidx - num_hw_ctrs] = fw_counters_data[hartid][cidx - num_hw_ctrs] =
pmu_dev->fw_counter_read_value(cidx - num_hw_ctrs); pmu_dev->fw_counter_read_value(cidx - num_hw_ctrs);
*cval = fw_counters_value[hartid][cidx - num_hw_ctrs]; *cval = fw_counters_data[hartid][cidx - num_hw_ctrs];
return 0; return 0;
} }
@@ -372,7 +376,7 @@ static int pmu_ctr_start_fw(uint32_t cidx, uint32_t event_code,
} }
if (ival_update) if (ival_update)
fw_counters_value[hartid][cidx - num_hw_ctrs] = ival; fw_counters_data[hartid][cidx - num_hw_ctrs] = ival;
fw_counters_started[hartid] |= BIT(cidx - num_hw_ctrs); fw_counters_started[hartid] |= BIT(cidx - num_hw_ctrs);
return 0; return 0;
@@ -711,13 +715,13 @@ skip_match:
pmu_ctr_start_hw(ctr_idx, 0, false); pmu_ctr_start_hw(ctr_idx, 0, false);
} else if (event_type == SBI_PMU_EVENT_TYPE_FW) { } else if (event_type == SBI_PMU_EVENT_TYPE_FW) {
if (flags & SBI_PMU_CFG_FLAG_CLEAR_VALUE) if (flags & SBI_PMU_CFG_FLAG_CLEAR_VALUE)
fw_counters_value[hartid][ctr_idx - num_hw_ctrs] = 0; fw_counters_data[hartid][ctr_idx - num_hw_ctrs] = 0;
if (flags & SBI_PMU_CFG_FLAG_AUTO_START) { if (flags & SBI_PMU_CFG_FLAG_AUTO_START) {
if (SBI_PMU_FW_MAX <= event_code && if (SBI_PMU_FW_MAX <= event_code &&
pmu_dev && pmu_dev->fw_counter_start) { pmu_dev && pmu_dev->fw_counter_start) {
ret = pmu_dev->fw_counter_start( ret = pmu_dev->fw_counter_start(
ctr_idx - num_hw_ctrs, event_code, ctr_idx - num_hw_ctrs, event_code,
fw_counters_value[hartid][ctr_idx - num_hw_ctrs], fw_counters_data[hartid][ctr_idx - num_hw_ctrs],
true); true);
if (ret) if (ret)
return ret; return ret;
@@ -743,7 +747,7 @@ int sbi_pmu_ctr_incr_fw(enum sbi_pmu_fw_event_code_id fw_id)
for (cidx = num_hw_ctrs; cidx < total_ctrs; cidx++) { for (cidx = num_hw_ctrs; cidx < total_ctrs; cidx++) {
if (get_cidx_code(active_events[hartid][cidx]) == fw_id && if (get_cidx_code(active_events[hartid][cidx]) == fw_id &&
(fw_counters_started[hartid] & BIT(cidx - num_hw_ctrs))) { (fw_counters_started[hartid] & BIT(cidx - num_hw_ctrs))) {
fcounter = &fw_counters_value[hartid][cidx - num_hw_ctrs]; fcounter = &fw_counters_data[hartid][cidx - num_hw_ctrs];
break; break;
} }
} }
@@ -803,7 +807,7 @@ static void pmu_reset_event_map(u32 hartid)
for (j = 3; j < total_ctrs; j++) for (j = 3; j < total_ctrs; j++)
active_events[hartid][j] = SBI_PMU_EVENT_IDX_INVALID; active_events[hartid][j] = SBI_PMU_EVENT_IDX_INVALID;
for (j = 0; j < SBI_PMU_FW_CTR_MAX; j++) for (j = 0; j < SBI_PMU_FW_CTR_MAX; j++)
fw_counters_value[hartid][j] = 0; fw_counters_data[hartid][j] = 0;
fw_counters_started[hartid] = 0; fw_counters_started[hartid] = 0;
} }