diff options
authorSaravana Kannan <>2019-12-09 11:31:19 -0800
committerRob Herring <>2019-12-12 18:39:52 -0600
commitee9b280e17dce51c44e1d04d11eb0a4acd0ee1a9 (patch)
parent70c812106c87981a087fafacab004aee37193405 (diff)
of/platform: Unconditionally pause/resume sync state during kernel init
Commit 5e6669387e22 ("of/platform: Pause/resume sync state during init and of_platform_populate()") paused/resumed sync state during init only if Linux had parsed and populated a devicetree. However, the check for that (of_have_populated_dt()) can change after of_platform_default_populate_init() executes. One example of this is when devicetree unittests are enabled. This causes an unmatched pause/resume of sync state. To avoid this, just unconditionally pause/resume sync state during init. Fixes: 5e6669387e22 ("of/platform: Pause/resume sync state during init and of_platform_populate()") Reported-by: kernel test robot <> Signed-off-by: Saravana Kannan <> Reviewed-by: Frank Rowand <> Signed-off-by: Rob Herring <>
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index d93891a05f60..3371e4a06248 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -518,10 +518,11 @@ static int __init of_platform_default_populate_init(void)
struct device_node *node;
+ device_links_supplier_sync_state_pause();
if (!of_have_populated_dt())
return -ENODEV;
- device_links_supplier_sync_state_pause();
* Handle certain compatibles explicitly, since we don't want to create
* platform_devices for every node in /reserved-memory with a
@@ -545,8 +546,7 @@ arch_initcall_sync(of_platform_default_populate_init);
static int __init of_platform_sync_state_init(void)
- if (of_have_populated_dt())
- device_links_supplier_sync_state_resume();
+ device_links_supplier_sync_state_resume();
return 0;