From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8705C61CE8 for ; Sat, 19 Jan 2019 20:52:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B7BD62087E for ; Sat, 19 Jan 2019 20:52:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="L0r13jwO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729492AbfASUwh (ORCPT ); Sat, 19 Jan 2019 15:52:37 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:55013 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729409AbfASUwe (ORCPT ); Sat, 19 Jan 2019 15:52:34 -0500 Received: by mail-wm1-f67.google.com with SMTP id a62so7499731wmh.4 for ; Sat, 19 Jan 2019 12:52:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Xb3/gHgZ9Iasw5AVYZfMciSU70wqC413C40dpeHkc2I=; b=L0r13jwOUtkNmAAvgl/ECsrz+SP94Z+QX8EQfihfHKWqrr2yFKBcVfj3nSZVR3wFLs e1mS2f5f+9Q3bxCeDkH1Lc75wra8o5sjRDyCUbW0QIvDPSyVuQQ3zRkqu9H8wrC60RIl a+eZ/d+QwWsfw4nztRK9ppZVS2CevQHtkJA87uNyzuLJAtgPMY04aFIaKX0ZA7LFlMHF fJ5CibxcGkVglU7Qa2vaPy4TocoYenXTDa7jrfbnzWi2mqkw1ADMuxeiyIELxgMoq3zY UUClFiWG6iScnUgWIshh3UDQYd98xx9D4u486aJ3WY0ropDB5iYR343JCKjC/qwpkAz0 Xg8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Xb3/gHgZ9Iasw5AVYZfMciSU70wqC413C40dpeHkc2I=; b=kqmQ8KT+eb/fpcGzlcoxvA9JPxwHuDjur4K2N9jh87ILHyOB7XTjmqkyGNvlvJpOL+ K/K0NuV0hG9ek1x0gpGDGaZltex9BNpoEtGepLLXurCj57cPyQaiGItx8P2kj0R6qkza Vzv1CqD/vJxfWeUQwRRBzEzX0iG2JVq3Z35l5I3+5rHf21uWQASP1I/CUxHTouf86Bs+ oAizboDdRl9/BTJPI5vdJ1n//Om9aBGMrGTiEjVgTdj6iHq+OWfzQSsc2m+l1ax7tFUb Y+PfSu2ORuIihwZAb93fZdOPPYy9UmC//8o6XDfQ1dGMfUant6p+EPuFxQ0JpCGuFVHV fuuA== X-Gm-Message-State: AJcUukfXOVZZWabUYNQNZ1uuY14mgFCY7vpUNTDDdZDovUkxqiGYkruQ 5gA0X//TJY/GBZYmikhBxZC/a5I9 X-Google-Smtp-Source: ALg8bN5VdSaxAyHiDAV/SHve1DzbWkSmcKg6rQg5QdgI+/TRf4VPwferSc0MfxU6uZbDkv4QTE/vPg== X-Received: by 2002:a1c:7719:: with SMTP id t25mr20911731wmi.7.1547931152195; Sat, 19 Jan 2019 12:52:32 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:e877:8d0c:cdf0:81fd? (p200300EA8BF1E200E8778D0CCDF081FD.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:e877:8d0c:cdf0:81fd]) by smtp.googlemail.com with ESMTPSA id c10sm26411183wrr.69.2019.01.19.12.52.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 12:52:31 -0800 (PST) Subject: [PATCH net-next 6/8] r8169: reset chip synchronously in __rtl8169_resume From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <87f4c590-49ff-c3c8-9b64-4cd146e18ac6@gmail.com> Message-ID: <7f0baef9-9070-b8a7-e3a2-52faec4eeb54@gmail.com> Date: Sat, 19 Jan 2019 21:50:32 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <87f4c590-49ff-c3c8-9b64-4cd146e18ac6@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Triggering an asynchronous reset is problematic for the following reasons, therefore reset the chip synchronously. - The reset routine resets registers and parameters behind our back what may collide with code executed after triggering the reset. - __rtl8169_resume() is called as part of pm_runtime_get_sync() and callers expect that the chip is fully resumed afterwards. In context of this driver triggering an asynchronous reset should be considered an emergency procedure. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 48b5d7051..82042449d 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -6787,9 +6787,8 @@ static void __rtl8169_resume(struct net_device *dev) rtl_lock_work(tp); napi_enable(&tp->napi); set_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags); + rtl_reset_work(tp); rtl_unlock_work(tp); - - rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING); } static int rtl8169_resume(struct device *device) -- 2.20.1