Commit ee9b280e authored Dec 09, 2019 by Saravana Kannan Committed by Rob Herring Dec 12, 2019

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: kernel test robot <lkp@intel.com>
Signed-off-by: Saravana Kannan <saravanak@google.com>
Reviewed-by: Frank Rowand <frowand.list@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>

parent 70c81210

drivers/of/platform.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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,7 +546,6 @@ 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();
		return 0;
		}

Admin message