| Message ID | 20201113000508.14702-2-aouledameur@baylibre.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | usb: meson: fix shared reset control use | expand |
Hi Amjad, On Fri, Nov 13, 2020 at 1:06 AM Amjad Ouled-Ameur <aouledameur@baylibre.com> wrote: [...] > @@ -124,6 +126,7 @@ static int phy_meson_gxl_usb2_exit(struct phy *phy) > { > struct phy_meson_gxl_usb2_priv *priv = phy_get_drvdata(phy); > > + reset_control_rearm(priv->reset); please move reset_control_rearm after clk_disable_unprepare as mentioned on the other patch to clean things up in reverse order of initialization > clk_disable_unprepare(priv->clk); Thank you Martin
Hi Martin, On 14/11/2020 20:13, Martin Blumenstingl wrote: > Hi Amjad, > > On Fri, Nov 13, 2020 at 1:06 AM Amjad Ouled-Ameur > <aouledameur@baylibre.com> wrote: > [...] >> @@ -124,6 +126,7 @@ static int phy_meson_gxl_usb2_exit(struct phy *phy) >> { >> struct phy_meson_gxl_usb2_priv *priv = phy_get_drvdata(phy); >> >> + reset_control_rearm(priv->reset); > please move reset_control_rearm after clk_disable_unprepare as > mentioned on the other patch to clean things up in reverse order of > initialization Agreed, will fix it in next change ! > >> clk_disable_unprepare(priv->clk); > > Thank you > Martin > Thank you for the feedback ! Best, Amjad
diff --git a/drivers/phy/amlogic/phy-meson-gxl-usb2.c b/drivers/phy/amlogic/phy-meson-gxl-usb2.c index 43ec9bf24abf..e366c0b1e339 100644 --- a/drivers/phy/amlogic/phy-meson-gxl-usb2.c +++ b/drivers/phy/amlogic/phy-meson-gxl-usb2.c @@ -114,8 +114,10 @@ static int phy_meson_gxl_usb2_init(struct phy *phy) return ret; ret = clk_prepare_enable(priv->clk); - if (ret) + if (ret) { + reset_control_rearm(priv->reset); return ret; + } return 0; } @@ -124,6 +126,7 @@ static int phy_meson_gxl_usb2_exit(struct phy *phy) { struct phy_meson_gxl_usb2_priv *priv = phy_get_drvdata(phy); + reset_control_rearm(priv->reset); clk_disable_unprepare(priv->clk); return 0;
Use reset_control_rearm() call if an error occurs in case phy_meson_gxl_usb2_init() fails after reset() has been called ; or in case phy_meson_gxl_usb2_exit() is called i.e the resource is no longer used and the reset line may be triggered again by other devices. reset_control_rearm() keeps use of triggered_count sane in the reset framework. Therefore, use of reset_control_reset() on shared reset line should be balanced with reset_control_rearm(). Signed-off-by: Amjad Ouled-Ameur <aouledameur@baylibre.com> Reported-by: Jerome Brunet <jbrunet@baylibre.com> --- Important: Please DO NOT merge before this patch [0] is merged, it adds reset_control_rearm() call to the reset framework API. [0] https://lore.kernel.org/lkml/20201112230043.28987-1-aouledameur@baylib re.com/ drivers/phy/amlogic/phy-meson-gxl-usb2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)