Quoting Rob Herring (2023-03-21 10:33:03)
On Wed, Mar 15, 2023 at 11:37:18AM -0700, Stephen Boyd wrote:
diff --git a/drivers/of/of_test.c b/drivers/of/of_test.c new file mode 100644 index 000000000000..a4d70ac344ad --- /dev/null +++ b/drivers/of/of_test.c @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0 +/*
- KUnit tests for OF APIs
- */
+#include <linux/kconfig.h> +#include <linux/of.h>
+#include <kunit/test.h>
+/*
- Test that the root node / exists.
- */
+static void dtb_root_node_exists(struct kunit *test) +{
KUNIT_EXPECT_NOT_ERR_OR_NULL(test, of_find_node_by_path("/"));+}
+/*
- Test that the /__symbols__ node exists.
- */
+static void dtb_symbols_node_exists(struct kunit *test) +{
KUNIT_EXPECT_NOT_ERR_OR_NULL(test, of_find_node_by_path("/__symbols__"));+}
Many base DTs will not have this. And the kunit tests themselves shouldn't need it because they should be independent of the base tree.
When I try to apply an overlay it fails
OF: overlay: no fragments or symbols in overlay OF: overlay: init_overlay_changeset() failed, ret = -22 # of_overlay_apply_kunit_apply: ASSERTION FAILED at drivers/of/overlay_test.c:18 Expected 0 == ({ extern uint8_t __dtbo_kunit_overlay_test_begin[]; extern uint8_t __dtbo_kunit_overlay_test_end[]; __of_overlay_apply_kunit((test), __dtbo_kunit_overlay_test_begin, __dtbo_kunit_overlay_test_end); }), but ({ extern uint8_t __dtbo_kunit_overlay_test_begin[]; extern uint8_t __dtbo_kunit_overlay_test_end[]; __of_overlay_apply_kunit((test), __dtbo_kunit_overlay_test_begin, __dtbo_kunit_overlay_test_end); }) == -12 (0xfffffffffffffff4) [FAILED] of_overlay_apply_kunit_apply
Now I'm trying to hack on the fake root node to see if I can make it work.
---8<--- diff --git a/drivers/of/base.c b/drivers/of/base.c index 090c5d7925e4..12c44c86b8ae 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -166,7 +166,7 @@ void __of_phandle_cache_inv_entry(phandle handle) phandle_cache[handle_hash] = NULL; }
-#ifdef CONFIG_OF_KUNIT +#if 0 static int __init of_kunit_add_data(void) { void *kunit_fdt; diff --git a/drivers/of/kunit_overlay_test.dtso b/drivers/of/kunit_overlay_test.dtso index 6e70e2f8cd90..e3ced1467dd9 100644 --- a/drivers/of/kunit_overlay_test.dtso +++ b/drivers/of/kunit_overlay_test.dtso @@ -2,7 +2,7 @@ /dts-v1/; /plugin/;
-&kunit_bus { +/ { test-kunit { compatible = "test,kunit-empty"; }; diff --git a/drivers/of/of_test.c b/drivers/of/of_test.c index 543fdf0936f6..08b670aee083 100644 --- a/drivers/of/of_test.c +++ b/drivers/of/of_test.c @@ -15,17 +15,8 @@ static void dtb_root_node_exists(struct kunit *test) KUNIT_EXPECT_NOT_ERR_OR_NULL(test, of_find_node_by_path("/")); }
-/* - * Test that the /__symbols__ node exists. - */ -static void dtb_symbols_node_exists(struct kunit *test) -{ - KUNIT_EXPECT_NOT_ERR_OR_NULL(test, of_find_node_by_path("/__symbols__")); -} - static struct kunit_case dtb_test_cases[] = { KUNIT_CASE(dtb_root_node_exists), - KUNIT_CASE(dtb_symbols_node_exists), {} };