| Message ID | 20190614164324.9427-6-jagan@amarulasolutions.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/sun4i: Allwinner R40 MIPI-DSI support | expand |
On Sat, Jun 15, 2019 at 12:44 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > TCON TOP have clock gates for TV0, TV1, dsi and right > now these are register during bind call. > > Of which, dsi clock gate would required during DPHY probe > but same can miss to get since tcon top is not bound at > that time. > > To solve, this circular dependency move the clock gate > registration from bind to probe so-that DPHY can get the > dsi gate clock on time. > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > --- > drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 94 ++++++++++++++------------ > 1 file changed, 49 insertions(+), 45 deletions(-) > > diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > index 465e9b0cdfee..a8978b3fe851 100644 > --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > @@ -124,7 +124,53 @@ static struct clk_hw *sun8i_tcon_top_register_gate(struct device *dev, > static int sun8i_tcon_top_bind(struct device *dev, struct device *master, > void *data) > { > - struct platform_device *pdev = to_platform_device(dev); > + struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); > + int ret; > + > + ret = reset_control_deassert(tcon_top->rst); > + if (ret) { > + dev_err(dev, "Could not deassert ctrl reset control\n"); > + return ret; > + } > + > + ret = clk_prepare_enable(tcon_top->bus); > + if (ret) { > + dev_err(dev, "Could not enable bus clock\n"); > + goto err_assert_reset; > + } You have to de-assert the reset control and enable the clock before the clocks it provides are registered. Otherwise a consumer may come in and ask for the provided clock to be enabled, but since the TCON TOP's own reset and clock are still disabled, you can't actually access the registers that controls the provided clock. > + > + return 0; > + > +err_assert_reset: > + reset_control_assert(tcon_top->rst); > + > + return ret; > +} > + > +static void sun8i_tcon_top_unbind(struct device *dev, struct device *master, > + void *data) > +{ > + struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); > + struct clk_hw_onecell_data *clk_data = tcon_top->clk_data; > + int i; > + > + of_clk_del_provider(dev->of_node); > + for (i = 0; i < CLK_NUM; i++) > + if (clk_data->hws[i]) > + clk_hw_unregister_gate(clk_data->hws[i]); And this should be in the remove function. So instead, just move _everything_ to the probe and remove functions, and provide empty bind/unbind functions so the component system still works. ChenYu > + > + clk_disable_unprepare(tcon_top->bus); > + reset_control_assert(tcon_top->rst); > +} > + > +static const struct component_ops sun8i_tcon_top_ops = { > + .bind = sun8i_tcon_top_bind, > + .unbind = sun8i_tcon_top_unbind, > +}; > + > +static int sun8i_tcon_top_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > struct clk_hw_onecell_data *clk_data; > struct sun8i_tcon_top *tcon_top; > const struct sun8i_tcon_top_quirks *quirks; > @@ -132,7 +178,7 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, > void __iomem *regs; > int ret, i; > > - quirks = of_device_get_match_data(&pdev->dev); > + quirks = of_device_get_match_data(dev); > > tcon_top = devm_kzalloc(dev, sizeof(*tcon_top), GFP_KERNEL); > if (!tcon_top) > @@ -164,18 +210,6 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, > if (IS_ERR(regs)) > return PTR_ERR(regs); > > - ret = reset_control_deassert(tcon_top->rst); > - if (ret) { > - dev_err(dev, "Could not deassert ctrl reset control\n"); > - return ret; > - } > - > - ret = clk_prepare_enable(tcon_top->bus); > - if (ret) { > - dev_err(dev, "Could not enable bus clock\n"); > - goto err_assert_reset; > - } > - > /* > * At least on H6, some registers have some bits set by default > * which may cause issues. Clear them here. > @@ -226,45 +260,15 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, > > dev_set_drvdata(dev, tcon_top); > > - return 0; > + return component_add(dev, &sun8i_tcon_top_ops); > > err_unregister_gates: > for (i = 0; i < CLK_NUM; i++) > if (!IS_ERR_OR_NULL(clk_data->hws[i])) > clk_hw_unregister_gate(clk_data->hws[i]); > - clk_disable_unprepare(tcon_top->bus); > -err_assert_reset: > - reset_control_assert(tcon_top->rst); > - > return ret; > } > > -static void sun8i_tcon_top_unbind(struct device *dev, struct device *master, > - void *data) > -{ > - struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); > - struct clk_hw_onecell_data *clk_data = tcon_top->clk_data; > - int i; > - > - of_clk_del_provider(dev->of_node); > - for (i = 0; i < CLK_NUM; i++) > - if (clk_data->hws[i]) > - clk_hw_unregister_gate(clk_data->hws[i]); > - > - clk_disable_unprepare(tcon_top->bus); > - reset_control_assert(tcon_top->rst); > -} > - > -static const struct component_ops sun8i_tcon_top_ops = { > - .bind = sun8i_tcon_top_bind, > - .unbind = sun8i_tcon_top_unbind, > -}; > - > -static int sun8i_tcon_top_probe(struct platform_device *pdev) > -{ > - return component_add(&pdev->dev, &sun8i_tcon_top_ops); > -} > - > static int sun8i_tcon_top_remove(struct platform_device *pdev) > { > component_del(&pdev->dev, &sun8i_tcon_top_ops); > -- > 2.18.0.321.gffc6fa0e3 > > -- > You received this message because you are subscribed to the Google Groups "linux-sunxi" group. > To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe@googlegroups.com. > To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20190614164324.9427-6-jagan%40amarulasolutions.com. > For more options, visit https://groups.google.com/d/optout.
On Sun, Jun 16, 2019 at 11:01 AM Chen-Yu Tsai <wens@csie.org> wrote: > > On Sat, Jun 15, 2019 at 12:44 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > TCON TOP have clock gates for TV0, TV1, dsi and right > > now these are register during bind call. > > > > Of which, dsi clock gate would required during DPHY probe > > but same can miss to get since tcon top is not bound at > > that time. > > > > To solve, this circular dependency move the clock gate > > registration from bind to probe so-that DPHY can get the > > dsi gate clock on time. > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > --- > > drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 94 ++++++++++++++------------ > > 1 file changed, 49 insertions(+), 45 deletions(-) > > > > diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > index 465e9b0cdfee..a8978b3fe851 100644 > > --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > @@ -124,7 +124,53 @@ static struct clk_hw *sun8i_tcon_top_register_gate(struct device *dev, > > static int sun8i_tcon_top_bind(struct device *dev, struct device *master, > > void *data) > > { > > - struct platform_device *pdev = to_platform_device(dev); > > + struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); > > + int ret; > > + > > + ret = reset_control_deassert(tcon_top->rst); > > + if (ret) { > > + dev_err(dev, "Could not deassert ctrl reset control\n"); > > + return ret; > > + } > > + > > + ret = clk_prepare_enable(tcon_top->bus); > > + if (ret) { > > + dev_err(dev, "Could not enable bus clock\n"); > > + goto err_assert_reset; > > + } > > You have to de-assert the reset control and enable the clock before the > clocks it provides are registered. Otherwise a consumer may come in and > ask for the provided clock to be enabled, but since the TCON TOP's own > reset and clock are still disabled, you can't actually access the registers > that controls the provided clock. These rst and bus are common reset and bus clocks not tcon top clocks that are trying to register here. ie reason I have not moved it in top.
On Fri, Jun 14, 2019 at 10:13:20PM +0530, Jagan Teki wrote: > TCON TOP have clock gates for TV0, TV1, dsi and right > now these are register during bind call. > > Of which, dsi clock gate would required during DPHY probe > but same can miss to get since tcon top is not bound at > that time. > > To solve, this circular dependency move the clock gate > registration from bind to probe so-that DPHY can get the > dsi gate clock on time. It's not really clear to me what the circular dependency is? if you have a chain that is: tcon-top +-> DSI +-> D-PHY There's no loop, right? Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
On Mon, Jun 17, 2019 at 7:45 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > On Fri, Jun 14, 2019 at 10:13:20PM +0530, Jagan Teki wrote: > > TCON TOP have clock gates for TV0, TV1, dsi and right > > now these are register during bind call. > > > > Of which, dsi clock gate would required during DPHY probe > > but same can miss to get since tcon top is not bound at > > that time. > > > > To solve, this circular dependency move the clock gate > > registration from bind to probe so-that DPHY can get the > > dsi gate clock on time. > > It's not really clear to me what the circular dependency is? > > if you have a chain that is: > > tcon-top +-> DSI > +-> D-PHY > > There's no loop, right? Looking at how the DTSI patch structures things (without going into whether it is correct or accurate): The D-PHY is not part of the component graph. However it requests the DSI gate clock from the TCON-TOP. The TCON-TOP driver, in its current form, only registers the clocks it provides at component bind time. Thus the D-PHY can't successfully probe until the TCON-TOP has been bound. The DSI interface requires the D-PHY to bind. It will return -EPROBE_DEFER if it cannot request it. This in turn goes into the error path of component_bind_all, which unbinds all previous components. So it's actually D-PHY -> TCON-TOP -> DSI ^ | |-------------------- I've not checked, but I suspect there's no possibility of having other drivers probe (to deal with deferred probing) within component_bind_all. Otherwise we shouldn't run into this weird circular dependency issue. So the question for Jagan is that is this indeed the case? Does this patch solve it, or at least work around it. ChenYu
On Mon, Jun 17, 2019 at 09:01:33PM +0800, Chen-Yu Tsai wrote: > On Mon, Jun 17, 2019 at 7:45 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > > > On Fri, Jun 14, 2019 at 10:13:20PM +0530, Jagan Teki wrote: > > > TCON TOP have clock gates for TV0, TV1, dsi and right > > > now these are register during bind call. > > > > > > Of which, dsi clock gate would required during DPHY probe > > > but same can miss to get since tcon top is not bound at > > > that time. > > > > > > To solve, this circular dependency move the clock gate > > > registration from bind to probe so-that DPHY can get the > > > dsi gate clock on time. > > > > It's not really clear to me what the circular dependency is? > > > > if you have a chain that is: > > > > tcon-top +-> DSI > > +-> D-PHY > > > > There's no loop, right? > > Looking at how the DTSI patch structures things (without going into > whether it is correct or accurate): > > The D-PHY is not part of the component graph. However it requests > the DSI gate clock from the TCON-TOP. > > The TCON-TOP driver, in its current form, only registers the clocks > it provides at component bind time. Thus the D-PHY can't successfully > probe until the TCON-TOP has been bound. > > The DSI interface requires the D-PHY to bind. It will return -EPROBE_DEFER > if it cannot request it. This in turn goes into the error path of > component_bind_all, which unbinds all previous components. > > So it's actually > > D-PHY -> TCON-TOP -> DSI > ^ | > |-------------------- > > I've not checked, but I suspect there's no possibility of having other > drivers probe (to deal with deferred probing) within component_bind_all. > Otherwise we shouldn't run into this weird circular dependency issue. > Ah, yes, that makes sense. It should be cleraer in the commit log then. Thanks! Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
On Mon, Jun 17, 2019 at 6:31 PM Chen-Yu Tsai <wens@csie.org> wrote: > > On Mon, Jun 17, 2019 at 7:45 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > > > On Fri, Jun 14, 2019 at 10:13:20PM +0530, Jagan Teki wrote: > > > TCON TOP have clock gates for TV0, TV1, dsi and right > > > now these are register during bind call. > > > > > > Of which, dsi clock gate would required during DPHY probe > > > but same can miss to get since tcon top is not bound at > > > that time. > > > > > > To solve, this circular dependency move the clock gate > > > registration from bind to probe so-that DPHY can get the > > > dsi gate clock on time. > > > > It's not really clear to me what the circular dependency is? > > > > if you have a chain that is: > > > > tcon-top +-> DSI > > +-> D-PHY > > > > There's no loop, right? > > Looking at how the DTSI patch structures things (without going into > whether it is correct or accurate): > > The D-PHY is not part of the component graph. However it requests > the DSI gate clock from the TCON-TOP. > > The TCON-TOP driver, in its current form, only registers the clocks > it provides at component bind time. Thus the D-PHY can't successfully > probe until the TCON-TOP has been bound. > > The DSI interface requires the D-PHY to bind. It will return -EPROBE_DEFER > if it cannot request it. This in turn goes into the error path of > component_bind_all, which unbinds all previous components. > > So it's actually > > D-PHY -> TCON-TOP -> DSI > ^ | > |-------------------- > > I've not checked, but I suspect there's no possibility of having other > drivers probe (to deal with deferred probing) within component_bind_all. > Otherwise we shouldn't run into this weird circular dependency issue. > > So the question for Jagan is that is this indeed the case? Does this > patch solve it, or at least work around it. Yes, this is what I was mentioned in initial version, since the "dsi" gate in tcon top is registering during bind, the dphy of dsi controller won't get the associated clock for "mod" so it is keep on returning -EPROBE_DEFER. By moving the clock gate registration to probe, everything bound as expected.
On Mon, Jun 17, 2019 at 6:30 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > On Sun, Jun 16, 2019 at 11:01 AM Chen-Yu Tsai <wens@csie.org> wrote: > > > > On Sat, Jun 15, 2019 at 12:44 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > TCON TOP have clock gates for TV0, TV1, dsi and right > > > now these are register during bind call. > > > > > > Of which, dsi clock gate would required during DPHY probe > > > but same can miss to get since tcon top is not bound at > > > that time. > > > > > > To solve, this circular dependency move the clock gate > > > registration from bind to probe so-that DPHY can get the > > > dsi gate clock on time. > > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > --- > > > drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 94 ++++++++++++++------------ > > > 1 file changed, 49 insertions(+), 45 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > index 465e9b0cdfee..a8978b3fe851 100644 > > > --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > @@ -124,7 +124,53 @@ static struct clk_hw *sun8i_tcon_top_register_gate(struct device *dev, > > > static int sun8i_tcon_top_bind(struct device *dev, struct device *master, > > > void *data) > > > { > > > - struct platform_device *pdev = to_platform_device(dev); > > > + struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); > > > + int ret; > > > + > > > + ret = reset_control_deassert(tcon_top->rst); > > > + if (ret) { > > > + dev_err(dev, "Could not deassert ctrl reset control\n"); > > > + return ret; > > > + } > > > + > > > + ret = clk_prepare_enable(tcon_top->bus); > > > + if (ret) { > > > + dev_err(dev, "Could not enable bus clock\n"); > > > + goto err_assert_reset; > > > + } > > > > You have to de-assert the reset control and enable the clock before the > > clocks it provides are registered. Otherwise a consumer may come in and > > ask for the provided clock to be enabled, but since the TCON TOP's own > > reset and clock are still disabled, you can't actually access the registers > > that controls the provided clock. > > These rst and bus are common reset and bus clocks not tcon top clocks > that are trying to register here. ie reason I have not moved it in > top. And you're sure that toggling bits in the TCON TOP block doesn't require the reset to be de-asserted and the bus clock enabled? Somehow I doubt that. Once the driver register the clocks it provides, they absolutely must work. They can't only work after the bind phase when the reset gets de-asserted and the bus clock enabled. Or you should provide proper error reporting in the clock ops. I doubt you want to go that way either. ChenYu
On Tue, Jun 18, 2019 at 3:12 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > On Mon, Jun 17, 2019 at 6:31 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > On Mon, Jun 17, 2019 at 7:45 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > > > > > On Fri, Jun 14, 2019 at 10:13:20PM +0530, Jagan Teki wrote: > > > > TCON TOP have clock gates for TV0, TV1, dsi and right > > > > now these are register during bind call. > > > > > > > > Of which, dsi clock gate would required during DPHY probe > > > > but same can miss to get since tcon top is not bound at > > > > that time. > > > > > > > > To solve, this circular dependency move the clock gate > > > > registration from bind to probe so-that DPHY can get the > > > > dsi gate clock on time. > > > > > > It's not really clear to me what the circular dependency is? > > > > > > if you have a chain that is: > > > > > > tcon-top +-> DSI > > > +-> D-PHY > > > > > > There's no loop, right? > > > > Looking at how the DTSI patch structures things (without going into > > whether it is correct or accurate): > > > > The D-PHY is not part of the component graph. However it requests > > the DSI gate clock from the TCON-TOP. > > > > The TCON-TOP driver, in its current form, only registers the clocks > > it provides at component bind time. Thus the D-PHY can't successfully > > probe until the TCON-TOP has been bound. > > > > The DSI interface requires the D-PHY to bind. It will return -EPROBE_DEFER > > if it cannot request it. This in turn goes into the error path of > > component_bind_all, which unbinds all previous components. > > > > So it's actually > > > > D-PHY -> TCON-TOP -> DSI > > ^ | > > |-------------------- > > > > I've not checked, but I suspect there's no possibility of having other > > drivers probe (to deal with deferred probing) within component_bind_all. > > Otherwise we shouldn't run into this weird circular dependency issue. > > > > So the question for Jagan is that is this indeed the case? Does this > > patch solve it, or at least work around it. > > Yes, this is what I was mentioned in initial version, since the "dsi" > gate in tcon top is registering during bind, the dphy of dsi > controller won't get the associated clock for "mod" so it is keep on > returning -EPROBE_DEFER. By moving the clock gate registration to > probe, everything bound as expected. I believe you failed to mention the DSI block, which is the part that completes the circular dependency. Don't expect others to have full awareness of the context. You have to provide it in your commit log. ChenYu
On Tue, Jun 18, 2019 at 12:49 PM Chen-Yu Tsai <wens@csie.org> wrote: > > On Mon, Jun 17, 2019 at 6:30 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > On Sun, Jun 16, 2019 at 11:01 AM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > On Sat, Jun 15, 2019 at 12:44 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > TCON TOP have clock gates for TV0, TV1, dsi and right > > > > now these are register during bind call. > > > > > > > > Of which, dsi clock gate would required during DPHY probe > > > > but same can miss to get since tcon top is not bound at > > > > that time. > > > > > > > > To solve, this circular dependency move the clock gate > > > > registration from bind to probe so-that DPHY can get the > > > > dsi gate clock on time. > > > > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > --- > > > > drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 94 ++++++++++++++------------ > > > > 1 file changed, 49 insertions(+), 45 deletions(-) > > > > > > > > diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > index 465e9b0cdfee..a8978b3fe851 100644 > > > > --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > @@ -124,7 +124,53 @@ static struct clk_hw *sun8i_tcon_top_register_gate(struct device *dev, > > > > static int sun8i_tcon_top_bind(struct device *dev, struct device *master, > > > > void *data) > > > > { > > > > - struct platform_device *pdev = to_platform_device(dev); > > > > + struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); > > > > + int ret; > > > > + > > > > + ret = reset_control_deassert(tcon_top->rst); > > > > + if (ret) { > > > > + dev_err(dev, "Could not deassert ctrl reset control\n"); > > > > + return ret; > > > > + } > > > > + > > > > + ret = clk_prepare_enable(tcon_top->bus); > > > > + if (ret) { > > > > + dev_err(dev, "Could not enable bus clock\n"); > > > > + goto err_assert_reset; > > > > + } > > > > > > You have to de-assert the reset control and enable the clock before the > > > clocks it provides are registered. Otherwise a consumer may come in and > > > ask for the provided clock to be enabled, but since the TCON TOP's own > > > reset and clock are still disabled, you can't actually access the registers > > > that controls the provided clock. > > > > These rst and bus are common reset and bus clocks not tcon top clocks > > that are trying to register here. ie reason I have not moved it in > > top. > > And you're sure that toggling bits in the TCON TOP block doesn't require > the reset to be de-asserted and the bus clock enabled? > > Somehow I doubt that. > > Once the driver register the clocks it provides, they absolutely must work. > They can't only work after the bind phase when the reset gets de-asserted > and the bus clock enabled. Or you should provide proper error reporting > in the clock ops. I doubt you want to go that way either. Why would they won't work after bind phase? unlike tcon top gates, these reset, and bus are common like what we have in other DE block so enable them in bind won't be an issue as per as I understand. let me know if you want me to check in other directions. Log: [ 1.381410] sun6i-mipi-dsi 1ca0000.dsi: Attached panel s070wv20-ct16-icn62 [ 1.398405] sun4i-drm display-engine: bound 1100000.mixer (ops 0xc074ce64) [ 1.407134] sun4i-drm display-engine: bound 1200000.mixer (ops 0xc074ce64) [ 1.414043] sun4i-drm display-engine: bound 1c70000.tcon-top (ops 0xc0750e80) [ 1.421407] sun4i_dclk_recalc_rate: val = 1, rate = 297000000 [ 1.427358] sun4i-drm display-engine: No panel or bridge found... RGB output disabled [ 1.435217] sun4i-drm display-engine: bound 1c71000.lcd-controller (ops 0xc0749594) [ 1.442891] 0.0 drm_connector_init [ 1.446294] 0. -1066106880-1-0 (null) [ 1.449965] 0.1 drm_connector_init [ 1.453368] 0.2 drm_connector_init [ 1.456768] 1. drm_connector_init [ 1.460094] 2. drm_connector_init [ 1.463413] drm_connector_init: connector name = DSI-1 [ 1.468560] sun4i-drm display-engine: bound 1ca0000.dsi (ops 0xc074c0e4) [ 1.475272] [drm] Supports vblank timestamp caching Rev 2 (21.10.2013). [ 1.481892] [drm] No driver support for vblank timestamp query. [ 1.488240] [drm] Initialized sun4i-drm 1.0.0 20150629 for display-engine on minor 0 [ 1.497996] sun4i_dclk_round_rate: min_div = 6 max_div = 6, rate = 30000000 [ 1.498106] ideal = 1800000, rounded = 180000000 [ 1.498111] sun4i_dclk_round_rate: div = 6 rate = 29700000 [ 1.498116] sun4i_dclk_round_rate: min_div = 6 max_div = 6, rate = 30000000 [ 1.498154] ideal = 1800000, rounded = 180000000 [ 1.498158] sun4i_dclk_round_rate: div = 6 rate = 29700000 [ 1.498217] sun4i_dclk_recalc_rate: val = 1, rate = 178200000 [ 1.498251] rate = 178200000 [ 1.498253] parent_rate = 297000000 [ 1.498256] reg = 0x80c00000 [ 1.498259] _nkm.n = 3, nkm->n.offset = 0x1, nkm->n.shift = 8 [ 1.498262] _nkm.k = 2, nkm->k.offset = 0x1, nkm->k.shift = 4 [ 1.498265] _nkm.m = 10, nkm->m.offset = 0x1, nkm->m.shift = 0 [ 1.499594] sun4i_dclk_set_rate div 6 [ 1.499603] sun4i_dclk_recalc_rate: val = 6, rate = 29700000 [ 1.499680] sun6i_dsi_get_video_start_delay: delay = 513 [ 1.499687] sun6i_dsi_setup_inst_loop: delay = 49 [ 1.499706] hsa = 134, hbp = 114, hfp = 114, hblk = 2630, vblk = 0 [ 1.509103] mmc0: host does not support reading read-only switch, assuming write-enable [ 1.512693] mmc0: new high speed SDHC card at address 4001 [ 1.513723] mmcblk0: mmc0:4001 R04GS 3.71 GiB [ 1.515577] mmcblk0: p1 p2 [ 1.658838] mmc2: new DDR MMC card at address 0001 [ 1.659934] mmcblk2: mmc2:0001 8WPD3R 7.28 GiB [ 1.660657] mmcblk2boot0: mmc2:0001 8WPD3R partition 1 4.00 MiB [ 1.661387] mmcblk2boot1: mmc2:0001 8WPD3R partition 2 4.00 MiB [ 1.819586] TYPE#0x23, BYTE0#0x7a00, BYTE1#0xc10000 [ 1.849570] TYPE#0x23, BYTE0#0x2000, BYTE1#0x200000 [ 1.879569] TYPE#0x23, BYTE0#0x2100, BYTE1#0xe00000 [ 1.909580] TYPE#0x23, BYTE0#0x2200, BYTE1#0x130000 [ 1.939569] TYPE#0x23, BYTE0#0x2300, BYTE1#0x280000 [ 1.969569] TYPE#0x23, BYTE0#0x2400, BYTE1#0x300000 [ 1.999569] TYPE#0x23, BYTE0#0x2500, BYTE1#0x280000 [ 2.029569] TYPE#0x23, BYTE0#0x2600, BYTE1#0x0 [ 2.059569] TYPE#0x23, BYTE0#0x2700, BYTE1#0xd0000 [ 2.089598] TYPE#0x23, BYTE0#0x2800, BYTE1#0x30000 [ 2.119579] TYPE#0x23, BYTE0#0x2900, BYTE1#0x1d0000 [ 2.149569] TYPE#0x23, BYTE0#0x3400, BYTE1#0x800000 [ 2.179569] TYPE#0x23, BYTE0#0x3600, BYTE1#0x280000 [ 2.209569] TYPE#0x23, BYTE0#0xb500, BYTE1#0xa00000 [ 2.239569] TYPE#0x23, BYTE0#0x5c00, BYTE1#0xff0000 [ 2.269569] TYPE#0x23, BYTE0#0x2a00, BYTE1#0x10000 [ 2.299569] TYPE#0x23, BYTE0#0x5600, BYTE1#0x920000 [ 2.329578] TYPE#0x23, BYTE0#0x6b00, BYTE1#0x710000 [ 2.359569] TYPE#0x23, BYTE0#0x6900, BYTE1#0x2b0000 [ 2.389569] TYPE#0x23, BYTE0#0x1000, BYTE1#0x400000 [ 2.419569] TYPE#0x23, BYTE0#0x1100, BYTE1#0x980000 [ 2.449569] TYPE#0x23, BYTE0#0xb600, BYTE1#0x200000 [ 2.479569] TYPE#0x23, BYTE0#0x5100, BYTE1#0x200000 [ 2.509569] TYPE#0x23, BYTE0#0x900, BYTE1#0x100000 [ 2.679570] TYPE#0x5, BYTE0#0x2900, BYTE1#0x940000 [ 2.767213] Console: switching to colour frame buffer device 100x30 [ 3.144604] sun4i-drm display-engine: fb0: sun4i-drmdrmfb frame buffer device
On Tue, Jun 18, 2019 at 12:53 PM Chen-Yu Tsai <wens@csie.org> wrote: > > On Tue, Jun 18, 2019 at 3:12 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > On Mon, Jun 17, 2019 at 6:31 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > On Mon, Jun 17, 2019 at 7:45 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > > > > > > > On Fri, Jun 14, 2019 at 10:13:20PM +0530, Jagan Teki wrote: > > > > > TCON TOP have clock gates for TV0, TV1, dsi and right > > > > > now these are register during bind call. > > > > > > > > > > Of which, dsi clock gate would required during DPHY probe > > > > > but same can miss to get since tcon top is not bound at > > > > > that time. > > > > > > > > > > To solve, this circular dependency move the clock gate > > > > > registration from bind to probe so-that DPHY can get the > > > > > dsi gate clock on time. > > > > > > > > It's not really clear to me what the circular dependency is? > > > > > > > > if you have a chain that is: > > > > > > > > tcon-top +-> DSI > > > > +-> D-PHY > > > > > > > > There's no loop, right? > > > > > > Looking at how the DTSI patch structures things (without going into > > > whether it is correct or accurate): > > > > > > The D-PHY is not part of the component graph. However it requests > > > the DSI gate clock from the TCON-TOP. > > > > > > The TCON-TOP driver, in its current form, only registers the clocks > > > it provides at component bind time. Thus the D-PHY can't successfully > > > probe until the TCON-TOP has been bound. > > > > > > The DSI interface requires the D-PHY to bind. It will return -EPROBE_DEFER > > > if it cannot request it. This in turn goes into the error path of > > > component_bind_all, which unbinds all previous components. > > > > > > So it's actually > > > > > > D-PHY -> TCON-TOP -> DSI > > > ^ | > > > |-------------------- > > > > > > I've not checked, but I suspect there's no possibility of having other > > > drivers probe (to deal with deferred probing) within component_bind_all. > > > Otherwise we shouldn't run into this weird circular dependency issue. > > > > > > So the question for Jagan is that is this indeed the case? Does this > > > patch solve it, or at least work around it. > > > > Yes, this is what I was mentioned in initial version, since the "dsi" > > gate in tcon top is registering during bind, the dphy of dsi > > controller won't get the associated clock for "mod" so it is keep on > > returning -EPROBE_DEFER. By moving the clock gate registration to > > probe, everything bound as expected. > > I believe you failed to mention the DSI block, which is the part that > completes the circular dependency. Don't expect others to have full > awareness of the context. You have to provide it in your commit log. I have mentioned DPHY and yes it is possible to give more information will update in next version, no problem. thanks for mentioning that.
On Tue, Jun 18, 2019 at 3:45 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > On Tue, Jun 18, 2019 at 12:49 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > On Mon, Jun 17, 2019 at 6:30 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > On Sun, Jun 16, 2019 at 11:01 AM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > On Sat, Jun 15, 2019 at 12:44 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > TCON TOP have clock gates for TV0, TV1, dsi and right > > > > > now these are register during bind call. > > > > > > > > > > Of which, dsi clock gate would required during DPHY probe > > > > > but same can miss to get since tcon top is not bound at > > > > > that time. > > > > > > > > > > To solve, this circular dependency move the clock gate > > > > > registration from bind to probe so-that DPHY can get the > > > > > dsi gate clock on time. > > > > > > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > > --- > > > > > drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 94 ++++++++++++++------------ > > > > > 1 file changed, 49 insertions(+), 45 deletions(-) > > > > > > > > > > diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > > index 465e9b0cdfee..a8978b3fe851 100644 > > > > > --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > > +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > > @@ -124,7 +124,53 @@ static struct clk_hw *sun8i_tcon_top_register_gate(struct device *dev, > > > > > static int sun8i_tcon_top_bind(struct device *dev, struct device *master, > > > > > void *data) > > > > > { > > > > > - struct platform_device *pdev = to_platform_device(dev); > > > > > + struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); > > > > > + int ret; > > > > > + > > > > > + ret = reset_control_deassert(tcon_top->rst); > > > > > + if (ret) { > > > > > + dev_err(dev, "Could not deassert ctrl reset control\n"); > > > > > + return ret; > > > > > + } > > > > > + > > > > > + ret = clk_prepare_enable(tcon_top->bus); > > > > > + if (ret) { > > > > > + dev_err(dev, "Could not enable bus clock\n"); > > > > > + goto err_assert_reset; > > > > > + } > > > > > > > > You have to de-assert the reset control and enable the clock before the > > > > clocks it provides are registered. Otherwise a consumer may come in and > > > > ask for the provided clock to be enabled, but since the TCON TOP's own > > > > reset and clock are still disabled, you can't actually access the registers > > > > that controls the provided clock. > > > > > > These rst and bus are common reset and bus clocks not tcon top clocks > > > that are trying to register here. ie reason I have not moved it in > > > top. > > > > And you're sure that toggling bits in the TCON TOP block doesn't require > > the reset to be de-asserted and the bus clock enabled? > > > > Somehow I doubt that. > > > > Once the driver register the clocks it provides, they absolutely must work. > > They can't only work after the bind phase when the reset gets de-asserted > > and the bus clock enabled. Or you should provide proper error reporting > > in the clock ops. I doubt you want to go that way either. > > Why would they won't work after bind phase? unlike tcon top gates, > these reset, and bus are common like what we have in other DE block > so enable them in bind won't be an issue as per as I understand. let > me know if you want me to check in other directions. You misunderstood. When you moved the clock registering parts to the probe phase, but didn't move the clock enable and reset de-assert parts to go with, the clock ops will not work as expected between probe and bind time. Simple way to verify it: Just use devmem to disable the TCON TOP bus gate and/or assert its reset control. Then try to toggle any of the bits in the TCON TOP block and see if it works, or if the bits stick. Whether another driver actually does so is not the question. It is just bad implementation. > Log: > [ 1.381410] sun6i-mipi-dsi 1ca0000.dsi: Attached panel s070wv20-ct16-icn62 > [ 1.398405] sun4i-drm display-engine: bound 1100000.mixer (ops 0xc074ce64) > [ 1.407134] sun4i-drm display-engine: bound 1200000.mixer (ops 0xc074ce64) > [ 1.414043] sun4i-drm display-engine: bound 1c70000.tcon-top (ops 0xc0750e80) > [ 1.421407] sun4i_dclk_recalc_rate: val = 1, rate = 297000000 > [ 1.427358] sun4i-drm display-engine: No panel or bridge found... > RGB output disabled > [ 1.435217] sun4i-drm display-engine: bound 1c71000.lcd-controller > (ops 0xc0749594) > [ 1.442891] 0.0 drm_connector_init > [ 1.446294] 0. -1066106880-1-0 (null) > [ 1.449965] 0.1 drm_connector_init > [ 1.453368] 0.2 drm_connector_init > [ 1.456768] 1. drm_connector_init > [ 1.460094] 2. drm_connector_init > [ 1.463413] drm_connector_init: connector name = DSI-1 > [ 1.468560] sun4i-drm display-engine: bound 1ca0000.dsi (ops 0xc074c0e4) > [ 1.475272] [drm] Supports vblank timestamp caching Rev 2 (21.10.2013). > [ 1.481892] [drm] No driver support for vblank timestamp query. > [ 1.488240] [drm] Initialized sun4i-drm 1.0.0 20150629 for > display-engine on minor 0 > [ 1.497996] sun4i_dclk_round_rate: min_div = 6 max_div = 6, rate = 30000000 > [ 1.498106] ideal = 1800000, rounded = 180000000 > [ 1.498111] sun4i_dclk_round_rate: div = 6 rate = 29700000 > [ 1.498116] sun4i_dclk_round_rate: min_div = 6 max_div = 6, rate = 30000000 > [ 1.498154] ideal = 1800000, rounded = 180000000 > [ 1.498158] sun4i_dclk_round_rate: div = 6 rate = 29700000 > [ 1.498217] sun4i_dclk_recalc_rate: val = 1, rate = 178200000 > [ 1.498251] rate = 178200000 > [ 1.498253] parent_rate = 297000000 > [ 1.498256] reg = 0x80c00000 > [ 1.498259] _nkm.n = 3, nkm->n.offset = 0x1, nkm->n.shift = 8 > [ 1.498262] _nkm.k = 2, nkm->k.offset = 0x1, nkm->k.shift = 4 > [ 1.498265] _nkm.m = 10, nkm->m.offset = 0x1, nkm->m.shift = 0 > [ 1.499594] sun4i_dclk_set_rate div 6 > [ 1.499603] sun4i_dclk_recalc_rate: val = 6, rate = 29700000 > [ 1.499680] sun6i_dsi_get_video_start_delay: delay = 513 > [ 1.499687] sun6i_dsi_setup_inst_loop: delay = 49 > [ 1.499706] hsa = 134, hbp = 114, hfp = 114, hblk = 2630, vblk = 0 > [ 1.509103] mmc0: host does not support reading read-only switch, > assuming write-enable > [ 1.512693] mmc0: new high speed SDHC card at address 4001 > [ 1.513723] mmcblk0: mmc0:4001 R04GS 3.71 GiB > [ 1.515577] mmcblk0: p1 p2 > [ 1.658838] mmc2: new DDR MMC card at address 0001 > [ 1.659934] mmcblk2: mmc2:0001 8WPD3R 7.28 GiB > [ 1.660657] mmcblk2boot0: mmc2:0001 8WPD3R partition 1 4.00 MiB > [ 1.661387] mmcblk2boot1: mmc2:0001 8WPD3R partition 2 4.00 MiB > [ 1.819586] TYPE#0x23, BYTE0#0x7a00, BYTE1#0xc10000 > [ 1.849570] TYPE#0x23, BYTE0#0x2000, BYTE1#0x200000 > [ 1.879569] TYPE#0x23, BYTE0#0x2100, BYTE1#0xe00000 > [ 1.909580] TYPE#0x23, BYTE0#0x2200, BYTE1#0x130000 > [ 1.939569] TYPE#0x23, BYTE0#0x2300, BYTE1#0x280000 > [ 1.969569] TYPE#0x23, BYTE0#0x2400, BYTE1#0x300000 > [ 1.999569] TYPE#0x23, BYTE0#0x2500, BYTE1#0x280000 > [ 2.029569] TYPE#0x23, BYTE0#0x2600, BYTE1#0x0 > [ 2.059569] TYPE#0x23, BYTE0#0x2700, BYTE1#0xd0000 > [ 2.089598] TYPE#0x23, BYTE0#0x2800, BYTE1#0x30000 > [ 2.119579] TYPE#0x23, BYTE0#0x2900, BYTE1#0x1d0000 > [ 2.149569] TYPE#0x23, BYTE0#0x3400, BYTE1#0x800000 > [ 2.179569] TYPE#0x23, BYTE0#0x3600, BYTE1#0x280000 > [ 2.209569] TYPE#0x23, BYTE0#0xb500, BYTE1#0xa00000 > [ 2.239569] TYPE#0x23, BYTE0#0x5c00, BYTE1#0xff0000 > [ 2.269569] TYPE#0x23, BYTE0#0x2a00, BYTE1#0x10000 > [ 2.299569] TYPE#0x23, BYTE0#0x5600, BYTE1#0x920000 > [ 2.329578] TYPE#0x23, BYTE0#0x6b00, BYTE1#0x710000 > [ 2.359569] TYPE#0x23, BYTE0#0x6900, BYTE1#0x2b0000 > [ 2.389569] TYPE#0x23, BYTE0#0x1000, BYTE1#0x400000 > [ 2.419569] TYPE#0x23, BYTE0#0x1100, BYTE1#0x980000 > [ 2.449569] TYPE#0x23, BYTE0#0xb600, BYTE1#0x200000 > [ 2.479569] TYPE#0x23, BYTE0#0x5100, BYTE1#0x200000 > [ 2.509569] TYPE#0x23, BYTE0#0x900, BYTE1#0x100000 > [ 2.679570] TYPE#0x5, BYTE0#0x2900, BYTE1#0x940000 > [ 2.767213] Console: switching to colour frame buffer device 100x30 > [ 3.144604] sun4i-drm display-engine: fb0: sun4i-drmdrmfb frame buffer device > > -- > You received this message because you are subscribed to the Google Groups "linux-sunxi" group. > To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe@googlegroups.com. > To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/CAMty3ZBUrGEi%2Be62sFe7GkXinK3q076sGLwpEVz67qeoV%2B1ZeA%40mail.gmail.com. > For more options, visit https://groups.google.com/d/optout.
On Tue, Jun 18, 2019 at 1:23 PM Chen-Yu Tsai <wens@csie.org> wrote: > > On Tue, Jun 18, 2019 at 3:45 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > On Tue, Jun 18, 2019 at 12:49 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > On Mon, Jun 17, 2019 at 6:30 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > On Sun, Jun 16, 2019 at 11:01 AM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > On Sat, Jun 15, 2019 at 12:44 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > > > TCON TOP have clock gates for TV0, TV1, dsi and right > > > > > > now these are register during bind call. > > > > > > > > > > > > Of which, dsi clock gate would required during DPHY probe > > > > > > but same can miss to get since tcon top is not bound at > > > > > > that time. > > > > > > > > > > > > To solve, this circular dependency move the clock gate > > > > > > registration from bind to probe so-that DPHY can get the > > > > > > dsi gate clock on time. > > > > > > > > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > > > --- > > > > > > drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 94 ++++++++++++++------------ > > > > > > 1 file changed, 49 insertions(+), 45 deletions(-) > > > > > > > > > > > > diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > > > index 465e9b0cdfee..a8978b3fe851 100644 > > > > > > --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > > > +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > > > @@ -124,7 +124,53 @@ static struct clk_hw *sun8i_tcon_top_register_gate(struct device *dev, > > > > > > static int sun8i_tcon_top_bind(struct device *dev, struct device *master, > > > > > > void *data) > > > > > > { > > > > > > - struct platform_device *pdev = to_platform_device(dev); > > > > > > + struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); > > > > > > + int ret; > > > > > > + > > > > > > + ret = reset_control_deassert(tcon_top->rst); > > > > > > + if (ret) { > > > > > > + dev_err(dev, "Could not deassert ctrl reset control\n"); > > > > > > + return ret; > > > > > > + } > > > > > > + > > > > > > + ret = clk_prepare_enable(tcon_top->bus); > > > > > > + if (ret) { > > > > > > + dev_err(dev, "Could not enable bus clock\n"); > > > > > > + goto err_assert_reset; > > > > > > + } > > > > > > > > > > You have to de-assert the reset control and enable the clock before the > > > > > clocks it provides are registered. Otherwise a consumer may come in and > > > > > ask for the provided clock to be enabled, but since the TCON TOP's own > > > > > reset and clock are still disabled, you can't actually access the registers > > > > > that controls the provided clock. > > > > > > > > These rst and bus are common reset and bus clocks not tcon top clocks > > > > that are trying to register here. ie reason I have not moved it in > > > > top. > > > > > > And you're sure that toggling bits in the TCON TOP block doesn't require > > > the reset to be de-asserted and the bus clock enabled? > > > > > > Somehow I doubt that. > > > > > > Once the driver register the clocks it provides, they absolutely must work. > > > They can't only work after the bind phase when the reset gets de-asserted > > > and the bus clock enabled. Or you should provide proper error reporting > > > in the clock ops. I doubt you want to go that way either. > > > > Why would they won't work after bind phase? unlike tcon top gates, > > these reset, and bus are common like what we have in other DE block > > so enable them in bind won't be an issue as per as I understand. let > > me know if you want me to check in other directions. > > You misunderstood. When you moved the clock registering parts to the probe > phase, but didn't move the clock enable and reset de-assert parts to go with, > the clock ops will not work as expected between probe and bind time. If I understand correctly, I have moved tcon clock gates, not the bus clock or the reset. Both have independent enablement phase, the bus clock is enable in tcon top bind and the clock gate ("dsi") enable in init call of phy_ops. is both bus clock and clock gates are same and related that is what you are saying? > > Simple way to verify it: Just use devmem to disable the TCON TOP bus gate > and/or assert its reset control. Then try to toggle any of the bits in the > TCON TOP block and see if it works, or if the bits stick. Yes I have verified "dsi" gate enablement before via devmem. Below is the bus, reset disablement and re-enablement and result is similar for the reset, bus clock in bind and even in probe. 00. get the existing value # devmem 0x1c70020 0x00010000 # devmem 0x1c20064 0x44021000 # devmem 0x1c202c4 0x44021000 01: disable bus, and assert reset # devmem 0x1c20064 32 0x4021000 # devmem 0x1c202c4 32 0x4021000 # devmem 0x1c20064 0x04021000 # devmem 0x1c202c4 0x04021000 # devmem 0x1c70020 0x00000000 02: enable bus, and dessert reset # devmem 0x1c20064 32 0x44021000 # devmem 0x1c202c4 32 0x44021000 # devmem 0x1c20064 0x44021000 # devmem 0x1c202c4 0x44021000 # devmem 0x1c70020 0x00000000 03: enable gate # devmem 0x1c70020 32 0x00010000 # devmem 0x1c70020 0x00010000 > > Whether another driver actually does so is not the question. It is just bad > implementation. Not sure, I understand this.
On Tue, Jun 18, 2019 at 6:34 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > On Tue, Jun 18, 2019 at 1:23 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > On Tue, Jun 18, 2019 at 3:45 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > On Tue, Jun 18, 2019 at 12:49 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > On Mon, Jun 17, 2019 at 6:30 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > On Sun, Jun 16, 2019 at 11:01 AM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > > > On Sat, Jun 15, 2019 at 12:44 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > > > > > TCON TOP have clock gates for TV0, TV1, dsi and right > > > > > > > now these are register during bind call. > > > > > > > > > > > > > > Of which, dsi clock gate would required during DPHY probe > > > > > > > but same can miss to get since tcon top is not bound at > > > > > > > that time. > > > > > > > > > > > > > > To solve, this circular dependency move the clock gate > > > > > > > registration from bind to probe so-that DPHY can get the > > > > > > > dsi gate clock on time. > > > > > > > > > > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > > > > --- > > > > > > > drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 94 ++++++++++++++------------ > > > > > > > 1 file changed, 49 insertions(+), 45 deletions(-) > > > > > > > > > > > > > > diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > > > > index 465e9b0cdfee..a8978b3fe851 100644 > > > > > > > --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > > > > +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > > > > @@ -124,7 +124,53 @@ static struct clk_hw *sun8i_tcon_top_register_gate(struct device *dev, > > > > > > > static int sun8i_tcon_top_bind(struct device *dev, struct device *master, > > > > > > > void *data) > > > > > > > { > > > > > > > - struct platform_device *pdev = to_platform_device(dev); > > > > > > > + struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); > > > > > > > + int ret; > > > > > > > + > > > > > > > + ret = reset_control_deassert(tcon_top->rst); > > > > > > > + if (ret) { > > > > > > > + dev_err(dev, "Could not deassert ctrl reset control\n"); > > > > > > > + return ret; > > > > > > > + } > > > > > > > + > > > > > > > + ret = clk_prepare_enable(tcon_top->bus); > > > > > > > + if (ret) { > > > > > > > + dev_err(dev, "Could not enable bus clock\n"); > > > > > > > + goto err_assert_reset; > > > > > > > + } > > > > > > > > > > > > You have to de-assert the reset control and enable the clock before the > > > > > > clocks it provides are registered. Otherwise a consumer may come in and > > > > > > ask for the provided clock to be enabled, but since the TCON TOP's own > > > > > > reset and clock are still disabled, you can't actually access the registers > > > > > > that controls the provided clock. > > > > > > > > > > These rst and bus are common reset and bus clocks not tcon top clocks > > > > > that are trying to register here. ie reason I have not moved it in > > > > > top. > > > > > > > > And you're sure that toggling bits in the TCON TOP block doesn't require > > > > the reset to be de-asserted and the bus clock enabled? > > > > > > > > Somehow I doubt that. > > > > > > > > Once the driver register the clocks it provides, they absolutely must work. > > > > They can't only work after the bind phase when the reset gets de-asserted > > > > and the bus clock enabled. Or you should provide proper error reporting > > > > in the clock ops. I doubt you want to go that way either. > > > > > > Why would they won't work after bind phase? unlike tcon top gates, > > > these reset, and bus are common like what we have in other DE block > > > so enable them in bind won't be an issue as per as I understand. let > > > me know if you want me to check in other directions. > > > > You misunderstood. When you moved the clock registering parts to the probe > > phase, but didn't move the clock enable and reset de-assert parts to go with, > > the clock ops will not work as expected between probe and bind time. > > If I understand correctly, I have moved tcon clock gates, not the bus > clock or the reset. Both have independent enablement phase, the bus > clock is enable in tcon top bind and the clock gate ("dsi") enable in > init call of phy_ops. is both bus clock and clock gates are same and > related that is what you are saying? I am saying that you may need the tcon top bus gates and resets properly configured to be able to read/write the tcon top address range. That includes enabling/disabling the clocks that the tcon top driver registers. In other words, the TCON TOP's bus gate and reset control have everything to do with what you can do within the TCON TOP block or address range. > > > > Simple way to verify it: Just use devmem to disable the TCON TOP bus gate > > and/or assert its reset control. Then try to toggle any of the bits in the > > TCON TOP block and see if it works, or if the bits stick. > > Yes I have verified "dsi" gate enablement before via devmem. Below is > the bus, reset disablement and re-enablement and result is similar for > the reset, bus clock in bind and even in probe. > > 00. get the existing value > > # devmem 0x1c70020 > 0x00010000 > # devmem 0x1c20064 > 0x44021000 > # devmem 0x1c202c4 > 0x44021000 > > 01: disable bus, and assert reset > > # devmem 0x1c20064 32 0x4021000 > # devmem 0x1c202c4 32 0x4021000 > # devmem 0x1c20064 > 0x04021000 > # devmem 0x1c202c4 > 0x04021000 > # devmem 0x1c70020 > 0x00000000 See here. The value became 0 when it was still 0x10000 in the previous phase. Any guesses to why this happened, assuming you didn't touch it? Now if you keep the bus gate disabled and the reset control asserted, and try to write some non-zero value to 0x1c70020, and read it back, does the value stick? If you don't have the bus gate enabled and the reset control de-asserted, any operations you do to the TCON TOP is essentially not happening. Including bit operations that the clocks you registered are required to do. Get what I'm saying? You need to have the bus gate enabled and the reset control de-asserted BEFORE you register the clocks you are providing, or something is going to go very wrong. Worst case scenario: the reset control was left de-asserted by the bootloader but the bus gate was disabled. When you register the clocks, the CCF tries to read back the current status of the clocks, and the I/O stalls because the bus gate wasn't enabled. System stalls. Do I need to draw a time flow chart for you? Also see the very simple example: https://elixir.bootlin.com/linux/latest/source/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c#L113 where the bus gate is enabled before registering the clocks. This hardware block doesn't have a reset control for it, but the same principle applies. > 02: enable bus, and dessert reset > > # devmem 0x1c20064 32 0x44021000 > # devmem 0x1c202c4 32 0x44021000 > # devmem 0x1c20064 > 0x44021000 > # devmem 0x1c202c4 > 0x44021000 > # devmem 0x1c70020 > 0x00000000 And it's still zero here, meaning the reset control does have an effect on the TCON TOP registers. > 03: enable gate > > # devmem 0x1c70020 32 0x00010000 > # devmem 0x1c70020 > 0x00010000 This is irrelevant and not what I wanted you to try. > > > > Whether another driver actually does so is not the question. It is just bad > > implementation. > > Not sure, I understand this.
On Tue, Jun 18, 2019 at 4:24 PM Chen-Yu Tsai <wens@csie.org> wrote: > > On Tue, Jun 18, 2019 at 6:34 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > On Tue, Jun 18, 2019 at 1:23 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > On Tue, Jun 18, 2019 at 3:45 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > On Tue, Jun 18, 2019 at 12:49 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > On Mon, Jun 17, 2019 at 6:30 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > > > On Sun, Jun 16, 2019 at 11:01 AM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > > > > > On Sat, Jun 15, 2019 at 12:44 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > > > > > > > TCON TOP have clock gates for TV0, TV1, dsi and right > > > > > > > > now these are register during bind call. > > > > > > > > > > > > > > > > Of which, dsi clock gate would required during DPHY probe > > > > > > > > but same can miss to get since tcon top is not bound at > > > > > > > > that time. > > > > > > > > > > > > > > > > To solve, this circular dependency move the clock gate > > > > > > > > registration from bind to probe so-that DPHY can get the > > > > > > > > dsi gate clock on time. > > > > > > > > > > > > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > > > > > --- > > > > > > > > drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 94 ++++++++++++++------------ > > > > > > > > 1 file changed, 49 insertions(+), 45 deletions(-) > > > > > > > > > > > > > > > > diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > > > > > index 465e9b0cdfee..a8978b3fe851 100644 > > > > > > > > --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > > > > > +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > > > > > @@ -124,7 +124,53 @@ static struct clk_hw *sun8i_tcon_top_register_gate(struct device *dev, > > > > > > > > static int sun8i_tcon_top_bind(struct device *dev, struct device *master, > > > > > > > > void *data) > > > > > > > > { > > > > > > > > - struct platform_device *pdev = to_platform_device(dev); > > > > > > > > + struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); > > > > > > > > + int ret; > > > > > > > > + > > > > > > > > + ret = reset_control_deassert(tcon_top->rst); > > > > > > > > + if (ret) { > > > > > > > > + dev_err(dev, "Could not deassert ctrl reset control\n"); > > > > > > > > + return ret; > > > > > > > > + } > > > > > > > > + > > > > > > > > + ret = clk_prepare_enable(tcon_top->bus); > > > > > > > > + if (ret) { > > > > > > > > + dev_err(dev, "Could not enable bus clock\n"); > > > > > > > > + goto err_assert_reset; > > > > > > > > + } > > > > > > > > > > > > > > You have to de-assert the reset control and enable the clock before the > > > > > > > clocks it provides are registered. Otherwise a consumer may come in and > > > > > > > ask for the provided clock to be enabled, but since the TCON TOP's own > > > > > > > reset and clock are still disabled, you can't actually access the registers > > > > > > > that controls the provided clock. > > > > > > > > > > > > These rst and bus are common reset and bus clocks not tcon top clocks > > > > > > that are trying to register here. ie reason I have not moved it in > > > > > > top. > > > > > > > > > > And you're sure that toggling bits in the TCON TOP block doesn't require > > > > > the reset to be de-asserted and the bus clock enabled? > > > > > > > > > > Somehow I doubt that. > > > > > > > > > > Once the driver register the clocks it provides, they absolutely must work. > > > > > They can't only work after the bind phase when the reset gets de-asserted > > > > > and the bus clock enabled. Or you should provide proper error reporting > > > > > in the clock ops. I doubt you want to go that way either. > > > > > > > > Why would they won't work after bind phase? unlike tcon top gates, > > > > these reset, and bus are common like what we have in other DE block > > > > so enable them in bind won't be an issue as per as I understand. let > > > > me know if you want me to check in other directions. > > > > > > You misunderstood. When you moved the clock registering parts to the probe > > > phase, but didn't move the clock enable and reset de-assert parts to go with, > > > the clock ops will not work as expected between probe and bind time. > > > > If I understand correctly, I have moved tcon clock gates, not the bus > > clock or the reset. Both have independent enablement phase, the bus > > clock is enable in tcon top bind and the clock gate ("dsi") enable in > > init call of phy_ops. is both bus clock and clock gates are same and > > related that is what you are saying? > > I am saying that you may need the tcon top bus gates and resets properly > configured to be able to read/write the tcon top address range. That includes > enabling/disabling the clocks that the tcon top driver registers. > > In other words, the TCON TOP's bus gate and reset control have everything to do > with what you can do within the TCON TOP block or address range. > > > > > > > Simple way to verify it: Just use devmem to disable the TCON TOP bus gate > > > and/or assert its reset control. Then try to toggle any of the bits in the > > > TCON TOP block and see if it works, or if the bits stick. > > > > Yes I have verified "dsi" gate enablement before via devmem. Below is > > the bus, reset disablement and re-enablement and result is similar for > > the reset, bus clock in bind and even in probe. > > > > 00. get the existing value > > > > # devmem 0x1c70020 > > 0x00010000 > > # devmem 0x1c20064 > > 0x44021000 > > # devmem 0x1c202c4 > > 0x44021000 > > > > 01: disable bus, and assert reset > > > > # devmem 0x1c20064 32 0x4021000 > > # devmem 0x1c202c4 32 0x4021000 > > # devmem 0x1c20064 > > 0x04021000 > > # devmem 0x1c202c4 > > 0x04021000 > > # devmem 0x1c70020 > > 0x00000000 > > See here. The value became 0 when it was still 0x10000 in the previous phase. > Any guesses to why this happened, assuming you didn't touch it? Yes, I didn't touch anything here. and it indeed expected since the bus and reset line goes disabled and asserted. > > Now if you keep the bus gate disabled and the reset control asserted, and > try to write some non-zero value to 0x1c70020, and read it back, does the > value stick? No, value is not stick. what ever I wrote on on 0x1c70020 it is not taking. > > If you don't have the bus gate enabled and the reset control de-asserted, > any operations you do to the TCON TOP is essentially not happening. Including > bit operations that the clocks you registered are required to do. > > Get what I'm saying? I understand it, the for accessing tcon space we have bus and reset line to be enabled and desserted. But the thing is I didn't see any difference in the behavior even If I enable or deassert the bus and reset in probe or in bind. The devmem numbers which I have listed above is same for both the cases, one with this patch and another one is handle via probe https://paste.ubuntu.com/p/ndHj9wHzvX/ > > You need to have the bus gate enabled and the reset control de-asserted > BEFORE you register the clocks you are providing, or something is going > to go very wrong. > > Worst case scenario: the reset control was left de-asserted by the bootloader > but the bus gate was disabled. When you register the clocks, the CCF tries > to read back the current status of the clocks, and the I/O stalls because > the bus gate wasn't enabled. System stalls. > > Do I need to draw a time flow chart for you? Sure, please. > > Also see the very simple example: > > https://elixir.bootlin.com/linux/latest/source/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c#L113 > > where the bus gate is enabled before registering the clocks. This hardware > block doesn't have a reset control for it, but the same principle applies. Got it, thanks.
On Fri, Jun 21, 2019 at 12:24 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > On Tue, Jun 18, 2019 at 4:24 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > On Tue, Jun 18, 2019 at 6:34 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > On Tue, Jun 18, 2019 at 1:23 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > On Tue, Jun 18, 2019 at 3:45 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > On Tue, Jun 18, 2019 at 12:49 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > > > On Mon, Jun 17, 2019 at 6:30 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > > > > > On Sun, Jun 16, 2019 at 11:01 AM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > > > > > > > On Sat, Jun 15, 2019 at 12:44 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > > > > > > > > > TCON TOP have clock gates for TV0, TV1, dsi and right > > > > > > > > > now these are register during bind call. > > > > > > > > > > > > > > > > > > Of which, dsi clock gate would required during DPHY probe > > > > > > > > > but same can miss to get since tcon top is not bound at > > > > > > > > > that time. > > > > > > > > > > > > > > > > > > To solve, this circular dependency move the clock gate > > > > > > > > > registration from bind to probe so-that DPHY can get the > > > > > > > > > dsi gate clock on time. > > > > > > > > > > > > > > > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > > > > > > > > --- > > > > > > > > > drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 94 ++++++++++++++------------ > > > > > > > > > 1 file changed, 49 insertions(+), 45 deletions(-) > > > > > > > > > > > > > > > > > > diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > > > > > > index 465e9b0cdfee..a8978b3fe851 100644 > > > > > > > > > --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > > > > > > +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > > > > > > > > > @@ -124,7 +124,53 @@ static struct clk_hw *sun8i_tcon_top_register_gate(struct device *dev, > > > > > > > > > static int sun8i_tcon_top_bind(struct device *dev, struct device *master, > > > > > > > > > void *data) > > > > > > > > > { > > > > > > > > > - struct platform_device *pdev = to_platform_device(dev); > > > > > > > > > + struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); > > > > > > > > > + int ret; > > > > > > > > > + > > > > > > > > > + ret = reset_control_deassert(tcon_top->rst); > > > > > > > > > + if (ret) { > > > > > > > > > + dev_err(dev, "Could not deassert ctrl reset control\n"); > > > > > > > > > + return ret; > > > > > > > > > + } > > > > > > > > > + > > > > > > > > > + ret = clk_prepare_enable(tcon_top->bus); > > > > > > > > > + if (ret) { > > > > > > > > > + dev_err(dev, "Could not enable bus clock\n"); > > > > > > > > > + goto err_assert_reset; > > > > > > > > > + } > > > > > > > > > > > > > > > > You have to de-assert the reset control and enable the clock before the > > > > > > > > clocks it provides are registered. Otherwise a consumer may come in and > > > > > > > > ask for the provided clock to be enabled, but since the TCON TOP's own > > > > > > > > reset and clock are still disabled, you can't actually access the registers > > > > > > > > that controls the provided clock. > > > > > > > > > > > > > > These rst and bus are common reset and bus clocks not tcon top clocks > > > > > > > that are trying to register here. ie reason I have not moved it in > > > > > > > top. > > > > > > > > > > > > And you're sure that toggling bits in the TCON TOP block doesn't require > > > > > > the reset to be de-asserted and the bus clock enabled? > > > > > > > > > > > > Somehow I doubt that. > > > > > > > > > > > > Once the driver register the clocks it provides, they absolutely must work. > > > > > > They can't only work after the bind phase when the reset gets de-asserted > > > > > > and the bus clock enabled. Or you should provide proper error reporting > > > > > > in the clock ops. I doubt you want to go that way either. > > > > > > > > > > Why would they won't work after bind phase? unlike tcon top gates, > > > > > these reset, and bus are common like what we have in other DE block > > > > > so enable them in bind won't be an issue as per as I understand. let > > > > > me know if you want me to check in other directions. > > > > > > > > You misunderstood. When you moved the clock registering parts to the probe > > > > phase, but didn't move the clock enable and reset de-assert parts to go with, > > > > the clock ops will not work as expected between probe and bind time. > > > > > > If I understand correctly, I have moved tcon clock gates, not the bus > > > clock or the reset. Both have independent enablement phase, the bus > > > clock is enable in tcon top bind and the clock gate ("dsi") enable in > > > init call of phy_ops. is both bus clock and clock gates are same and > > > related that is what you are saying? > > > > I am saying that you may need the tcon top bus gates and resets properly > > configured to be able to read/write the tcon top address range. That includes > > enabling/disabling the clocks that the tcon top driver registers. > > > > In other words, the TCON TOP's bus gate and reset control have everything to do > > with what you can do within the TCON TOP block or address range. > > > > > > > > > > Simple way to verify it: Just use devmem to disable the TCON TOP bus gate > > > > and/or assert its reset control. Then try to toggle any of the bits in the > > > > TCON TOP block and see if it works, or if the bits stick. > > > > > > Yes I have verified "dsi" gate enablement before via devmem. Below is > > > the bus, reset disablement and re-enablement and result is similar for > > > the reset, bus clock in bind and even in probe. > > > > > > 00. get the existing value > > > > > > # devmem 0x1c70020 > > > 0x00010000 > > > # devmem 0x1c20064 > > > 0x44021000 > > > # devmem 0x1c202c4 > > > 0x44021000 > > > > > > 01: disable bus, and assert reset > > > > > > # devmem 0x1c20064 32 0x4021000 > > > # devmem 0x1c202c4 32 0x4021000 > > > # devmem 0x1c20064 > > > 0x04021000 > > > # devmem 0x1c202c4 > > > 0x04021000 > > > # devmem 0x1c70020 > > > 0x00000000 > > > > See here. The value became 0 when it was still 0x10000 in the previous phase. > > Any guesses to why this happened, assuming you didn't touch it? > > Yes, I didn't touch anything here. and it indeed expected since the > bus and reset line goes disabled and asserted. OK. So you understand what's going on in the hardware. > > > > Now if you keep the bus gate disabled and the reset control asserted, and > > try to write some non-zero value to 0x1c70020, and read it back, does the > > value stick? > > No, value is not stick. what ever I wrote on on 0x1c70020 it is not taking. Yes. And that is expected since the reset is asserted. > > > > If you don't have the bus gate enabled and the reset control de-asserted, > > any operations you do to the TCON TOP is essentially not happening. Including > > bit operations that the clocks you registered are required to do. > > > > Get what I'm saying? > > I understand it, the for accessing tcon space we have bus and reset > line to be enabled and desserted. But the thing is I didn't see any > difference in the behavior even If I enable or deassert the bus and > reset in probe or in bind. You mean the display pipeline bind as usual, regardless of whether you reset in probe or in bind, right? That is because the TCON and DSI blocks bind _after_ the TCON TOP block. The display component is traversed breadth first, and components bind in that order. What I'm trying to tell you is not that the display pipeline will stop working, but that you have a problem with how you use the API in the TCON TOP driver. When you call clk_hw_register_gate(), you are saying that from this point onward, the clock that got registered is available and will work properly, or it will return an error if not. That is not the case here. Because the TCON TOP reset control is deasserted and the bus clock enabled much later, right _now_ any attempts to control the newly registered gate will silently fail, because writes to the register do not go through. > The devmem numbers which I have listed above is same for both the > cases, one with this patch and another one is handle via probe > https://paste.ubuntu.com/p/ndHj9wHzvX/ > > > > > You need to have the bus gate enabled and the reset control de-asserted > > BEFORE you register the clocks you are providing, or something is going > > to go very wrong. > > > > Worst case scenario: the reset control was left de-asserted by the bootloader > > but the bus gate was disabled. When you register the clocks, the CCF tries > > to read back the current status of the clocks, and the I/O stalls because > > the bus gate wasn't enabled. System stalls. > > > > Do I need to draw a time flow chart for you? > > Sure, please. tcon top probe tcon top bind --[--------------|-]------------>-------[------|--------]-------------> | | clk_hw_register_gate() | reset_control_deassert() clk_prepare_enable() So the above is what is happening with your patch: Between the two square bracket blocks, if any consumer tries to use the clocks created by clk_hw_register_gate(), it will silently fail, because the function calls enabling the TCON TOP block happen much later. Again, the problem is not that the display pipeline stops working. Instead it is more fundamental: the code is not living up to the API contract that it declared it is following. There is also another register/unregister mismatch in this driver. You moved clk_hw_register_gate(), but the corresponding clk_hw_unregister_gate() calls that need to happen are still in the unbind function. So if I were to probe but not bind the driver, and then subsequently remove the driver, it would be leaking the registered clocks. (At this point the clocks might not even have code backing them, since I might have removed the module. I'm not sure if that's possible.) If I try to probe the driver again, it will fail because it tries to register clocks with the same names as the ones leaked in the previous round. ChenYu > > Also see the very simple example: > > > > https://elixir.bootlin.com/linux/latest/source/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c#L113 > > > > where the bus gate is enabled before registering the clocks. This hardware > > block doesn't have a reset control for it, but the same principle applies. > > Got it, thanks.
diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c index 465e9b0cdfee..a8978b3fe851 100644 --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c @@ -124,7 +124,53 @@ static struct clk_hw *sun8i_tcon_top_register_gate(struct device *dev, static int sun8i_tcon_top_bind(struct device *dev, struct device *master, void *data) { - struct platform_device *pdev = to_platform_device(dev); + struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); + int ret; + + ret = reset_control_deassert(tcon_top->rst); + if (ret) { + dev_err(dev, "Could not deassert ctrl reset control\n"); + return ret; + } + + ret = clk_prepare_enable(tcon_top->bus); + if (ret) { + dev_err(dev, "Could not enable bus clock\n"); + goto err_assert_reset; + } + + return 0; + +err_assert_reset: + reset_control_assert(tcon_top->rst); + + return ret; +} + +static void sun8i_tcon_top_unbind(struct device *dev, struct device *master, + void *data) +{ + struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); + struct clk_hw_onecell_data *clk_data = tcon_top->clk_data; + int i; + + of_clk_del_provider(dev->of_node); + for (i = 0; i < CLK_NUM; i++) + if (clk_data->hws[i]) + clk_hw_unregister_gate(clk_data->hws[i]); + + clk_disable_unprepare(tcon_top->bus); + reset_control_assert(tcon_top->rst); +} + +static const struct component_ops sun8i_tcon_top_ops = { + .bind = sun8i_tcon_top_bind, + .unbind = sun8i_tcon_top_unbind, +}; + +static int sun8i_tcon_top_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; struct clk_hw_onecell_data *clk_data; struct sun8i_tcon_top *tcon_top; const struct sun8i_tcon_top_quirks *quirks; @@ -132,7 +178,7 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, void __iomem *regs; int ret, i; - quirks = of_device_get_match_data(&pdev->dev); + quirks = of_device_get_match_data(dev); tcon_top = devm_kzalloc(dev, sizeof(*tcon_top), GFP_KERNEL); if (!tcon_top) @@ -164,18 +210,6 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, if (IS_ERR(regs)) return PTR_ERR(regs); - ret = reset_control_deassert(tcon_top->rst); - if (ret) { - dev_err(dev, "Could not deassert ctrl reset control\n"); - return ret; - } - - ret = clk_prepare_enable(tcon_top->bus); - if (ret) { - dev_err(dev, "Could not enable bus clock\n"); - goto err_assert_reset; - } - /* * At least on H6, some registers have some bits set by default * which may cause issues. Clear them here. @@ -226,45 +260,15 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, dev_set_drvdata(dev, tcon_top); - return 0; + return component_add(dev, &sun8i_tcon_top_ops); err_unregister_gates: for (i = 0; i < CLK_NUM; i++) if (!IS_ERR_OR_NULL(clk_data->hws[i])) clk_hw_unregister_gate(clk_data->hws[i]); - clk_disable_unprepare(tcon_top->bus); -err_assert_reset: - reset_control_assert(tcon_top->rst); - return ret; } -static void sun8i_tcon_top_unbind(struct device *dev, struct device *master, - void *data) -{ - struct sun8i_tcon_top *tcon_top = dev_get_drvdata(dev); - struct clk_hw_onecell_data *clk_data = tcon_top->clk_data; - int i; - - of_clk_del_provider(dev->of_node); - for (i = 0; i < CLK_NUM; i++) - if (clk_data->hws[i]) - clk_hw_unregister_gate(clk_data->hws[i]); - - clk_disable_unprepare(tcon_top->bus); - reset_control_assert(tcon_top->rst); -} - -static const struct component_ops sun8i_tcon_top_ops = { - .bind = sun8i_tcon_top_bind, - .unbind = sun8i_tcon_top_unbind, -}; - -static int sun8i_tcon_top_probe(struct platform_device *pdev) -{ - return component_add(&pdev->dev, &sun8i_tcon_top_ops); -} - static int sun8i_tcon_top_remove(struct platform_device *pdev) { component_del(&pdev->dev, &sun8i_tcon_top_ops);
TCON TOP have clock gates for TV0, TV1, dsi and right now these are register during bind call. Of which, dsi clock gate would required during DPHY probe but same can miss to get since tcon top is not bound at that time. To solve, this circular dependency move the clock gate registration from bind to probe so-that DPHY can get the dsi gate clock on time. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 94 ++++++++++++++------------ 1 file changed, 49 insertions(+), 45 deletions(-)