From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f66.google.com ([209.85.160.66]:36573 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754406AbeCSDoL (ORCPT ); Sun, 18 Mar 2018 23:44:11 -0400 Received: by mail-pl0-f66.google.com with SMTP id 61-v6so9477006plf.3 for ; Sun, 18 Mar 2018 20:44:10 -0700 (PDT) Date: Mon, 19 Mar 2018 11:44:08 +0800 From: Dan Rue To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Tero Kristo , Stephen Boyd , Sasha Levin Subject: Re: [PATCH 4.14 056/109] clk: ti: clkctrl: add support for retrying failed init Message-ID: <20180319034408.wi6wfosbcckw22j6@xps> References: <20180316152329.844663293@linuxfoundation.org> <20180316152333.001660820@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20180316152333.001660820@linuxfoundation.org> Sender: stable-owner@vger.kernel.org List-ID: On Fri, Mar 16, 2018 at 04:23:25PM +0100, Greg Kroah-Hartman wrote: > 4.14-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Tero Kristo > > > [ Upstream commit 729e13bf58e643b9accd2a14c55b555958702fb0 ] > > In case the clkctrl node contains assigned-clock-* entries, registering > the provider can fail with -EPROBE_DEFER. In this case, add the > provider to the retry_init clock list so it will be cleaned up later. > > Signed-off-by: Tero Kristo > Acked-by: Stephen Boyd > Signed-off-by: Sasha Levin > Signed-off-by: Greg Kroah-Hartman This fails to build for me on arm32: $ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=build-arm multi_v7_defconfig $ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- O=build-arm ... ../drivers/clk/ti/clkctrl.c: In function ‘_ti_omap4_clkctrl_setup’: ../drivers/clk/ti/clkctrl.c:497:27: error: passing argument 2 of ‘ti_clk_retry_init’ from incompatible pointer type [-Werror=incompatible-pointer-types] ti_clk_retry_init(node, provider, _clkctrl_add_provider); ^~~~~~~~ In file included from ../drivers/clk/ti/clkctrl.c:24:0: ../drivers/clk/ti/clock.h:265:5: note: expected ‘struct clk_hw *’ but argument is of type ‘struct omap_clkctrl_prov ider *’ int ti_clk_retry_init(struct device_node *node, struct clk_hw *hw, ^~~~~~~~~~~~~~~~~ ../drivers/clk/ti/clkctrl.c:497:37: error: passing argument 3 of ‘ti_clk_retry_init’ from incompatible pointer type [-Werror=incompatible-pointer-types] ti_clk_retry_init(node, provider, _clkctrl_add_provider); ^~~~~~~~~~~~~~~~~~~~~ In file included from ../drivers/clk/ti/clkctrl.c:24:0: ../drivers/clk/ti/clock.h:265:5: note: expected ‘ti_of_clk_init_cb_t {aka void (*)(struct clk_hw *, struct device_n ode *)}’ but argument is of type ‘void (*)(void *, struct device_node *)’ int ti_clk_retry_init(struct device_node *node, struct clk_hw *hw, ^~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors make[4]: *** [../scripts/Makefile.build:329: drivers/clk/ti/clkctrl.o] Error 1 make[3]: *** [../scripts/Makefile.build:587: drivers/clk/ti] Error 2 make[2]: *** [../scripts/Makefile.build:587: drivers/clk] Error 2 make[1]: *** [/home/drue/src/linux/4.14-rc/Makefile:1031: drivers] Error 2 make[1]: Leaving directory '/home/drue/src/linux/4.14-rc/build-arm' make: *** [Makefile:146: sub-make] Error 2 > --- > drivers/clk/ti/clkctrl.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > --- a/drivers/clk/ti/clkctrl.c > +++ b/drivers/clk/ti/clkctrl.c > @@ -400,6 +400,12 @@ _ti_clkctrl_setup_subclks(struct omap_cl > } > } > > +static void __init _clkctrl_add_provider(void *data, > + struct device_node *np) > +{ > + of_clk_add_hw_provider(np, _ti_omap4_clkctrl_xlate, data); > +} > + > static void __init _ti_omap4_clkctrl_setup(struct device_node *node) > { > struct omap_clkctrl_provider *provider; > @@ -411,6 +417,7 @@ static void __init _ti_omap4_clkctrl_set > struct omap_clkctrl_clk *clkctrl_clk; > const __be32 *addrp; > u32 addr; > + int ret; > > addrp = of_get_address(node, 0, NULL, NULL); > addr = (u32)of_translate_address(node, addrp); > @@ -485,7 +492,10 @@ static void __init _ti_omap4_clkctrl_set > reg_data++; > } > > - of_clk_add_hw_provider(node, _ti_omap4_clkctrl_xlate, provider); > + ret = of_clk_add_hw_provider(node, _ti_omap4_clkctrl_xlate, provider); > + if (ret == -EPROBE_DEFER) > + ti_clk_retry_init(node, provider, _clkctrl_add_provider); > + > return; > > cleanup: > >