diff mbox series

[REPOST,net-next,2/2] r8152: Wake up the system if the we need a reset

Message ID 66590f25.170a0220.8b5ad.1752@mx.google.com
State New
Headers show
Series [REPOST,net-next,1/2] r8152: If inaccessible at resume time, issue a reset | expand

Commit Message

Doug Anderson May 30, 2024, 11:43 p.m. UTC
If we get to the end of the r8152's suspend() routine and we find that
the USB device is INACCESSIBLE then it means that some of our
preparation for suspend didn't take place. We need a USB reset to get
ourselves back in a consistent state so we can try again and that
can't happen during system suspend. Call pm_wakeup_event() to wake the
system up in this case.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
---

 drivers/net/usb/r8152.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Hayes Wang June 3, 2024, 6:39 a.m. UTC | #1
Douglas Anderson <dianders@chromium.org>
> Sent: Friday, May 31, 2024 7:43 AM
[...]
> If we get to the end of the r8152's suspend() routine and we find that
> the USB device is INACCESSIBLE then it means that some of our
> preparation for suspend didn't take place. We need a USB reset to get
> ourselves back in a consistent state so we can try again and that
> can't happen during system suspend. Call pm_wakeup_event() to wake the
> system up in this case.
> 
> Signed-off-by: Douglas Anderson <dianders@chromium.org>

Acked-by: Hayes Wang <hayeswang@realtek.com>

Best Regards,
Hayes
diff mbox series

Patch

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 6a3f4b2114ee..09fe70bc45d4 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -8647,6 +8647,13 @@  static int rtl8152_system_suspend(struct r8152 *tp)
 		tasklet_enable(&tp->tx_tl);
 	}
 
+	/* If we're inaccessible here then some of the work that we did to
+	 * get the adapter ready for suspend didn't work. Queue up a wakeup
+	 * event so we can try again.
+	 */
+	if (test_bit(RTL8152_INACCESSIBLE, &tp->flags))
+		pm_wakeup_event(&tp->udev->dev, 0);
+
 	return 0;
 }