| From 9de4afd649e4d0da4b19c053d8b2d06ee1fecf3b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 11 Jan 2022 10:52:53 +0100 |
| Subject: phy: amlogic: phy-meson-gxl-usb2: fix shared reset controller use |
| |
| From: Amjad Ouled-Ameur <aouledameur@baylibre.com> |
| |
| [ Upstream commit 2f87727130ce17ffefecd0895eeebf22d5a36f6f ] |
| |
| 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> |
| Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> |
| Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> |
| Acked-by: Neil Armstrong <narmstrong@baylibre.com> |
| Link: https://lore.kernel.org/r/20220111095255.176141-2-aouledameur@baylibre.com |
| Signed-off-by: Vinod Koul <vkoul@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/phy/amlogic/phy-meson-gxl-usb2.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/phy/amlogic/phy-meson-gxl-usb2.c b/drivers/phy/amlogic/phy-meson-gxl-usb2.c |
| index 2b3c0d730f20..db17c3448bfe 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; |
| } |
| @@ -125,6 +127,7 @@ static int phy_meson_gxl_usb2_exit(struct phy *phy) |
| struct phy_meson_gxl_usb2_priv *priv = phy_get_drvdata(phy); |
| |
| clk_disable_unprepare(priv->clk); |
| + reset_control_rearm(priv->reset); |
| |
| return 0; |
| } |
| -- |
| 2.35.1 |
| |
