diff options
| author | Yu Chien Peter Lin <[email protected]> | 2023-11-30 20:42:00 +0800 |
|---|---|---|
| committer | Anup Patel <[email protected]> | 2023-12-06 17:24:38 +0530 |
| commit | 291403f6f29dd119d94ac99303c94dadcb5496c3 (patch) | |
| tree | fc622d1718cf8b5d2dd9b8ac958711fd1e248616 | |
| parent | bd74931d79e1b81494a22b1ce368c935abbc0d2c (diff) | |
sbi: sbi_pmu: Improve sbi_pmu_init() error handling
This patch makes the following changes:
- As sbi_platform_pmu_init() returns a negative error code on
failure, let sbi_pmu_init() print out the error code with
sbi_dprintf().
- In order to distinguish the SBI_EFAIL error returned by
sbi_pmu_add_*_counter_map(), return SBI_ENOENT to indicate
that fdt_pmu_setup() failed to locate "riscv,pmu" node, and
generic_pmu_init() ignores such case.
Signed-off-by: Yu Chien Peter Lin <[email protected]>
Reviewed-by: Anup Patel <[email protected]>
Reviewed-by: Lad Prabhakar <[email protected]>
Reviewed-by: Atish Patra <[email protected]>
| -rw-r--r-- | lib/sbi/sbi_pmu.c | 6 | ||||
| -rw-r--r-- | lib/utils/fdt/fdt_pmu.c | 2 | ||||
| -rw-r--r-- | platform/generic/platform.c | 8 |
3 files changed, 13 insertions, 3 deletions
diff --git a/lib/sbi/sbi_pmu.c b/lib/sbi/sbi_pmu.c index 185068bb..2ee6e62a 100644 --- a/lib/sbi/sbi_pmu.c +++ b/lib/sbi/sbi_pmu.c @@ -957,6 +957,7 @@ int sbi_pmu_init(struct sbi_scratch *scratch, bool cold_boot) int hpm_count = sbi_fls(sbi_hart_mhpm_mask(scratch)); struct sbi_pmu_hart_state *phs; const struct sbi_platform *plat; + int rc; if (cold_boot) { hw_event_map = sbi_calloc(sizeof(*hw_event_map), @@ -972,7 +973,10 @@ int sbi_pmu_init(struct sbi_scratch *scratch, bool cold_boot) plat = sbi_platform_ptr(scratch); /* Initialize hw pmu events */ - sbi_platform_pmu_init(plat); + rc = sbi_platform_pmu_init(plat); + if (rc) + sbi_dprintf("%s: platform pmu init failed " + "(error %d)\n", __func__, rc); /* mcycle & minstret is available always */ if (!hpm_count) diff --git a/lib/utils/fdt/fdt_pmu.c b/lib/utils/fdt/fdt_pmu.c index 83301bb5..a8d76482 100644 --- a/lib/utils/fdt/fdt_pmu.c +++ b/lib/utils/fdt/fdt_pmu.c @@ -74,7 +74,7 @@ int fdt_pmu_setup(void *fdt) pmu_offset = fdt_node_offset_by_compatible(fdt, -1, "riscv,pmu"); if (pmu_offset < 0) - return SBI_EFAIL; + return SBI_ENOENT; event_ctr_map = fdt_getprop(fdt, pmu_offset, "riscv,event-to-mhpmcounters", &len); diff --git a/platform/generic/platform.c b/platform/generic/platform.c index 85acecd7..fa400b9e 100644 --- a/platform/generic/platform.c +++ b/platform/generic/platform.c @@ -265,7 +265,13 @@ static u32 generic_tlb_num_entries(void) static int generic_pmu_init(void) { - return fdt_pmu_setup(fdt_get_address()); + int rc; + + rc = fdt_pmu_setup(fdt_get_address()); + if (rc && rc != SBI_ENOENT) + return rc; + + return 0; } static uint64_t generic_pmu_xlate_to_mhpmevent(uint32_t event_idx, |