Am Montag, den 12.06.2017, 16:21 +0800 schrieb Hayes Wang:
> Split rtl8152_resume() into rtl8152_runtime_resume() and
> rtl8152_system_resume().
>
> Signed-off-by: Hayes Wang <hayeswang@xxxxxxxxxxx>
> ---
> drivers/net/usb/r8152.c | 99 ++++++++++++++++++++++++++++++-------------------
> 1 file changed, 61 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
> index 5a02053..3257955 100644
> --- a/drivers/net/usb/r8152.c
> +++ b/drivers/net/usb/r8152.c
> @@ -3686,6 +3686,61 @@ static bool delay_autosuspend(struct r8152 *tp)
> return false;
> }
>
> +static int rtl8152_runtime_resume(struct r8152 *tp)
> +{
> + struct net_device *netdev = tp->netdev;
> +
> + if (netif_running(netdev) && netdev->flags & IFF_UP) {
> + struct napi_struct *napi = &tp->napi;
> +
> + tp->rtl_ops.autosuspend_en(tp, false);
> + napi_disable(napi);
> + set_bit(WORK_ENABLE, &tp->flags);
> +
> + if (netif_carrier_ok(netdev)) {
> + if (rtl8152_get_speed(tp) & LINK_STATUS) {
> + rtl_start_rx(tp);
> + } else {
> + netif_carrier_off(netdev);
> + tp->rtl_ops.disable(tp);
> + netif_info(tp, link, netdev, "linking down\n");
> + }
> + }
> +
> + napi_enable(napi);
> + clear_bit(SELECTIVE_SUSPEND, &tp->flags);
> + smp_mb__after_atomic();
> +
> + if (!list_empty(&tp->rx_done))
> + napi_schedule(&tp->napi);
> +
> + usb_submit_urb(tp->intr_urb, GFP_KERNEL);
If you ever built a device with included storage, this can deadlock,
as you may want to wake up a device for memory that is needed to wake
up a device. Use GFP_NOIO in resume() and reset_resume(), always.
Regards
Oliver
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
