Commit 51ba8b3a authored by Saravana Kannan's avatar Saravana Kannan Committed by Greg Kroah-Hartman

of/platform: Unconditionally pause/resume sync state during kernel init

Commit 5e666938 ("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: 5e666938 ("of/platform: Pause/resume sync state during init and of_platform_populate()")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarSaravana Kannan <saravanak@google.com>
Reviewed-by: default avatarFrank Rowand <frowand.list@gmail.com>
Link: https://lore.kernel.org/r/20191209193119.147056-1-saravanak@google.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e42617b8
...@@ -518,10 +518,11 @@ static int __init of_platform_default_populate_init(void) ...@@ -518,10 +518,11 @@ static int __init of_platform_default_populate_init(void)
{ {
struct device_node *node; struct device_node *node;
device_links_supplier_sync_state_pause();
if (!of_have_populated_dt()) if (!of_have_populated_dt())
return -ENODEV; return -ENODEV;
device_links_supplier_sync_state_pause();
/* /*
* Handle certain compatibles explicitly, since we don't want to create * Handle certain compatibles explicitly, since we don't want to create
* platform_devices for every node in /reserved-memory with a * platform_devices for every node in /reserved-memory with a
...@@ -545,8 +546,7 @@ arch_initcall_sync(of_platform_default_populate_init); ...@@ -545,8 +546,7 @@ arch_initcall_sync(of_platform_default_populate_init);
static int __init of_platform_sync_state_init(void) 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; return 0;
} }
late_initcall_sync(of_platform_sync_state_init); late_initcall_sync(of_platform_sync_state_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment