| Message ID | 20210604134244.2467-8-o.rempel@pengutronix.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | port asix ax88772 to the PHYlib | expand |
On Sat, Jun 05, 2021 at 01:41:15AM +0200, Andrew Lunn wrote: > On Fri, Jun 04, 2021 at 03:42:44PM +0200, Oleksij Rempel wrote: > > unbind() is the proper place to disconnect PHY, but it will fail if > > netdev is already unregistered. > > O.K, this partially answers the question i was about to ask for the > previous patch. > > void phy_start(struct phy_device *phydev) > { > mutex_lock(&phydev->lock); > > if (phydev->state != PHY_READY && phydev->state != PHY_HALTED) { > WARN(1, "called from state %s\n", > phy_state_to_str(phydev->state)); > goto out; > } > > By skipping phy_error(), phydev->state is not set to PHY_HALTED. So if > you try to start the phy again, without disconnecting it, it looks > like there could be a problem. > > But with this patch, i assume the PHY will always be disconnected and > later reconnected when the device is replugged. Yes. The PHY is disconnected and the PHY driver is unbinded. Regards, Oleksij -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index ecf62849f4c1..57a5a025255c 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1597,6 +1597,9 @@ void usbnet_disconnect (struct usb_interface *intf) xdev->bus->bus_name, xdev->devpath, dev->driver_info->description); + if (dev->driver_info->unbind) + dev->driver_info->unbind(dev, intf); + net = dev->net; unregister_netdev (net); @@ -1604,9 +1607,6 @@ void usbnet_disconnect (struct usb_interface *intf) usb_scuttle_anchored_urbs(&dev->deferred); - if (dev->driver_info->unbind) - dev->driver_info->unbind (dev, intf); - usb_kill_urb(dev->interrupt); usb_free_urb(dev->interrupt); kfree(dev->padding_pkt);
unbind() is the proper place to disconnect PHY, but it will fail if netdev is already unregistered. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- drivers/net/usb/usbnet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)