Re: [PATCH net-next 1/2] r8152: split rtl8152_resume function

[Oliver Neukum]

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