Quoting Rob Herring (2024-05-15 06:06:09)
On Tue, May 14, 2024 at 4:29 PM Stephen Boyd sboyd@kernel.org wrote:
powerpc doesn't mark the root node with OF_POPULATED_BUS. If I set that in of_platform_default_populate_init() then the overlays can be applied.
---8<---- diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 389d4ea6bfc1..fa7b439e9402 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -565,6 +565,10 @@ static int __init of_platform_default_populate_init(void) of_platform_device_create(node, buf, NULL); }
node = of_find_node_by_path("/");if (node)of_node_set_flag(node, OF_POPULATED_BUS);I think you want to do this in of_platform_bus_probe() instead to mirror of_platform_populate(). These are supposed to be the same except that 'populate' only creates devices for nodes with compatible while 'probe' will create devices for all child nodes. Looks like we are missing some devlink stuff too. There may have been some issue for PPC with it.
Got it. So this patch?
---8<--- diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 389d4ea6bfc1..acecefcfdba7 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -421,6 +421,7 @@ int of_platform_bus_probe(struct device_node *root, if (of_match_node(matches, root)) { rc = of_platform_bus_create(root, matches, NULL, parent, false); } else for_each_child_of_node(root, child) { + of_node_set_flag(root, OF_POPULATED_BUS); if (!of_match_node(matches, child)) continue; rc = of_platform_bus_create(child, matches, NULL, parent, false);
This doesn't work though. I see that prom_init() is called, which constructs a DTB and flattens it to be unflattened by unflatten_device_tree(). The powerpc machine type used by qemu is PLATFORM_PSERIES_LPAR. It looks like it never calls of_platform_bus_probe() from the pseries platform code.
What about skipping the OF_POPULATED_BUS check, or skipping the check when the parent is the root node? This is the if condition that's giving the headache.
---8<--- diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 389d4ea6bfc1..38dfafc25d86 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -735,10 +735,6 @@ static int of_platform_notify(struct notifier_block *nb,
switch (of_reconfig_get_state_change(action, rd)) { case OF_RECONFIG_CHANGE_ADD: - /* verify that the parent is a bus */ - if (!of_node_check_flag(rd->dn->parent, OF_POPULATED_BUS)) - return NOTIFY_OK; /* not for us */ - /* already populated? (driver using of_populate manually) */ if (of_node_check_flag(rd->dn, OF_POPULATED)) return NOTIFY_OK;
of_node_put(node); } else { /* * Handle certain compatibles explicitly, since we don't want to createI'm guessing this is wrong though, because I see bunch of powerpc specific code calling of_platform_bus_probe() which will set the flag on the actual platform bus nodes. Maybe we should just allow overlays to create devices at the root node regardless? Of course, the flag doc says "platform bus created for children" and if we never populated the root then that isn't entirely accurate.
Rob, can you point me in the right direction? Do we need to use simple-bus in the test overlays and teach overlay code to populate that bus?
Overlays adding things to the root node might be suspect, but probably there are some valid reasons to do so.
In this case we're using it to add nodes without a reg property to the root node.
If simple-bus makes sense here, then yes, you should use it. But if what's on it is not MMIO devices, don't. That's a warning in the schema now.
Ok. Sounds like adding these nodes to the root node is the right way then.
I wonder if we can make MMIO devices appear on the kunit bus by adding DT support to the bus and then letting those nodes have reg properties that we "sinkhole" by making those iomem resources point to something else in the ioremap code. Then we can work in MMIO kunit emulation that way to let tests check code that works with readl/writel, e.g. the clk gate tests.