Skip to contentSkip to conversation

lib: fixes for fdt functions

PATCH New Heinrich Schuchardt 5 participants 22 messages Nov 28, 2022 – Dec 5, 2022

lore
Share & tools
lore
#0 lore raw

v2 cover lib: fixes for fdt functions

* Use correct type for variables used in error checks
* Check correct variables
* Avoid duplicates checks
* Don't assign values that are never used.

v2:
check correct variables
fix fdt_parse_aclint_node() too

Heinrich Schuchardt (6):
lib: simplify fdt_parse_plmt_node()
lib: simplify fdt_parse_plicsw_node()
lib: fix fdt_parse_plmt_node()
lib: fix fdt_parse_plicsw_node()
lib: simplify fdt_translate_address()
lib: fix fdt_parse_aclint_node()

 lib/utils/fdt/fdt_helper.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
Signature · 1 line
2.37.2
#1 lore raw

PATCH v2 1/6 lib: simplify fdt_parse_plmt_node()

We should not check !plmt_base || !plmt_size twice.

---
v2:
Reviewed-by added

---
 lib/utils/fdt/fdt_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/utils/fdt/fdt_helper.c +1 -1
index 89b8bba..dbd7484 100644
@@ -814,7 +814,7 @@ int fdt_parse_plmt_node(void *fdt, int nodeoffset, unsigned long *plmt_base,
 
 	rc = fdt_get_node_addr_size(fdt, nodeoffset, 0,
 				    &reg_addr, &reg_size);
-	if (rc < 0 || !plmt_base || !plmt_size)
+	if (rc < 0)
 		return SBI_ENODEV;
 	*plmt_base = reg_addr;
 	*plmt_size = reg_size;
Signature · 1 line
2.37.2
#3 lore raw

PATCH v2 2/6 lib: simplify fdt_parse_plicsw_node()

In reply to Heinrich Schuchardt

We should not check !plicsw_base || !size twice.

---
v2:
Reviewed-by added

---
 lib/utils/fdt/fdt_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/utils/fdt/fdt_helper.c +1 -1
index dbd7484..87b9fb2 100644
@@ -868,7 +868,7 @@ int fdt_parse_plicsw_node(void *fdt, int nodeoffset, unsigned long *plicsw_base,
 
 	rc = fdt_get_node_addr_size(fdt, nodeoffset, 0,
 				    &reg_addr, &reg_size);
-	if (rc < 0 || !plicsw_base || !size)
+	if (rc < 0)
 		return SBI_ENODEV;
 	*plicsw_base = reg_addr;
 	*size = reg_size;
Signature · 1 line
2.37.2
#5 lore raw

PATCH v2 3/6 lib: fix fdt_parse_plmt_node()

In reply to Heinrich Schuchardt

cpu_offset, cpu_intc_offset must be int to discover failed invocations of fdt_node_offset_by_phandle() or fdt_parent_offset().

After determining cpu_offset we have to check this value and not cpu_intc_offset.

---
v2:
check correct variable

---
 lib/utils/fdt/fdt_helper.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
lib/utils/fdt/fdt_helper.c +4 -2
index 87b9fb2..976c96e 100644
@@ -805,7 +805,7 @@ int fdt_parse_plmt_node(void *fdt, int nodeoffset, unsigned long *plmt_base,
 {
 	const fdt32_t *val;
 	int rc, i, count;
-	uint64_t reg_addr, reg_size, cpu_offset, cpu_intc_offset;
+	uint64_t reg_addr, reg_size;
 	u32 phandle, hwirq, hartid, hcount;
 
 	if (nodeoffset < 0 || !fdt || !plmt_base ||
@@ -826,6 +826,8 @@ int fdt_parse_plmt_node(void *fdt, int nodeoffset, unsigned long *plmt_base,
 
 	hcount = 0;
 	for (i = 0; i < (count / 2); i++) {
+		int cpu_offset, cpu_intc_offset;
+
 		phandle = fdt32_to_cpu(val[2 * i]);
 		hwirq = fdt32_to_cpu(val[2 * i + 1]);
 
@@ -834,7 +836,7 @@ int fdt_parse_plmt_node(void *fdt, int nodeoffset, unsigned long *plmt_base,
 			continue;
 
 		cpu_offset = fdt_parent_offset(fdt, cpu_intc_offset);
-		if (cpu_intc_offset < 0)
+		if (cpu_offset < 0)
 			continue;
 
 		rc = fdt_parse_hart_id(fdt, cpu_offset, &hartid);
Signature · 1 line
2.37.2
#6 lore raw

PATCH v2 3/6 lib: fix fdt_parse_plmt_node()

? 2022-11-28???? 10:14 +0100?Heinrich Schuchardt???

Quoted 7 lines

cpu_offset, cpu_intc_offset must be int to discover failed invocations of fdt_node_offset_by_phandle() or fdt_parent_offset().

After determining cpu_offset we have to check this value and not cpu_intc_offset.

Look good to me

Quoted 38 lines

---
v2:
????????check correct variable
---
?lib/utils/fdt/fdt_helper.c | 6 ++++--
?1 file changed, 4 insertions(+), 2 deletions(-)

lib/utils/fdt/fdt_helper.c +1 -1
index 87b9fb2..976c96e 100644
@@ -805,7 +805,7 @@ int fdt_parse_plmt_node(void *fdt, int nodeoffset, unsigned long *plmt_base,
 ?{
 ????????const fdt32_t *val;
 ????????int rc, i, count;
-???????uint64_t reg_addr, reg_size, cpu_offset, cpu_intc_offset;
+???????uint64_t reg_addr, reg_size;
 ????????u32 phandle, hwirq, hartid, hcount;

?
????????if (nodeoffset < 0 || !fdt || !plmt_base ||

lib/utils/fdt/fdt_helper.c +0 -0
@@ -826,6 +826,8 @@ int fdt_parse_plmt_node(void *fdt, int nodeoffset, unsigned long *plmt_base,

?
????????hcount = 0;
????????for (i = 0; i < (count / 2); i++) { +???????????????int cpu_offset, cpu_intc_offset; +
????????????????phandle = fdt32_to_cpu(val[2 * i]); ????????????????hwirq = fdt32_to_cpu(val[2 * i + 1]); ?

lib/utils/fdt/fdt_helper.c +0 -0
@@ -834,7 +836,7 @@ int fdt_parse_plmt_node(void *fdt, int nodeoffset, unsigned long *plmt_base,
 ????????????????????????continue;

?
????????????????cpu_offset = fdt_parent_offset(fdt, cpu_intc_offset); -???????????????if (cpu_intc_offset < 0) +???????????????if (cpu_offset < 0) ????????????????????????continue;
?
????????????????rc = fdt_parse_hart_id(fdt, cpu_offset, &hartid);

#7 lore raw

PATCH v2 3/6 lib: fix fdt_parse_plmt_node()

In reply to Heinrich Schuchardt

? 2022-11-28???? 10:14 +0100?Heinrich Schuchardt???

Quoted 7 lines

cpu_offset, cpu_intc_offset must be int to discover failed invocations of fdt_node_offset_by_phandle() or fdt_parent_offset().

After determining cpu_offset we have to check this value and not cpu_intc_offset.

Look good to me

Quoted 42 lines

---
v2:
????????check correct variable
---
?lib/utils/fdt/fdt_helper.c | 6 ++++--
?1 file changed, 4 insertions(+), 2 deletions(-)

lib/utils/fdt/fdt_helper.c +1 -1
index 87b9fb2..976c96e 100644
@@ -805,7 +805,7 @@ int fdt_parse_plmt_node(void *fdt, int nodeoffset, unsigned long *plmt_base,
 ?{
 ????????const fdt32_t *val;
 ????????int rc, i, count;
-???????uint64_t reg_addr, reg_size, cpu_offset, cpu_intc_offset;
+???????uint64_t reg_addr, reg_size;
 ????????u32 phandle, hwirq, hartid, hcount;

?
????????if (nodeoffset < 0 || !fdt || !plmt_base ||

lib/utils/fdt/fdt_helper.c +0 -0
@@ -826,6 +826,8 @@ int fdt_parse_plmt_node(void *fdt, int nodeoffset, unsigned long *plmt_base,

?
????????hcount = 0;
????????for (i = 0; i < (count / 2); i++) { +???????????????int cpu_offset, cpu_intc_offset; +
????????????????phandle = fdt32_to_cpu(val[2 * i]); ????????????????hwirq = fdt32_to_cpu(val[2 * i + 1]); ?

lib/utils/fdt/fdt_helper.c +0 -0
@@ -834,7 +836,7 @@ int fdt_parse_plmt_node(void *fdt, int nodeoffset, unsigned long *plmt_base,
 ????????????????????????continue;

?
????????????????cpu_offset = fdt_parent_offset(fdt, cpu_intc_offset); -???????????????if (cpu_intc_offset < 0) +???????????????if (cpu_offset < 0) ????????????????????????continue;
?
????????????????rc = fdt_parse_hart_id(fdt, cpu_offset, &hartid);

Signature · 1 line
2.37.2
#9 lore raw

PATCH v2 3/6 lib: fix fdt_parse_plmt_node()

In reply to Heinrich Schuchardt
Quoted 7 lines · Heinrich Schuchardt

cpu_offset, cpu_intc_offset must be int to discover failed invocations of fdt_node_offset_by_phandle() or fdt_parent_offset().

After determining cpu_offset we have to check this value and not cpu_intc_offset.

Quoted 8 lines

---
v2:
check correct variable

---
 lib/utils/fdt/fdt_helper.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
#10 lore raw

PATCH v2 4/6 lib: fix fdt_parse_plicsw_node()

In reply to Heinrich Schuchardt

cpu_offset and cpu_intc_offset must be int to detect failed invocations of fdt_node_offset_by_phandle() or fdt_parent_offset().

After determining cpu_offset we have to check this value and not cpu_intc_offset.

---
v2:
check correct variable

---
 lib/utils/fdt/fdt_helper.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
lib/utils/fdt/fdt_helper.c +4 -2
index 976c96e..674f17b 100644
@@ -861,7 +861,7 @@ int fdt_parse_plicsw_node(void *fdt, int nodeoffset, unsigned long *plicsw_base,
 {
 	const fdt32_t *val;
 	int rc, i, count;
-	uint64_t reg_addr, reg_size, cpu_offset, cpu_intc_offset;
+	uint64_t reg_addr, reg_size;
 	u32 phandle, hwirq, hartid, hcount;
 
 	if (nodeoffset < 0 || !fdt || !plicsw_base ||
@@ -882,6 +882,8 @@ int fdt_parse_plicsw_node(void *fdt, int nodeoffset, unsigned long *plicsw_base,
 
 	hcount = 0;
 	for (i = 0; i < (count / 2); i++) {
+		int cpu_offset, cpu_intc_offset;
+
 		phandle = fdt32_to_cpu(val[2 * i]);
 		hwirq = fdt32_to_cpu(val[2 * i + 1]);
 
@@ -890,7 +892,7 @@ int fdt_parse_plicsw_node(void *fdt, int nodeoffset, unsigned long *plicsw_base,
 			continue;
 
 		cpu_offset = fdt_parent_offset(fdt, cpu_intc_offset);
-		if (cpu_intc_offset < 0)
+		if (cpu_offset < 0)
 			continue;
 
 		rc = fdt_parse_hart_id(fdt, cpu_offset, &hartid);
Signature · 1 line
2.37.2
#11 lore raw

PATCH v2 4/6 lib: fix fdt_parse_plicsw_node()

? 2022-11-28???? 10:14 +0100?Heinrich Schuchardt???

Quoted 7 lines

cpu_offset and cpu_intc_offset must be int to detect failed invocations of fdt_node_offset_by_phandle() or fdt_parent_offset().

After determining cpu_offset we have to check this value and not cpu_intc_offset.

Look good to me

Quoted 38 lines

---
v2:
????????check correct variable
---
?lib/utils/fdt/fdt_helper.c | 6 ++++--
?1 file changed, 4 insertions(+), 2 deletions(-)

lib/utils/fdt/fdt_helper.c +1 -1
index 976c96e..674f17b 100644
@@ -861,7 +861,7 @@ int fdt_parse_plicsw_node(void *fdt, int nodeoffset, unsigned long *plicsw_base,
 ?{
 ????????const fdt32_t *val;
 ????????int rc, i, count;
-???????uint64_t reg_addr, reg_size, cpu_offset, cpu_intc_offset;
+???????uint64_t reg_addr, reg_size;
 ????????u32 phandle, hwirq, hartid, hcount;

?
????????if (nodeoffset < 0 || !fdt || !plicsw_base ||

lib/utils/fdt/fdt_helper.c +0 -0
@@ -882,6 +882,8 @@ int fdt_parse_plicsw_node(void *fdt, int nodeoffset, unsigned long *plicsw_base,

?
????????hcount = 0;
????????for (i = 0; i < (count / 2); i++) { +???????????????int cpu_offset, cpu_intc_offset; +
????????????????phandle = fdt32_to_cpu(val[2 * i]); ????????????????hwirq = fdt32_to_cpu(val[2 * i + 1]); ?

lib/utils/fdt/fdt_helper.c +0 -0
@@ -890,7 +892,7 @@ int fdt_parse_plicsw_node(void *fdt, int nodeoffset, unsigned long *plicsw_base,
 ????????????????????????continue;

?
????????????????cpu_offset = fdt_parent_offset(fdt, cpu_intc_offset); -???????????????if (cpu_intc_offset < 0) +???????????????if (cpu_offset < 0) ????????????????????????continue;
?
????????????????rc = fdt_parse_hart_id(fdt, cpu_offset, &hartid);

#12 lore raw

PATCH v2 4/6 lib: fix fdt_parse_plicsw_node()

In reply to Heinrich Schuchardt

? 2022-11-28???? 10:14 +0100?Heinrich Schuchardt???

Quoted 7 lines

cpu_offset and cpu_intc_offset must be int to detect failed invocations of fdt_node_offset_by_phandle() or fdt_parent_offset().

After determining cpu_offset we have to check this value and not cpu_intc_offset.

Look good to me

Quoted 42 lines

---
v2:
????????check correct variable
---
?lib/utils/fdt/fdt_helper.c | 6 ++++--
?1 file changed, 4 insertions(+), 2 deletions(-)

lib/utils/fdt/fdt_helper.c +1 -1
index 976c96e..674f17b 100644
@@ -861,7 +861,7 @@ int fdt_parse_plicsw_node(void *fdt, int nodeoffset, unsigned long *plicsw_base,
 ?{
 ????????const fdt32_t *val;
 ????????int rc, i, count;
-???????uint64_t reg_addr, reg_size, cpu_offset, cpu_intc_offset;
+???????uint64_t reg_addr, reg_size;
 ????????u32 phandle, hwirq, hartid, hcount;

?
????????if (nodeoffset < 0 || !fdt || !plicsw_base ||

lib/utils/fdt/fdt_helper.c +0 -0
@@ -882,6 +882,8 @@ int fdt_parse_plicsw_node(void *fdt, int nodeoffset, unsigned long *plicsw_base,

?
????????hcount = 0;
????????for (i = 0; i < (count / 2); i++) { +???????????????int cpu_offset, cpu_intc_offset; +
????????????????phandle = fdt32_to_cpu(val[2 * i]); ????????????????hwirq = fdt32_to_cpu(val[2 * i + 1]); ?

lib/utils/fdt/fdt_helper.c +0 -0
@@ -890,7 +892,7 @@ int fdt_parse_plicsw_node(void *fdt, int nodeoffset, unsigned long *plicsw_base,
 ????????????????????????continue;

?
????????????????cpu_offset = fdt_parent_offset(fdt, cpu_intc_offset); -???????????????if (cpu_intc_offset < 0) +???????????????if (cpu_offset < 0) ????????????????????????continue;
?
????????????????rc = fdt_parse_hart_id(fdt, cpu_offset, &hartid);

Signature · 1 line
2.37.2
#14 lore raw

PATCH v2 4/6 lib: fix fdt_parse_plicsw_node()

In reply to Heinrich Schuchardt
Quoted 7 lines · Heinrich Schuchardt

cpu_offset and cpu_intc_offset must be int to detect failed invocations of fdt_node_offset_by_phandle() or fdt_parent_offset().

After determining cpu_offset we have to check this value and not cpu_intc_offset.

Quoted 8 lines

---
v2:
check correct variable

---
 lib/utils/fdt/fdt_helper.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
#15 lore raw

PATCH v2 5/6 lib: simplify fdt_translate_address()

In reply to Heinrich Schuchardt

Don't assign a value to offset which is never used.

---
v2:
Reviewed-by added

---
 lib/utils/fdt/fdt_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/utils/fdt/fdt_helper.c +1 -1
index 674f17b..43d7857 100644
@@ -124,7 +124,7 @@ static int fdt_translate_address(void *fdt, uint64_t reg, int parent,
 	int i, rlen;
 	int cell_addr, cell_size;
 	const fdt32_t *ranges;
-	uint64_t offset = 0, caddr = 0, paddr = 0, rsize = 0;
+	uint64_t offset, caddr = 0, paddr = 0, rsize = 0;
 
 	cell_addr = fdt_address_cells(fdt, parent);
 	if (cell_addr < 1)
Signature · 1 line
2.37.2
#17 lore raw

PATCH v2 6/6 lib: fix fdt_parse_aclint_node()

In reply to Heinrich Schuchardt

After determining cpu_offset we have to check this variable and not cpu_intc_offset.

---
v2:
new patch

---
 lib/utils/fdt/fdt_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/utils/fdt/fdt_helper.c +1 -1
index 43d7857..d4b38dc 100644
@@ -772,7 +772,7 @@ int fdt_parse_aclint_node(void *fdt, int nodeoffset, bool for_timer,
 			continue;
 
 		cpu_offset = fdt_parent_offset(fdt, cpu_intc_offset);
-		if (cpu_intc_offset < 0)
+		if (cpu_offset < 0)
 			continue;
 
 		rc = fdt_parse_hart_id(fdt, cpu_offset, &hartid);
Signature · 1 line
2.37.2
#18 lore raw

PATCH v2 6/6 lib: fix fdt_parse_aclint_node()

? 2022-11-28???? 10:14 +0100?Heinrich Schuchardt???

Quoted 4 lines

After determining cpu_offset we have to check this variable and not cpu_intc_offset.

Look good to me

Quoted 20 lines

---
v2:
????????new patch
---
?lib/utils/fdt/fdt_helper.c | 2 +-
?1 file changed, 1 insertion(+), 1 deletion(-)

lib/utils/fdt/fdt_helper.c +0 -0
index 43d7857..d4b38dc 100644
@@ -772,7 +772,7 @@ int fdt_parse_aclint_node(void *fdt, int nodeoffset, bool for_timer,
 ????????????????????????continue;

?
????????????????cpu_offset = fdt_parent_offset(fdt, cpu_intc_offset); -???????????????if (cpu_intc_offset < 0) +???????????????if (cpu_offset < 0) ????????????????????????continue;
?
????????????????rc = fdt_parse_hart_id(fdt, cpu_offset, &hartid);

#19 lore raw

PATCH v2 6/6 lib: fix fdt_parse_aclint_node()

In reply to Heinrich Schuchardt

? 2022-11-28???? 10:14 +0100?Heinrich Schuchardt???

Quoted 4 lines

After determining cpu_offset we have to check this variable and not cpu_intc_offset.

Look good to me

Quoted 24 lines

---
v2:
????????new patch
---
?lib/utils/fdt/fdt_helper.c | 2 +-
?1 file changed, 1 insertion(+), 1 deletion(-)

lib/utils/fdt/fdt_helper.c +0 -0
index 43d7857..d4b38dc 100644
@@ -772,7 +772,7 @@ int fdt_parse_aclint_node(void *fdt, int nodeoffset, bool for_timer,
 ????????????????????????continue;

?
????????????????cpu_offset = fdt_parent_offset(fdt, cpu_intc_offset); -???????????????if (cpu_intc_offset < 0) +???????????????if (cpu_offset < 0) ????????????????????????continue;
?
????????????????rc = fdt_parse_hart_id(fdt, cpu_offset, &hartid);

Signature · 1 line
2.37.2
Applied
#21 lore raw

v2 cover lib: fixes for fdt functions

In reply to Heinrich Schuchardt

Hi Heinrich,

Quoted 10 lines · Heinrich Schuchardt

* Use correct type for variables used in error checks
* Check correct variables
* Avoid duplicates checks
* Don't assign values that are never used.

v2:
check correct variables
fix fdt_parse_aclint_node() too

Quoted 7 lines

Heinrich Schuchardt (6):
lib: simplify fdt_parse_plmt_node()
lib: simplify fdt_parse_plicsw_node()
lib: fix fdt_parse_plmt_node()
lib: fix fdt_parse_plicsw_node()
lib: simplify fdt_translate_address()
lib: fix fdt_parse_aclint_node()

Thanks for catching and fixing all these issues.

Applied this series to the riscv/opensbi repo.

Regards,
Anup

Quoted 7 lines
 lib/utils/fdt/fdt_helper.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

--
2.37.2