of/platform: Unconditionally pause/resume sync state during kernel init
PATCH v3 1/1 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.
---
v1->v2:
- Updated the commit text to address Frank's comments
- Added Frank's R-bv2->v3:
- Added this change log to address Greg's comments
drivers/of/platform.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/of/platform.c +3 -3
@@ -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 ; }late_initcall_sync (of_platform_sync_state_init);
Signature · 1 line
2.24.0.393.g34dc348eaf-goog
Quoted 16 lines · Saravana Kannan
Commit
5e6669387e22("of/platform: Pause/resume sync state during init andof_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 afterof_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 <[email protected]>Signed-off-by Saravana Kannan <[email protected]>Reviewed-by Frank Rowand <[email protected]>---
Quoted 9 lines
v1->v2:
- Updated the commit text to address Frank's comments
- Added Frank's R-bv2->v3:
- Added this change log to address Greg's commentsdrivers/of/platform.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Applied, thanks.
Rob