]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.1-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Sep 2025 06:43:34 +0000 (08:43 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Sep 2025 06:43:34 +0000 (08:43 +0200)
added patches:
revert-net-usb-asix-ax88772-drop-phylink-use-in-pm-to-avoid-mdio-runtime-pm-wakeups.patch

queue-6.1/revert-net-usb-asix-ax88772-drop-phylink-use-in-pm-to-avoid-mdio-runtime-pm-wakeups.patch [new file with mode: 0644]
queue-6.1/series

diff --git a/queue-6.1/revert-net-usb-asix-ax88772-drop-phylink-use-in-pm-to-avoid-mdio-runtime-pm-wakeups.patch b/queue-6.1/revert-net-usb-asix-ax88772-drop-phylink-use-in-pm-to-avoid-mdio-runtime-pm-wakeups.patch
new file mode 100644 (file)
index 0000000..5960329
--- /dev/null
@@ -0,0 +1,56 @@
+From 63a796558bc22ec699e4193d5c75534757ddf2e6 Mon Sep 17 00:00:00 2001
+From: Paolo Abeni <pabeni@redhat.com>
+Date: Thu, 11 Sep 2025 16:33:31 +0200
+Subject: Revert "net: usb: asix: ax88772: drop phylink use in PM to avoid MDIO runtime PM wakeups"
+
+From: Paolo Abeni <pabeni@redhat.com>
+
+commit 63a796558bc22ec699e4193d5c75534757ddf2e6 upstream.
+
+This reverts commit 5537a4679403 ("net: usb: asix: ax88772: drop
+phylink use in PM to avoid MDIO runtime PM wakeups"), it breaks
+operation of asix ethernet usb dongle after system suspend-resume
+cycle.
+
+Link: https://lore.kernel.org/all/b5ea8296-f981-445d-a09a-2f389d7f6fdd@samsung.com/
+Fixes: 5537a4679403 ("net: usb: asix: ax88772: drop phylink use in PM to avoid MDIO runtime PM wakeups")
+Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
+Acked-by: Jakub Kicinski <kuba@kernel.org>
+Link: https://patch.msgid.link/2945b9dbadb8ee1fee058b19554a5cb14f1763c1.1757601118.git.pabeni@redhat.com
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/usb/asix_devices.c |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/drivers/net/usb/asix_devices.c
++++ b/drivers/net/usb/asix_devices.c
+@@ -607,8 +607,15 @@ static const struct net_device_ops ax887
+ static void ax88772_suspend(struct usbnet *dev)
+ {
++      struct asix_common_private *priv = dev->driver_priv;
+       u16 medium;
++      if (netif_running(dev->net)) {
++              rtnl_lock();
++              phylink_suspend(priv->phylink, false);
++              rtnl_unlock();
++      }
++
+       /* Stop MAC operation */
+       medium = asix_read_medium_status(dev, 1);
+       medium &= ~AX_MEDIUM_RE;
+@@ -637,6 +644,12 @@ static void ax88772_resume(struct usbnet
+       for (i = 0; i < 3; i++)
+               if (!priv->reset(dev, 1))
+                       break;
++
++      if (netif_running(dev->net)) {
++              rtnl_lock();
++              phylink_resume(priv->phylink);
++              rtnl_unlock();
++      }
+ }
+ static int asix_resume(struct usb_interface *intf)
index cc4100f79c606311e258e067fdd05d69c681cc64..7acc14e98aff688003fa5b83f247b991cd2c6605 100644 (file)
@@ -42,3 +42,4 @@ kernfs-fix-uaf-in-polling-when-open-file-is-released.patch
 mm-memory-failure-fix-vm_bug_on_page-pagepoisoned-page-when-unpoison-memory.patch
 input-iqs7222-avoid-enabling-unused-interrupts.patch
 input-i8042-add-tuxedo-infinitybook-pro-gen10-amd-to-i8042-quirk-table.patch
+revert-net-usb-asix-ax88772-drop-phylink-use-in-pm-to-avoid-mdio-runtime-pm-wakeups.patch