On Tue, Aug 16, 2016 at 10:00 AM, Aaro Koskinen <aaro.koskinen@xxxxxxxxx> wrote:
> Hi,
>
> Commit 44a7185c2ae6 ("of/platform: Add common method to populate default
> bus") added new arch_initcall of_platform_default_populate_init() that
> will be called before device_initcall octeon_publish_devices(). Now the
> of_platform_bus_probe() called in octeon_publish_devices() is apparently
> doing nothing:
>
> [ 52.331353] calling octeon_publish_devices+0x0/0x14 @ 1
> [ 52.331358] OF: of_platform_bus_probe()
> [ 52.331362] OF: starting at: /
> [ 52.331378] OF: of_platform_bus_create() - skipping /soc@0, already populated
> [ 52.331394] initcall octeon_publish_devices+0x0/0x14 returned 0 after 29 usecs
>
> This also means that USB etc. won't get probed.
>
> Any ideas what would be the proper fix for this? Changing
> octeon_publish_devices() to arch_initcall seems to work but that may be
> a bit hackish... Also, there might be also other MIPS boards affected
> (arch/mips/netlogic/xlp/dt.c, arch/mips/mti-malta/malta-dt.c).
Can you try reverting this hunk. I don't think it should be needed and
it is preventing /soc@0 children from being probed. If things still
don't work, then it should purely be a probe ordering problem. I have
some better fixes in mind, but not for 4.8. So if this doesn't work,
then the same fix as PPC is fine.
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 16e8daf..c559ef8 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -363,6 +363,12 @@ static int of_platform_bus_create(struct device_node *bus,
return 0;
}
+ if (of_node_check_flag(bus, OF_POPULATED_BUS)) {
+ pr_debug("%s() - skipping %s, already populated\n",
+ __func__, bus->full_name);
+ return 0;
+ }
+
auxdata = of_dev_lookup(lookup, bus);
if (auxdata) {
bus_id = auxdata->name;
Rob
