* [PATCH v2] lib: utils/fdt: Fix DT parsing in fdt_pmu_setup()
@ 2022-09-13 9:10 Anup Patel
2022-09-13 11:52 ` Anup Patel
0 siblings, 1 reply; 2+ messages in thread
From: Anup Patel @ 2022-09-13 9:10 UTC (permalink / raw)
To: opensbi
This patch does following fixes in fdt_pmu_setup():
1) If any of the event mapping DT property is absent or too small
then don't skip parsing of other DT properties.
2) Return failure if sbi_pmu_add_hw_event_counter_map() fails.
3) Return failure if sbi_pmu_add_raw_event_counter_map() fails.
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
---
Changes since v1:
- Don't use goto statments
---
lib/utils/fdt/fdt_pmu.c | 74 +++++++++++++++++++++++------------------
1 file changed, 42 insertions(+), 32 deletions(-)
diff --git a/lib/utils/fdt/fdt_pmu.c b/lib/utils/fdt/fdt_pmu.c
index 8ba6b08..4829f21 100644
--- a/lib/utils/fdt/fdt_pmu.c
+++ b/lib/utils/fdt/fdt_pmu.c
@@ -75,42 +75,52 @@ int fdt_pmu_setup(void *fdt)
if (pmu_offset < 0)
return SBI_EFAIL;
- event_ctr_map = fdt_getprop(fdt, pmu_offset, "riscv,event-to-mhpmcounters", &len);
- if (!event_ctr_map || len < 8)
- return SBI_EFAIL;
- len = len / (sizeof(u32) * 3);
- for (i = 0; i < len; i++) {
- event_idx_start = fdt32_to_cpu(event_ctr_map[3 * i]);
- event_idx_end = fdt32_to_cpu(event_ctr_map[3 * i + 1]);
- ctr_map = fdt32_to_cpu(event_ctr_map[3 * i + 2]);
- sbi_pmu_add_hw_event_counter_map(event_idx_start, event_idx_end, ctr_map);
+ event_ctr_map = fdt_getprop(fdt, pmu_offset,
+ "riscv,event-to-mhpmcounters", &len);
+ if (event_ctr_map && len >= 8) {
+ len = len / (sizeof(u32) * 3);
+ for (i = 0; i < len; i++) {
+ event_idx_start = fdt32_to_cpu(event_ctr_map[3 * i]);
+ event_idx_end = fdt32_to_cpu(event_ctr_map[3 * i + 1]);
+ ctr_map = fdt32_to_cpu(event_ctr_map[3 * i + 2]);
+ result = sbi_pmu_add_hw_event_counter_map(
+ event_idx_start, event_idx_end, ctr_map);
+ if (result)
+ return result;
+ }
}
- event_val = fdt_getprop(fdt, pmu_offset, "riscv,event-to-mhpmevent", &len);
- if (!event_val || len < 8)
- return SBI_EFAIL;
- len = len / (sizeof(u32) * 3);
- for (i = 0; i < len; i++) {
- event = &fdt_pmu_evt_select[hw_event_count];
- event->eidx = fdt32_to_cpu(event_val[3 * i]);
- event->select = fdt32_to_cpu(event_val[3 * i + 1]);
- event->select = (event->select << 32) | fdt32_to_cpu(event_val[3 * i + 2]);
- hw_event_count++;
+ event_val = fdt_getprop(fdt, pmu_offset,
+ "riscv,event-to-mhpmevent", &len);
+ if (event_val && len >= 8) {
+ len = len / (sizeof(u32) * 3);
+ for (i = 0; i < len; i++) {
+ event = &fdt_pmu_evt_select[hw_event_count];
+ event->eidx = fdt32_to_cpu(event_val[3 * i]);
+ event->select = fdt32_to_cpu(event_val[3 * i + 1]);
+ event->select = (event->select << 32) |
+ fdt32_to_cpu(event_val[3 * i + 2]);
+ hw_event_count++;
+ }
}
- event_val = fdt_getprop(fdt, pmu_offset, "riscv,raw-event-to-mhpmcounters", &len);
- if (!event_val || len < 20)
- return SBI_EFAIL;
- len = len / (sizeof(u32) * 5);
- for (i = 0; i < len; i++) {
- raw_selector = fdt32_to_cpu(event_val[5 * i]);
- raw_selector = (raw_selector << 32) | fdt32_to_cpu(event_val[5 * i + 1]);
- select_mask = fdt32_to_cpu(event_val[5 * i + 2]);
- select_mask = (select_mask << 32) | fdt32_to_cpu(event_val[5 * i + 3]);
- ctr_map = fdt32_to_cpu(event_val[5 * i + 4]);
- result = sbi_pmu_add_raw_event_counter_map(raw_selector, select_mask, ctr_map);
- if (!result)
- hw_event_count++;
+ event_val = fdt_getprop(fdt, pmu_offset,
+ "riscv,raw-event-to-mhpmcounters", &len);
+ if (event_val && len >= 20) {
+ len = len / (sizeof(u32) * 5);
+ for (i = 0; i < len; i++) {
+ raw_selector = fdt32_to_cpu(event_val[5 * i]);
+ raw_selector = (raw_selector << 32) |
+ fdt32_to_cpu(event_val[5 * i + 1]);
+ select_mask = fdt32_to_cpu(event_val[5 * i + 2]);
+ select_mask = (select_mask << 32) |
+ fdt32_to_cpu(event_val[5 * i + 3]);
+ ctr_map = fdt32_to_cpu(event_val[5 * i + 4]);
+ result = sbi_pmu_add_raw_event_counter_map(
+ raw_selector, select_mask, ctr_map);
+ if (result)
+ return result;
+ }
}
return 0;
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v2] lib: utils/fdt: Fix DT parsing in fdt_pmu_setup()
2022-09-13 9:10 [PATCH v2] lib: utils/fdt: Fix DT parsing in fdt_pmu_setup() Anup Patel
@ 2022-09-13 11:52 ` Anup Patel
0 siblings, 0 replies; 2+ messages in thread
From: Anup Patel @ 2022-09-13 11:52 UTC (permalink / raw)
To: opensbi
On Tue, Sep 13, 2022 at 2:41 PM Anup Patel <apatel@ventanamicro.com> wrote:
>
> This patch does following fixes in fdt_pmu_setup():
> 1) If any of the event mapping DT property is absent or too small
> then don't skip parsing of other DT properties.
> 2) Return failure if sbi_pmu_add_hw_event_counter_map() fails.
> 3) Return failure if sbi_pmu_add_raw_event_counter_map() fails.
>
> Signed-off-by: Anup Patel <apatel@ventanamicro.com>
> Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
> Reviewed-by: Atish Patra <atishp@rivosinc.com>
Applied this patch to the riscv/opensbi repo.
Thanks,
Anup
> ---
> Changes since v1:
> - Don't use goto statments
> ---
> lib/utils/fdt/fdt_pmu.c | 74 +++++++++++++++++++++++------------------
> 1 file changed, 42 insertions(+), 32 deletions(-)
>
> diff --git a/lib/utils/fdt/fdt_pmu.c b/lib/utils/fdt/fdt_pmu.c
> index 8ba6b08..4829f21 100644
> --- a/lib/utils/fdt/fdt_pmu.c
> +++ b/lib/utils/fdt/fdt_pmu.c
> @@ -75,42 +75,52 @@ int fdt_pmu_setup(void *fdt)
> if (pmu_offset < 0)
> return SBI_EFAIL;
>
> - event_ctr_map = fdt_getprop(fdt, pmu_offset, "riscv,event-to-mhpmcounters", &len);
> - if (!event_ctr_map || len < 8)
> - return SBI_EFAIL;
> - len = len / (sizeof(u32) * 3);
> - for (i = 0; i < len; i++) {
> - event_idx_start = fdt32_to_cpu(event_ctr_map[3 * i]);
> - event_idx_end = fdt32_to_cpu(event_ctr_map[3 * i + 1]);
> - ctr_map = fdt32_to_cpu(event_ctr_map[3 * i + 2]);
> - sbi_pmu_add_hw_event_counter_map(event_idx_start, event_idx_end, ctr_map);
> + event_ctr_map = fdt_getprop(fdt, pmu_offset,
> + "riscv,event-to-mhpmcounters", &len);
> + if (event_ctr_map && len >= 8) {
> + len = len / (sizeof(u32) * 3);
> + for (i = 0; i < len; i++) {
> + event_idx_start = fdt32_to_cpu(event_ctr_map[3 * i]);
> + event_idx_end = fdt32_to_cpu(event_ctr_map[3 * i + 1]);
> + ctr_map = fdt32_to_cpu(event_ctr_map[3 * i + 2]);
> + result = sbi_pmu_add_hw_event_counter_map(
> + event_idx_start, event_idx_end, ctr_map);
> + if (result)
> + return result;
> + }
> }
>
> - event_val = fdt_getprop(fdt, pmu_offset, "riscv,event-to-mhpmevent", &len);
> - if (!event_val || len < 8)
> - return SBI_EFAIL;
> - len = len / (sizeof(u32) * 3);
> - for (i = 0; i < len; i++) {
> - event = &fdt_pmu_evt_select[hw_event_count];
> - event->eidx = fdt32_to_cpu(event_val[3 * i]);
> - event->select = fdt32_to_cpu(event_val[3 * i + 1]);
> - event->select = (event->select << 32) | fdt32_to_cpu(event_val[3 * i + 2]);
> - hw_event_count++;
> + event_val = fdt_getprop(fdt, pmu_offset,
> + "riscv,event-to-mhpmevent", &len);
> + if (event_val && len >= 8) {
> + len = len / (sizeof(u32) * 3);
> + for (i = 0; i < len; i++) {
> + event = &fdt_pmu_evt_select[hw_event_count];
> + event->eidx = fdt32_to_cpu(event_val[3 * i]);
> + event->select = fdt32_to_cpu(event_val[3 * i + 1]);
> + event->select = (event->select << 32) |
> + fdt32_to_cpu(event_val[3 * i + 2]);
> + hw_event_count++;
> + }
> }
>
> - event_val = fdt_getprop(fdt, pmu_offset, "riscv,raw-event-to-mhpmcounters", &len);
> - if (!event_val || len < 20)
> - return SBI_EFAIL;
> - len = len / (sizeof(u32) * 5);
> - for (i = 0; i < len; i++) {
> - raw_selector = fdt32_to_cpu(event_val[5 * i]);
> - raw_selector = (raw_selector << 32) | fdt32_to_cpu(event_val[5 * i + 1]);
> - select_mask = fdt32_to_cpu(event_val[5 * i + 2]);
> - select_mask = (select_mask << 32) | fdt32_to_cpu(event_val[5 * i + 3]);
> - ctr_map = fdt32_to_cpu(event_val[5 * i + 4]);
> - result = sbi_pmu_add_raw_event_counter_map(raw_selector, select_mask, ctr_map);
> - if (!result)
> - hw_event_count++;
> + event_val = fdt_getprop(fdt, pmu_offset,
> + "riscv,raw-event-to-mhpmcounters", &len);
> + if (event_val && len >= 20) {
> + len = len / (sizeof(u32) * 5);
> + for (i = 0; i < len; i++) {
> + raw_selector = fdt32_to_cpu(event_val[5 * i]);
> + raw_selector = (raw_selector << 32) |
> + fdt32_to_cpu(event_val[5 * i + 1]);
> + select_mask = fdt32_to_cpu(event_val[5 * i + 2]);
> + select_mask = (select_mask << 32) |
> + fdt32_to_cpu(event_val[5 * i + 3]);
> + ctr_map = fdt32_to_cpu(event_val[5 * i + 4]);
> + result = sbi_pmu_add_raw_event_counter_map(
> + raw_selector, select_mask, ctr_map);
> + if (result)
> + return result;
> + }
> }
>
> return 0;
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-13 11:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-13 9:10 [PATCH v2] lib: utils/fdt: Fix DT parsing in fdt_pmu_setup() Anup Patel
2022-09-13 11:52 ` Anup Patel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox