From patchwork Mon Dec 7 16:58:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Wu X-Patchwork-Id: 553460 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1C55D140291 for ; Tue, 8 Dec 2015 03:59:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=lekensteyn.nl header.i=@lekensteyn.nl header.b=iE77WQCe; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756154AbbLGQ66 (ORCPT ); Mon, 7 Dec 2015 11:58:58 -0500 Received: from lekensteyn.nl ([178.21.112.251]:51304 "EHLO lekensteyn.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753663AbbLGQ65 (ORCPT ); Mon, 7 Dec 2015 11:58:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lekensteyn.nl; s=s2048-2015-q1; h=Message-Id:Date:Subject:Cc:To:From; bh=8USS96Aw/4jwlUUT3I3PQlGgQpSIrMaSoC3NKXdhg54=; b=iE77WQCenmfJ7HRYGZ/f7pXRehY3hPHPyTrTizmfiLVfMmo12lzTnmwHQmSXQwfGclfaDTCHzc5Xqy2YMsfWkaAshcOvdMRXh/54uFMIg5rhTn3xBHNuXOOi0RHzYw0ECn0lDfB9ldaQGz8l023GkQX8axS8+toyJkgFzi/GH+qb6/oO8JqgjiLwA2QTjhte0VM8BPV/2NGONmdL/P75vuobVqgLheam56ba0UhqSyV3eSJmsc2pE5pK8BpJDrxvB2YEqNYKii3iI2Jx+zfyl5s4vCED7laP8/g2rnfdhZ5cIXKubCjIQyU1fFaYodzkkCSX5DF+LXRDzOJBQOxc0w==; Received: by lekensteyn.nl with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.84) (envelope-from ) id 1a5z7d-0000Mo-MI; Mon, 07 Dec 2015 17:58:46 +0100 From: Peter Wu To: "David S . Miller" , hayeswang , linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Lu Baolu Subject: [PATCH] r8152: fix lockup when runtime PM is enabled Date: Mon, 7 Dec 2015 17:58:40 +0100 Message-Id: <1449507520-10671-1-git-send-email-peter@lekensteyn.nl> X-Mailer: git-send-email 2.6.3 X-Spam-Score: 0.0 (/) X-Spam-Status: No, hits=0.0 required=5.0 tests=NO_RELAYS=-0.001, URIBL_BLOCKED=0.001 autolearn=no autolearn_force=no Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When an interface is brought up which was previously suspended (via runtime PM), it would hang. This happens because napi_disable is called before napi_enable. Solve this by avoiding napi_disable before the device is fully up. While at it, remove WORK_ENABLE check from rtl8152_open (introduced with the original change) because it cannot happen: - After this patch, runtime resume will not set it during rtl8152_open. - When link is up, rtl8152_open is not called. - When link is down during system/auto suspend/resume, it is not set. Fixes: 41cec84cf285 ("r8152: don't enable napi before rx ready") Link: https://lkml.kernel.org/r/20151205105912.GA1766@al Signed-off-by: Peter Wu --- drivers/net/usb/r8152.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index d9427ca..b8b083e 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -3067,17 +3067,6 @@ static int rtl8152_open(struct net_device *netdev) mutex_lock(&tp->control); - /* The WORK_ENABLE may be set when autoresume occurs */ - if (test_bit(WORK_ENABLE, &tp->flags)) { - clear_bit(WORK_ENABLE, &tp->flags); - usb_kill_urb(tp->intr_urb); - cancel_delayed_work_sync(&tp->schedule); - - /* disable the tx/rx, if the workqueue has enabled them. */ - if (netif_carrier_ok(netdev)) - tp->rtl_ops.disable(tp); - } - tp->rtl_ops.up(tp); rtl8152_set_speed(tp, AUTONEG_ENABLE, @@ -3516,11 +3505,13 @@ static int rtl8152_resume(struct usb_interface *intf) if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) { rtl_runtime_suspend_enable(tp, false); clear_bit(SELECTIVE_SUSPEND, &tp->flags); - napi_disable(&tp->napi); - set_bit(WORK_ENABLE, &tp->flags); - if (netif_carrier_ok(tp->netdev)) - rtl_start_rx(tp); - napi_enable(&tp->napi); + if (tp->netdev->flags & IFF_UP) { + napi_disable(&tp->napi); + set_bit(WORK_ENABLE, &tp->flags); + if (netif_carrier_ok(tp->netdev)) + rtl_start_rx(tp); + napi_enable(&tp->napi); + } } else { tp->rtl_ops.up(tp); rtl8152_set_speed(tp, AUTONEG_ENABLE,