Merge branch 'r8152-fix-autosuspend'

Hayes Wang says:

====================
r8152: fix autosuspend issue

Avoid rx is split into two parts when runtime suspend occurs.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 64 insertions, 16 deletions

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 7dc61228c55b..be418563cb18 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -3576,39 +3576,87 @@ static bool delay_autosuspend(struct r8152 *tp)
                 return false;
 }
 
-static int rtl8152_suspend(struct usb_interface *intf, pm_message_t message)
+static int rtl8152_rumtime_suspend(struct r8152 *tp)
 {
-        struct r8152 *tp = usb_get_intfdata(intf);
         struct net_device *netdev = tp->netdev;
         int ret = 0;
 
-        mutex_lock(&tp->control);
+        if (netif_running(netdev) && test_bit(WORK_ENABLE, &tp->flags)) {
+                u32 rcr = 0;
 
-        if (PMSG_IS_AUTO(message)) {
-                if (netif_running(netdev) && delay_autosuspend(tp)) {
+                if (delay_autosuspend(tp)) {
                         ret = -EBUSY;
                         goto out1;
                 }
 
-                set_bit(SELECTIVE_SUSPEND, &tp->flags);
-        } else {
-                netif_device_detach(netdev);
+                if (netif_carrier_ok(netdev)) {
+                        u32 ocp_data;
+
+                        rcr = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
+                        ocp_data = rcr & ~RCR_ACPT_ALL;
+                        ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
+                        rxdy_gated_en(tp, true);
+                        ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA,
+                                                 PLA_OOB_CTRL);
+                        if (!(ocp_data & RXFIFO_EMPTY)) {
+                                rxdy_gated_en(tp, false);
+                                ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, rcr);
+                                ret = -EBUSY;
+                                goto out1;
+                        }
+                }
+
+                clear_bit(WORK_ENABLE, &tp->flags);
+                usb_kill_urb(tp->intr_urb);
+
+                tp->rtl_ops.autosuspend_en(tp, true);
+
+                if (netif_carrier_ok(netdev)) {
+                        napi_disable(&tp->napi);
+                        rtl_stop_rx(tp);
+                        rxdy_gated_en(tp, false);
+                        ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, rcr);
+                        napi_enable(&tp->napi);
+                }
         }
 
+        set_bit(SELECTIVE_SUSPEND, &tp->flags);
+
+out1:
+        return ret;
+}
+
+static int rtl8152_system_suspend(struct r8152 *tp)
+{
+        struct net_device *netdev = tp->netdev;
+        int ret = 0;
+
+        netif_device_detach(netdev);
+
         if (netif_running(netdev) && test_bit(WORK_ENABLE, &tp->flags)) {
                 clear_bit(WORK_ENABLE, &tp->flags);
                 usb_kill_urb(tp->intr_urb);
                 napi_disable(&tp->napi);
-                if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
-                        rtl_stop_rx(tp);
-                        tp->rtl_ops.autosuspend_en(tp, true);
-                } else {
-                        cancel_delayed_work_sync(&tp->schedule);
-                        tp->rtl_ops.down(tp);
-                }
+                cancel_delayed_work_sync(&tp->schedule);
+                tp->rtl_ops.down(tp);
                 napi_enable(&tp->napi);
         }
-out1:
+
+        return ret;
+}
+
+static int rtl8152_suspend(struct usb_interface *intf, pm_message_t message)
+{
+        struct r8152 *tp = usb_get_intfdata(intf);
+        int ret;
+
+        mutex_lock(&tp->control);
+
+        if (PMSG_IS_AUTO(message))
+                ret = rtl8152_rumtime_suspend(tp);
+        else
+                ret = rtl8152_system_suspend(tp);
+
         mutex_unlock(&tp->control);
 
         return ret;