6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Saravana Kannan saravanak@google.com
commit c28cd1f3433c7e339315d1ddacaeacf0fdfbe252 upstream.
We already mark fwnodes as initialized when they are registered as clock providers. We do this so that fw_devlink can tell when a clock driver doesn't use the driver core framework to probe/initialize its device. This ensures fw_devlink doesn't block the consumers of such a clock provider indefinitely.
However, some users of CLK_OF_DECLARE() macros don't use the same node that matches the macro as the node for the clock provider, but they initialize the entire node. To cover these cases, also mark the nodes that match the macros as initialized when the init callback function is called.
An example of this is "stericsson,u8500-clks" that's handled using CLK_OF_DECLARE() and looks something like this:
clocks { compatible = "stericsson,u8500-clks";
prcmu_clk: prcmu-clock { #clock-cells = <1>; };
prcc_pclk: prcc-periph-clock { #clock-cells = <2>; };
prcc_kclk: prcc-kernel-clock { #clock-cells = <2>; };
prcc_reset: prcc-reset-controller { #reset-cells = <2>; }; ... };
This patch makes sure that "clocks" is marked as initialized so that fw_devlink knows that all nodes under it have been initialized. If the driver creates struct devices for some of the subnodes, fw_devlink is smart enough to know to wait for those devices to probe, so no special handling is required for those cases.
Cc: Greg Kroah-Hartman gregkh@linuxfoundation.org Reported-by: Linus Walleij linus.walleij@linaro.org Link: https://lore.kernel.org/lkml/CACRpkdamxDX6EBVjKX5=D3rkHp17f5pwGdBVhzFU90-0MH... Fixes: 4a032827daa8 ("of: property: Simplify of_link_to_phandle()") Signed-off-by: Saravana Kannan saravanak@google.com Link: https://lore.kernel.org/r/20230302014639.297514-1-saravanak@google.com Reviewed-by: Linus Walleij linus.walleij@linaro.org Tested-by: Linus Walleij linus.walleij@linaro.org Signed-off-by: Stephen Boyd sboyd@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- include/linux/clk-provider.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
--- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -1361,7 +1361,13 @@ struct clk_hw_onecell_data { struct clk_hw *hws[]; };
-#define CLK_OF_DECLARE(name, compat, fn) OF_DECLARE_1(clk, name, compat, fn) +#define CLK_OF_DECLARE(name, compat, fn) \ + static void __init name##_of_clk_init_declare(struct device_node *np) \ + { \ + fn(np); \ + fwnode_dev_initialized(of_fwnode_handle(np), true); \ + } \ + OF_DECLARE_1(clk, name, compat, name##_of_clk_init_declare)
/* * Use this macro when you have a driver that requires two initialization