fdtdec: Fix the types of addr and size in fdtdec_add_reserved_memory()
PATCH v2 1/5 fdtdec: Fix the types of addr and size in fdtdec_add_reserved_memory()
From: Bin Meng <[email protected]>
fdtdec_get_addr_size() expects size is of type 'fdt_size_t', and return value is of type 'fdt_addr_t'. Adjust their types accordingly.
---
(no changes since v1)
lib/fdtdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/fdtdec.c +2 -1
@@ -1294,7 +1294,8 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename,/* find a matching node and return the phandle to that */ fdt_for_each_subnode (node, blob, parent) {const char *name =fdt_get_name (blob, node,NULL ); -phys_addr_t addr, size; +fdt_addr_t addr; +fdt_size_t size; addr =fdtdec_get_addr_size (blob, node,"reg" , &size);if (addr ==FDT_ADDR_T_NONE ) {
Signature · 1 line
2.7.4
PATCH v2 2/5 fdtdec: Honor #address-cells and #size-cells in fdtdec_add_reserved_memory()
From: Bin Meng <[email protected]>
At present fdtdec_add_reserved_memory() calls fdtdec_get_addr_size() to get address and size for the subnodes of /reserved-memory node.
We should honor #address-cells and #size-cells properties in the parent node.
---
(no changes since v1)
lib/fdtdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/fdtdec.c +2 -1
@@ -1297,7 +1297,8 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename,fdt_addr_t addr;fdt_size_t size; - addr =fdtdec_get_addr_size (blob, node,"reg" , &size); + addr =fdtdec_get_addr_size_fixed (blob, node,"reg" ,0 , na, ns, + &size, false);if (addr ==FDT_ADDR_T_NONE ) {debug ("failed to read address/size for %s\n" , name);continue ;
Signature · 1 line
2.7.4
PATCH v2 3/5 test/dm: fdtdec: Add the missing gd declaration
In reply to Bin MengFrom: Bin Meng <[email protected]>
Add DECLARE_GLOBAL_DATA_PTR since it is referenced in the test codes.
---
(no changes since v1)
test/dm/fdtdec.c | 2 ++ 1 file changed, 2 insertions(+)
test/dm/fdtdec.c +2 -0
@@ -9,6 +9,8 @@#include <dm/test.h> #include <test/ut.h> +DECLARE_GLOBAL_DATA_PTR ; +static int dm_test_fdtdec_set_carveout (struct unit_test_state *uts) {struct fdt_memory resv;
Signature · 1 line
2.7.4
PATCH v2 4/5 test/dm: fdtdec: Corect a typo in dm_test_fdtdec_set_carveout()
In reply to Bin MengFrom: Bin Meng <[email protected]>
It should be "writable".
---
(no changes since v1)
test/dm/fdtdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
test/dm/fdtdec.c +1 -1
@@ -22,7 +22,7 @@ static int dm_test_fdtdec_set_carveout(struct unit_test_state *uts) blob =malloc (blob_sz);ut_assertnonnull (blob); -/* Make a writtable copy of the fdt blob */ +/* Make a writable copy of the fdt blob */ ut_assertok (fdt_open_into (gd->fdt_blob, blob, blob_sz)); resv.start =0x1000 ;
Signature · 1 line
2.7.4
PATCH v2 5/5 test/dm: fdtdec: Add tests for fdtdec_add_reserved_memory()
In reply to Bin MengFrom: Bin Meng <[email protected]>
This adds a test case to test the functionality of the fdtdec API fdtdec_add_reserved_memory().
---
(no changes since v1)
test/dm/fdtdec.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+)
test/dm/fdtdec.c +69 -0
@@ -59,3 +59,72 @@ static int dm_test_fdtdec_set_carveout(struct unit_test_state *uts) }DM_TEST (dm_test_fdtdec_set_carveout,DM_TESTF_SCAN_PDATA |DM_TESTF_SCAN_FDT |DM_TESTF_FLAT_TREE ); + +static int dm_test_fdtdec_add_reserved_memory (struct unit_test_state *uts) +{ +struct fdt_memory resv; +fdt_addr_t addr; +fdt_size_t size; +void *blob; +int blob_sz, parent, subnode; +uint32_t phandle, phandle1; + + blob_sz =fdt_totalsize (gd->fdt_blob) +128 ; + blob =malloc (blob_sz); +ut_assertnonnull (blob); + +/* Make a writable copy of the fdt blob */ +ut_assertok (fdt_open_into (gd->fdt_blob, blob, blob_sz)); + +/* Insert a memory region in /reserved-memory node */ + resv.start =0x1000 ; + resv.end =0x1fff ; +ut_assertok (fdtdec_add_reserved_memory (blob,"rsvd_region" , + &resv, &phandle)); + +/* Test /reserve-memory and its subnode should exist */ + parent =fdt_path_offset (blob,"/reserved-memory" ); +ut_assert (parent >0 ); + subnode =fdt_path_offset (blob,"/reserved-memory/rsvd_region" ); +ut_assert (subnode >0 ); + +/* Test reg property of /reserved-memory/rsvd_region node */ + addr =fdtdec_get_addr_size_auto_parent (blob, parent, subnode, +"reg" ,0 , &size, false); +ut_assert (addr == resv.start); +ut_assert (size == resv.end - resv.start +1 ); + +/* Insert another memory region in /reserved-memory node */ + subnode =fdt_path_offset (blob,"/reserved-memory/rsvd_region1" ); +ut_assert (subnode <0 ); + + resv.start =0x2000 ; + resv.end =0x2fff ; +ut_assertok (fdtdec_add_reserved_memory (blob,"rsvd_region1" , + &resv, &phandle1)); + subnode =fdt_path_offset (blob,"/reserved-memory/rsvd_region1" ); +ut_assert (subnode >0 ); + +/* phandles must be different */ +ut_assert (phandle != phandle1); + +/* +* Insert a 3rd memory region with the same addr/size as the 1st one, +* but nodee should not be inserted due to the same addr/size. +*/ + resv.start =0x1000 ; + resv.end =0x1fff ; +ut_assertok (fdtdec_add_reserved_memory (blob,"rsvd_region2" , + &resv, &phandle1)); + subnode =fdt_path_offset (blob,"/reserved-memory/rsvd_region2" ); +ut_assert (subnode <0 ); + +/* phandles must be same as the 1st one */ +ut_assert (phandle == phandle1); + +free (blob); + +return 0 ; +} +DM_TEST (dm_test_fdtdec_add_reserved_memory, +DM_TESTF_SCAN_PDATA |DM_TESTF_SCAN_FDT |DM_TESTF_FLAT_TREE );
Signature · 1 line
2.7.4