* [PATCH v4 1/3] test/dm: fdtdec: Add the missing gd declaration
@ 2020-06-23 5:55 Bin Meng
2020-06-23 5:55 ` [PATCH v4 2/3] test/dm: fdtdec: Corect a typo in dm_test_fdtdec_set_carveout() Bin Meng
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Bin Meng @ 2020-06-23 5:55 UTC (permalink / raw)
To: u-boot
From: Bin Meng <bin.meng@windriver.com>
Add DECLARE_GLOBAL_DATA_PTR since it is referenced in the test codes.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
Changes in v4:
- drop the first 2 patches that are already applied
- rebase against u-boot/next branch
test/dm/fdtdec.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c
index b2f75b5..c2f7b94 100644
--- a/test/dm/fdtdec.c
+++ b/test/dm/fdtdec.c
@@ -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;
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4 2/3] test/dm: fdtdec: Corect a typo in dm_test_fdtdec_set_carveout()
2020-06-23 5:55 [PATCH v4 1/3] test/dm: fdtdec: Add the missing gd declaration Bin Meng
@ 2020-06-23 5:55 ` Bin Meng
2020-06-23 5:55 ` [PATCH v4 3/3] test/dm: fdtdec: Add tests for fdtdec_add_reserved_memory() Bin Meng
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Bin Meng @ 2020-06-23 5:55 UTC (permalink / raw)
To: u-boot
From: Bin Meng <bin.meng@windriver.com>
It should be "writable".
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
test/dm/fdtdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c
index c2f7b94..999d712 100644
--- a/test/dm/fdtdec.c
+++ b/test/dm/fdtdec.c
@@ -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;
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4 3/3] test/dm: fdtdec: Add tests for fdtdec_add_reserved_memory()
2020-06-23 5:55 [PATCH v4 1/3] test/dm: fdtdec: Add the missing gd declaration Bin Meng
2020-06-23 5:55 ` [PATCH v4 2/3] test/dm: fdtdec: Corect a typo in dm_test_fdtdec_set_carveout() Bin Meng
@ 2020-06-23 5:55 ` Bin Meng
2020-07-06 1:31 ` Simon Glass
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Bin Meng @ 2020-06-23 5:55 UTC (permalink / raw)
To: u-boot
From: Bin Meng <bin.meng@windriver.com>
This adds a test case to test the functionality of the fdtdec API
fdtdec_add_reserved_memory().
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
(no changes since v3)
Changes in v3:
- correct typo in the comments, and some minor rewording
test/dm/fdtdec.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c
index 999d712..56f6f4f 100644
--- a/test/dm/fdtdec.c
+++ b/test/dm/fdtdec.c
@@ -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 a new node 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);
+
+ /* phandle 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);
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4 3/3] test/dm: fdtdec: Add tests for fdtdec_add_reserved_memory()
2020-06-23 5:55 [PATCH v4 1/3] test/dm: fdtdec: Add the missing gd declaration Bin Meng
2020-06-23 5:55 ` [PATCH v4 2/3] test/dm: fdtdec: Corect a typo in dm_test_fdtdec_set_carveout() Bin Meng
2020-06-23 5:55 ` [PATCH v4 3/3] test/dm: fdtdec: Add tests for fdtdec_add_reserved_memory() Bin Meng
@ 2020-07-06 1:31 ` Simon Glass
2020-07-06 1:31 ` [PATCH v4 1/3] test/dm: fdtdec: Add the missing gd declaration Simon Glass
2020-07-06 1:31 ` [PATCH v4 2/3] test/dm: fdtdec: Corect a typo in dm_test_fdtdec_set_carveout() Simon Glass
4 siblings, 0 replies; 6+ messages in thread
From: Simon Glass @ 2020-07-06 1:31 UTC (permalink / raw)
To: u-boot
From: Bin Meng <bin.meng@windriver.com>
This adds a test case to test the functionality of the fdtdec API
fdtdec_add_reserved_memory().
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
(no changes since v3)
Changes in v3:
- correct typo in the comments, and some minor rewording
test/dm/fdtdec.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
Applied to u-boot-dm/next, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v4 2/3] test/dm: fdtdec: Corect a typo in dm_test_fdtdec_set_carveout()
2020-06-23 5:55 [PATCH v4 1/3] test/dm: fdtdec: Add the missing gd declaration Bin Meng
` (3 preceding siblings ...)
2020-07-06 1:31 ` [PATCH v4 1/3] test/dm: fdtdec: Add the missing gd declaration Simon Glass
@ 2020-07-06 1:31 ` Simon Glass
4 siblings, 0 replies; 6+ messages in thread
From: Simon Glass @ 2020-07-06 1:31 UTC (permalink / raw)
To: u-boot
From: Bin Meng <bin.meng@windriver.com>
It should be "writable".
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
test/dm/fdtdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-dm/next, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v4 1/3] test/dm: fdtdec: Add the missing gd declaration
2020-06-23 5:55 [PATCH v4 1/3] test/dm: fdtdec: Add the missing gd declaration Bin Meng
` (2 preceding siblings ...)
2020-07-06 1:31 ` Simon Glass
@ 2020-07-06 1:31 ` Simon Glass
2020-07-06 1:31 ` [PATCH v4 2/3] test/dm: fdtdec: Corect a typo in dm_test_fdtdec_set_carveout() Simon Glass
4 siblings, 0 replies; 6+ messages in thread
From: Simon Glass @ 2020-07-06 1:31 UTC (permalink / raw)
To: u-boot
From: Bin Meng <bin.meng@windriver.com>
Add DECLARE_GLOBAL_DATA_PTR since it is referenced in the test codes.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
Changes in v4:
- drop the first 2 patches that are already applied
- rebase against u-boot/next branch
test/dm/fdtdec.c | 2 ++
1 file changed, 2 insertions(+)
Applied to u-boot-dm/next, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-07-06 1:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-23 5:55 [PATCH v4 1/3] test/dm: fdtdec: Add the missing gd declaration Bin Meng
2020-06-23 5:55 ` [PATCH v4 2/3] test/dm: fdtdec: Corect a typo in dm_test_fdtdec_set_carveout() Bin Meng
2020-06-23 5:55 ` [PATCH v4 3/3] test/dm: fdtdec: Add tests for fdtdec_add_reserved_memory() Bin Meng
2020-07-06 1:31 ` Simon Glass
2020-07-06 1:31 ` [PATCH v4 1/3] test/dm: fdtdec: Add the missing gd declaration Simon Glass
2020-07-06 1:31 ` [PATCH v4 2/3] test/dm: fdtdec: Corect a typo in dm_test_fdtdec_set_carveout() Simon Glass
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.