usb: host: ehci-tegra: Correct teardown order of driver's removal
authorDmitry Osipenko <digetx@gmail.com>
Mon, 6 Jan 2020 01:33:58 +0000 (04:33 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jan 2020 10:15:31 +0000 (11:15 +0100)
I found that PHY's enable refcounting was broken and after fixing it
I also found that machine started to hang after EHCI driver module
removal. Turned out that the teardown order is incorrect because HCD must
be unregistered *before* PHY's disabling. Note that it is also not correct
to assert the shared reset during of driver's removal because PHY takes
care of resetting shared pads and thus it's better to remove that part
from the EHCI driver.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20200106013416.9604-3-digetx@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/ehci-tegra.c

index 4d2cdec..32483be 100644 (file)
@@ -521,16 +521,10 @@ static int tegra_ehci_remove(struct platform_device *pdev)
        struct tegra_ehci_hcd *tegra =
                (struct tegra_ehci_hcd *)hcd_to_ehci(hcd)->priv;
 
+       usb_remove_hcd(hcd);
        otg_set_host(hcd->usb_phy->otg, NULL);
-
        usb_phy_shutdown(hcd->usb_phy);
-       usb_remove_hcd(hcd);
-
-       reset_control_assert(tegra->rst);
-       udelay(1);
-
        clk_disable_unprepare(tegra->clk);
-
        usb_put_hcd(hcd);
 
        return 0;