git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 63a796558bc22ec699e4193d5c75534757ddf2e6 Mon Sep 17 00:00:00 2001
   2 From: Paolo Abeni <pabeni@redhat.com>
   3 Date: Thu, 11 Sep 2025 16:33:31 +0200
   4 Subject: Revert "net: usb: asix: ax88772: drop phylink use in PM to avoid MDIO runtime PM wakeups"
   5
   6 From: Paolo Abeni <pabeni@redhat.com>
   7
   8 commit 63a796558bc22ec699e4193d5c75534757ddf2e6 upstream.
   9
  10 This reverts commit 5537a4679403 ("net: usb: asix: ax88772: drop
  11 phylink use in PM to avoid MDIO runtime PM wakeups"), it breaks
  12 operation of asix ethernet usb dongle after system suspend-resume
  13 cycle.
  14
  15 Link: https://lore.kernel.org/all/b5ea8296-f981-445d-a09a-2f389d7f6fdd@samsung.com/
  16 Fixes: 5537a4679403 ("net: usb: asix: ax88772: drop phylink use in PM to avoid MDIO runtime PM wakeups")
  17 Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
  18 Acked-by: Jakub Kicinski <kuba@kernel.org>
  19 Link: https://patch.msgid.link/2945b9dbadb8ee1fee058b19554a5cb14f1763c1.1757601118.git.pabeni@redhat.com
  20 Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  21 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  22 ---
  23  drivers/net/usb/asix_devices.c |   13 +++++++++++++
  24  1 file changed, 13 insertions(+)
  25
  26 --- a/drivers/net/usb/asix_devices.c
  27 +++ b/drivers/net/usb/asix_devices.c
  28 @@ -607,8 +607,15 @@ static const struct net_device_ops ax887
  29
  30  static void ax88772_suspend(struct usbnet *dev)
  31  {
  32 +       struct asix_common_private *priv = dev->driver_priv;
  33         u16 medium;
  34
  35 +       if (netif_running(dev->net)) {
  36 +               rtnl_lock();
  37 +               phylink_suspend(priv->phylink, false);
  38 +               rtnl_unlock();
  39 +       }
  40 +
  41         /* Stop MAC operation */
  42         medium = asix_read_medium_status(dev, 1);
  43         medium &= ~AX_MEDIUM_RE;
  44 @@ -637,6 +644,12 @@ static void ax88772_resume(struct usbnet
  45         for (i = 0; i < 3; i++)
  46                 if (!priv->reset(dev, 1))
  47                         break;
  48 +
  49 +       if (netif_running(dev->net)) {
  50 +               rtnl_lock();
  51 +               phylink_resume(priv->phylink);
  52 +               rtnl_unlock();
  53 +       }
  54  }
  55
  56  static int asix_resume(struct usb_interface *intf)