From: Stephen Boyd <sboyd@kernel.org>
To: Rob Herring <robh+dt@kernel.org>
Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev,
linux-um@lists.infradead.org,
linux-arm-kernel@lists.infradead.org, kunit-dev@googlegroups.com,
linux-kselftest@vger.kernel.org, devicetree@vger.kernel.org,
Frank Rowand <frowand.list@gmail.com>,
David Gow <davidgow@google.com>,
Brendan Higgins <brendan.higgins@linux.dev>
Subject: [PATCH 6/6] of: Add KUnit test to confirm DTB is loaded
Date: Fri, 12 Jan 2024 12:07:49 -0800 [thread overview]
Message-ID: <20240112200750.4062441-7-sboyd@kernel.org> (raw)
In-Reply-To: <20240112200750.4062441-1-sboyd@kernel.org>
Add a KUnit test that confirms a DTB has been loaded, i.e. there is a
root node, and that the of_have_populated_dt() API works properly.
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: David Gow <davidgow@google.com>
Cc: Brendan Higgins <brendan.higgins@linux.dev>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
---
drivers/of/.kunitconfig | 3 ++
drivers/of/Kconfig | 9 ++++
drivers/of/Makefile | 2 +
drivers/of/of_test.c | 98 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 112 insertions(+)
create mode 100644 drivers/of/.kunitconfig
create mode 100644 drivers/of/of_test.c
diff --git a/drivers/of/.kunitconfig b/drivers/of/.kunitconfig
new file mode 100644
index 000000000000..5a8fee11978c
--- /dev/null
+++ b/drivers/of/.kunitconfig
@@ -0,0 +1,3 @@
+CONFIG_KUNIT=y
+CONFIG_OF=y
+CONFIG_OF_KUNIT_TEST=y
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 9628e48baa15..a527ba8451d9 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -37,6 +37,15 @@ config OF_UNITTEST
If unsure, say N here. This option is not safe to enable.
+config OF_KUNIT_TEST
+ tristate "Devicetree KUnit DTB Test" if !KUNIT_ALL_TESTS
+ depends on KUNIT
+ default KUNIT_ALL_TESTS
+ help
+ This option builds KUnit unit tests for device tree infrastructure.
+
+ If unsure, say N here, but this option is safe to enable.
+
config OF_ALL_DTBS
bool "Build all Device Tree Blobs"
depends on COMPILE_TEST
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index df305348d1cb..251d33532148 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -19,4 +19,6 @@ obj-y += kexec.o
endif
endif
+obj-$(CONFIG_OF_KUNIT_TEST) += of_test.o
+
obj-$(CONFIG_OF_UNITTEST) += unittest-data/
diff --git a/drivers/of/of_test.c b/drivers/of/of_test.c
new file mode 100644
index 000000000000..7609ad3081b9
--- /dev/null
+++ b/drivers/of/of_test.c
@@ -0,0 +1,98 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * KUnit tests for OF APIs
+ */
+#include <linux/module.h>
+#include <linux/of.h>
+
+#include <kunit/test.h>
+
+/*
+ * Test that the root node "/" exists.
+ */
+static void dtb_root_node_found_by_path(struct kunit *test)
+{
+ struct device_node *np;
+
+ np = of_find_node_by_path("/");
+ KUNIT_EXPECT_NOT_ERR_OR_NULL(test, np);
+ of_node_put(np);
+}
+
+/*
+ * Test that the of_root global variable is always populated when DT
+ * code is enabled.
+ */
+static void dtb_root_node_populates_of_root(struct kunit *test)
+{
+ KUNIT_EXPECT_NOT_ERR_OR_NULL(test, of_root);
+}
+
+static struct kunit_case dtb_test_cases[] = {
+ KUNIT_CASE(dtb_root_node_found_by_path),
+ KUNIT_CASE(dtb_root_node_populates_of_root),
+ {}
+};
+
+/*
+ * Test suite to confirm a live DTB is loaded.
+ */
+static struct kunit_suite dtb_suite = {
+ .name = "dtb",
+ .test_cases = dtb_test_cases,
+};
+
+/*
+ * Test that calling of_have_populated_dt() returns false when
+ * the OF_EMPTY_ROOT flag isn't set.
+ */
+static void of_have_populated_dt_false_when_flag_set(struct kunit *test)
+{
+ bool was_set;
+
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, of_root);
+
+ was_set = of_node_test_and_set_flag(of_root, OF_EMPTY_ROOT);
+ KUNIT_EXPECT_FALSE(test, of_have_populated_dt());
+
+ if (!was_set)
+ of_node_clear_flag(of_root, OF_EMPTY_ROOT);
+}
+
+/*
+ * Test that calling of_have_populated_dt() returns false when
+ * the OF_EMPTY_ROOT flag isn't set.
+ */
+static void of_have_populated_dt_true_when_flag_clear(struct kunit *test)
+{
+ bool was_set;
+
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, of_root);
+
+ was_set = of_node_check_flag(of_root, OF_EMPTY_ROOT);
+ of_node_set_flag(of_root, OF_EMPTY_ROOT);
+ KUNIT_EXPECT_FALSE(test, of_have_populated_dt());
+
+ if (was_set)
+ of_node_set_flag(of_root, OF_EMPTY_ROOT);
+}
+
+static struct kunit_case of_have_populated_dt_test_cases[] = {
+ KUNIT_CASE(of_have_populated_dt_false_when_flag_set),
+ KUNIT_CASE(of_have_populated_dt_true_when_flag_clear),
+ {}
+};
+
+/*
+ * Test suite to confirm behavior of of_have_populated_dt().
+ */
+static struct kunit_suite of_have_populated_dt_suite = {
+ .name = "of_have_populated_dt",
+ .test_cases = of_have_populated_dt_test_cases,
+};
+
+kunit_test_suites(
+ &dtb_suite,
+ &of_have_populated_dt_suite,
+);
+MODULE_LICENSE("GPL");
--
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/
https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
next prev parent reply other threads:[~2024-01-12 20:07 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-12 20:07 [PATCH 0/6] of: populate of_root node if bootloader doesn't Stephen Boyd
2024-01-12 20:07 ` [PATCH 1/6] arm64: Unconditionally call unflatten_device_tree() Stephen Boyd
2024-01-15 17:57 ` Rob Herring
2024-01-16 11:51 ` Mark Rutland
2024-01-16 14:13 ` Geert Uytterhoeven
2024-01-18 15:23 ` Mark Rutland
2024-01-18 16:22 ` Geert Uytterhoeven
2024-01-17 1:27 ` Stephen Boyd
2024-01-17 17:54 ` Rob Herring
2024-01-17 23:00 ` Stephen Boyd
2024-01-18 15:26 ` Mark Rutland
2024-01-18 16:23 ` Geert Uytterhoeven
2024-01-19 23:10 ` Rob Herring
2024-01-12 20:07 ` [PATCH 2/6] um: " Stephen Boyd
2024-01-12 20:07 ` [PATCH 3/6] of: Always unflatten in unflatten_and_copy_device_tree() Stephen Boyd
2024-01-12 20:07 ` [PATCH 4/6] of: Create of_root if no dtb provided by firmware Stephen Boyd
2024-01-15 20:32 ` Rob Herring
2024-01-17 1:18 ` Stephen Boyd
2024-01-17 17:41 ` Rob Herring
2024-01-18 8:45 ` Geert Uytterhoeven
2024-01-18 13:44 ` Rob Herring
2024-01-12 20:07 ` [PATCH 5/6] of: unittest: treat missing of_root as error instead of fixing up Stephen Boyd
2024-01-12 20:07 ` Stephen Boyd [this message]
2024-01-16 5:03 ` [PATCH 6/6] of: Add KUnit test to confirm DTB is loaded David Gow
2024-01-22 22:48 ` Stephen Boyd
2024-01-24 7:25 ` David Gow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240112200750.4062441-7-sboyd@kernel.org \
--to=sboyd@kernel.org \
--cc=brendan.higgins@linux.dev \
--cc=davidgow@google.com \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=kunit-dev@googlegroups.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=patches@lists.linux.dev \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).