lib: utils/fdt: Fix DT parsing in fdt_pmu_setup()
PATCH 1/1 lib: utils/fdt: Fix DT parsing in fdt_pmu_setup()
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.
--- lib/utils/fdt/fdt_pmu.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
lib/utils/fdt/fdt_pmu.c +11 -6
@@ -77,18 +77,21 @@ int fdt_pmu_setup(void *fdt) event_ctr_map =fdt_getprop (fdt, pmu_offset,"riscv,event-to-mhpmcounters" , &len);if (!event_ctr_map || len <8 ) -return SBI_EFAIL ; + goto skip_event_to_mhpmcounters; 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); + result =sbi_pmu_add_hw_event_counter_map (event_idx_start, event_idx_end, ctr_map); +if (result) +return result; } +skip_event_to_mhpmcounters: event_val =fdt_getprop (fdt, pmu_offset,"riscv,event-to-mhpmevent" , &len);if (!event_val || len <8 ) -return SBI_EFAIL ; + goto skip_event_to_mhpmevent; len = len / (sizeof (u32) *3 );for (i =0 ; i < len; i++) { event = &fdt_pmu_evt_select[hw_event_count];
@@ -97,10 +100,11 @@ int fdt_pmu_setup(void *fdt) event->select = (event->select <<32 ) |fdt32_to_cpu (event_val[3 * i +2 ]); hw_event_count++; } +skip_event_to_mhpmevent: event_val =fdt_getprop (fdt, pmu_offset,"riscv,raw-event-to-mhpmcounters" , &len);if (!event_val || len <20 ) -return SBI_EFAIL ; + goto skip_raw_event_to_mhpmcounters; len = len / (sizeof (u32) *5 );for (i =0 ; i < len; i++) { raw_selector =fdt32_to_cpu (event_val[5 * i]);
@@ -109,9 +113,10 @@ int fdt_pmu_setup(void *fdt) 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++; +if (result) +return result; } +skip_raw_event_to_mhpmcounters:return 0 ; }
Signature · 1 line
2.34.1
PATCH 1/1 lib: utils/fdt: Fix DT parsing in fdt_pmu_setup()
Quoted 68 lines · Anup Patel
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 ifsbi_pmu_add_hw_event_counter_map()fails.
3) Return failure ifsbi_pmu_add_raw_event_counter_map()fails.Signed-off-by Anup Patel <[email protected]>--- lib/utils/fdt/fdt_pmu.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)lib/utils/fdt/fdt_pmu.c +11
-6@@ -77,18 +77,21 @@ int fdt_pmu_setup(void *fdt) event_ctr_map =fdt_getprop (fdt, pmu_offset,"riscv,event-to-mhpmcounters" , &len);if (!event_ctr_map || len <8 ) -return SBI_EFAIL ; + goto skip_event_to_mhpmcounters; 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); + result =sbi_pmu_add_hw_event_counter_map (event_idx_start, event_idx_end, ctr_map); +if (result) +return result; } +skip_event_to_mhpmcounters: event_val =fdt_getprop (fdt, pmu_offset,"riscv,event-to-mhpmevent" , &len);if (!event_val || len <8 ) -return SBI_EFAIL ; + goto skip_event_to_mhpmevent; len = len / (sizeof (u32) *3 );for (i =0 ; i < len; i++) { event = &fdt_pmu_evt_select[hw_event_count];@@ -97,10 +100,11 @@ int fdt_pmu_setup(void *fdt) event->select = (event->select <<32 ) |fdt32_to_cpu (event_val[3 * i +2 ]); hw_event_count++; } +skip_event_to_mhpmevent: event_val =fdt_getprop (fdt, pmu_offset,"riscv,raw-event-to-mhpmcounters" , &len);if (!event_val || len <20 ) -return SBI_EFAIL ; + goto skip_raw_event_to_mhpmcounters; len = len / (sizeof (u32) *5 );for (i =0 ; i < len; i++) { raw_selector =fdt32_to_cpu (event_val[5 * i]);@@ -109,9 +113,10 @@ int fdt_pmu_setup(void *fdt) 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++; +if (result) +return result; } +skip_raw_event_to_mhpmcounters:return 0 ; }Signature · 1 line
2.34.1
I think I'd prefer putting the for-loops into if-blocks to the gotos, but otherwise
PATCH 1/1 lib: utils/fdt: Fix DT parsing in fdt_pmu_setup()
Quoted 66 lines · Andrew Jones
Quoted 64 lines · Anup Patel
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 ifsbi_pmu_add_hw_event_counter_map()fails.
3) Return failure ifsbi_pmu_add_raw_event_counter_map()fails.Signed-off-by Anup Patel <[email protected]>--- lib/utils/fdt/fdt_pmu.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)lib/utils/fdt/fdt_pmu.c +11
-6@@ -77,18 +77,21 @@ int fdt_pmu_setup(void *fdt) event_ctr_map =fdt_getprop (fdt, pmu_offset,"riscv,event-to-mhpmcounters" , &len);if (!event_ctr_map || len <8 ) -return SBI_EFAIL ; + goto skip_event_to_mhpmcounters; 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); + result =sbi_pmu_add_hw_event_counter_map (event_idx_start, event_idx_end, ctr_map); +if (result) +return result; } +skip_event_to_mhpmcounters: event_val =fdt_getprop (fdt, pmu_offset,"riscv,event-to-mhpmevent" , &len);if (!event_val || len <8 ) -return SBI_EFAIL ; + goto skip_event_to_mhpmevent; len = len / (sizeof (u32) *3 );for (i =0 ; i < len; i++) { event = &fdt_pmu_evt_select[hw_event_count];@@ -97,10 +100,11 @@ int fdt_pmu_setup(void *fdt) event->select = (event->select <<32 ) |fdt32_to_cpu (event_val[3 * i +2 ]); hw_event_count++; } +skip_event_to_mhpmevent: event_val =fdt_getprop (fdt, pmu_offset,"riscv,raw-event-to-mhpmcounters" , &len);if (!event_val || len <20 ) -return SBI_EFAIL ; + goto skip_raw_event_to_mhpmcounters; len = len / (sizeof (u32) *5 );for (i =0 ; i < len; i++) { raw_selector =fdt32_to_cpu (event_val[5 * i]);@@ -109,9 +113,10 @@ int fdt_pmu_setup(void *fdt) 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++; +if (result) +return result; } +skip_raw_event_to_mhpmcounters:
Quoted 7 lines
Quoted 4 lines
lib/utils/fdt/fdt_pmu.c +0
-1return 0 ; } --2.34.1
I think I'd prefer putting the for-loops into if-blocks to the gotos, but otherwise
Okay, I will put for-loops under if-blocks in the next revision.
Quoted 2 lines
Reviewed-by Andrew Jones <[email protected]>
Regards,
Anup