From patchwork Sat May 30 21:54:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1301286 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=rGiMqF6+; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ZFjV6rfwz9sSr for ; Sun, 31 May 2020 08:00:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729340AbgE3WAN (ORCPT ); Sat, 30 May 2020 18:00:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728741AbgE3WAN (ORCPT ); Sat, 30 May 2020 18:00:13 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A56EC03E969 for ; Sat, 30 May 2020 15:00:13 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id u13so7190360wml.1 for ; Sat, 30 May 2020 15:00:12 -0700 (PDT) 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=zORDjaE+Zdr/eR99IjMCj3epoIbDCMr2hkEORPAp5U4=; b=rGiMqF6+bOIF3hB7bwVDlQYPJlt9yV9Fu9/Ml2fsqLUx8G6asGVCQeBomxTp0tq0WJ l9DqIrKXJG/w0brOxvdDMC764337CxbHDwmjW+7X7gsu/hvy5QkBWicqB9MiF7XI77br 3mSV6uItCXGxmSynmTMInR/eMFHr59uD77nyfCZvOK1kEywsM96Q4DbBf3o+EfAWaDhx nsFKhfl4Kp1fi5GZK8qfkgW/OL6IeGlWoSGYEHJvOFVsCjRe6SxU/fTSSnTz43ZjQE8B fO5FigN18aa/DcHN98V+/6GqzlCHw626vtJ7OhfZ8jWgc2rZQ6eakioQzlL0r8SdPXBg Q+MQ== 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=zORDjaE+Zdr/eR99IjMCj3epoIbDCMr2hkEORPAp5U4=; b=VDeCcCK/nR77LUR56QSe7J5BX7lY398pR0+kz7OGOO8loYbt5iSSbN3iQKp9Z1BTxe R041AJsIJfqPZxLOUN7+davYRdyTOjLPEB5YIN/NjaXkTltMqlrcxcNeQrjRE7nvHOXE qkI2qLn0GN6nOMlnFNzFUrj4vl8tlXTsDuuiKvAB7iujsKIA486bpx7TE7NvNj1rugCc amDEdPiX43Ze9DJcGzPX5yDImmDinl1+eQxHyAFbQ0hNEpiUb7U2AwjzC56nyoYsUBPt X5mPrlVz1dKi1kynonoSSxb6ZGuI7oGMLF9Awr19NualubC5CnHanSdz9TcMIQG0TlEE YAZA== X-Gm-Message-State: AOAM533lW19t3B4RX4ZudvC40bt84/VO2MuHy0eJ1FZEA/HHWCrxXJX5 X1j+UwPvDbcji4Q7KDL3b/CNqFBy X-Google-Smtp-Source: ABdhPJwpRzLpDvtPxU/SH3cqh+ww2V0f4D/80RuYYHMgGv0Py0MHZnOqfkb2Un42OhgdKQkLo65Qkw== X-Received: by 2002:a1c:5fd4:: with SMTP id t203mr13788639wmb.184.1590876011452; Sat, 30 May 2020 15:00:11 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:8c73:80e5:b6ba:d8b0? (p200300ea8f2357008c7380e5b6bad8b0.dip0.t-ipconnect.de. [2003:ea:8f23:5700:8c73:80e5:b6ba:d8b0]) by smtp.googlemail.com with ESMTPSA id 37sm15617079wrk.61.2020.05.30.15.00.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 30 May 2020 15:00:11 -0700 (PDT) Subject: [PATCH net-next 1/6] r8169: change driver data type From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: <443c14ac-24b8-58ba-05aa-3803f1e5f4ab@gmail.com> Message-ID: <29eabcd4-fd77-58f8-3091-acc607949e28@gmail.com> Date: Sat, 30 May 2020 23:54:36 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: <443c14ac-24b8-58ba-05aa-3803f1e5f4ab@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Change driver private data type to struct rtl8169_private * to avoid some overhead. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 60 ++++++++++------------- 1 file changed, 25 insertions(+), 35 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index d672ae77c..810398ef7 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4816,15 +4816,13 @@ rtl8169_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) pm_runtime_put_noidle(&pdev->dev); } -static void rtl8169_net_suspend(struct net_device *dev) +static void rtl8169_net_suspend(struct rtl8169_private *tp) { - struct rtl8169_private *tp = netdev_priv(dev); - - if (!netif_running(dev)) + if (!netif_running(tp->dev)) return; phy_stop(tp->phydev); - netif_device_detach(dev); + netif_device_detach(tp->dev); rtl_lock_work(tp); napi_disable(&tp->napi); @@ -4840,20 +4838,17 @@ static void rtl8169_net_suspend(struct net_device *dev) static int rtl8169_suspend(struct device *device) { - struct net_device *dev = dev_get_drvdata(device); - struct rtl8169_private *tp = netdev_priv(dev); + struct rtl8169_private *tp = dev_get_drvdata(device); - rtl8169_net_suspend(dev); + rtl8169_net_suspend(tp); clk_disable_unprepare(tp->clk); return 0; } -static void __rtl8169_resume(struct net_device *dev) +static void __rtl8169_resume(struct rtl8169_private *tp) { - struct rtl8169_private *tp = netdev_priv(dev); - - netif_device_attach(dev); + netif_device_attach(tp->dev); rtl_pll_power_up(tp); rtl8169_init_phy(tp); @@ -4869,23 +4864,21 @@ static void __rtl8169_resume(struct net_device *dev) static int rtl8169_resume(struct device *device) { - struct net_device *dev = dev_get_drvdata(device); - struct rtl8169_private *tp = netdev_priv(dev); + struct rtl8169_private *tp = dev_get_drvdata(device); - rtl_rar_set(tp, dev->dev_addr); + rtl_rar_set(tp, tp->dev->dev_addr); clk_prepare_enable(tp->clk); - if (netif_running(dev)) - __rtl8169_resume(dev); + if (netif_running(tp->dev)) + __rtl8169_resume(tp); return 0; } static int rtl8169_runtime_suspend(struct device *device) { - struct net_device *dev = dev_get_drvdata(device); - struct rtl8169_private *tp = netdev_priv(dev); + struct rtl8169_private *tp = dev_get_drvdata(device); if (!tp->TxDescArray) return 0; @@ -4894,7 +4887,7 @@ static int rtl8169_runtime_suspend(struct device *device) __rtl8169_set_wol(tp, WAKE_ANY); rtl_unlock_work(tp); - rtl8169_net_suspend(dev); + rtl8169_net_suspend(tp); /* Update counters before going runtime suspend */ rtl8169_update_counters(tp); @@ -4904,10 +4897,9 @@ static int rtl8169_runtime_suspend(struct device *device) static int rtl8169_runtime_resume(struct device *device) { - struct net_device *dev = dev_get_drvdata(device); - struct rtl8169_private *tp = netdev_priv(dev); + struct rtl8169_private *tp = dev_get_drvdata(device); - rtl_rar_set(tp, dev->dev_addr); + rtl_rar_set(tp, tp->dev->dev_addr); if (!tp->TxDescArray) return 0; @@ -4916,16 +4908,16 @@ static int rtl8169_runtime_resume(struct device *device) __rtl8169_set_wol(tp, tp->saved_wolopts); rtl_unlock_work(tp); - __rtl8169_resume(dev); + __rtl8169_resume(tp); return 0; } static int rtl8169_runtime_idle(struct device *device) { - struct net_device *dev = dev_get_drvdata(device); + struct rtl8169_private *tp = dev_get_drvdata(device); - if (!netif_running(dev) || !netif_carrier_ok(dev)) + if (!netif_running(tp->dev) || !netif_carrier_ok(tp->dev)) pm_schedule_suspend(device, 10000); return -EBUSY; @@ -4970,13 +4962,12 @@ static void rtl_wol_shutdown_quirk(struct rtl8169_private *tp) static void rtl_shutdown(struct pci_dev *pdev) { - struct net_device *dev = pci_get_drvdata(pdev); - struct rtl8169_private *tp = netdev_priv(dev); + struct rtl8169_private *tp = pci_get_drvdata(pdev); - rtl8169_net_suspend(dev); + rtl8169_net_suspend(tp); /* Restore original MAC address */ - rtl_rar_set(tp, dev->perm_addr); + rtl_rar_set(tp, tp->dev->perm_addr); rtl8169_hw_reset(tp); @@ -4993,13 +4984,12 @@ static void rtl_shutdown(struct pci_dev *pdev) static void rtl_remove_one(struct pci_dev *pdev) { - struct net_device *dev = pci_get_drvdata(pdev); - struct rtl8169_private *tp = netdev_priv(dev); + struct rtl8169_private *tp = pci_get_drvdata(pdev); if (pci_dev_run_wake(pdev)) pm_runtime_get_noresume(&pdev->dev); - unregister_netdev(dev); + unregister_netdev(tp->dev); if (r8168_check_dash(tp)) rtl8168_driver_stop(tp); @@ -5007,7 +4997,7 @@ static void rtl_remove_one(struct pci_dev *pdev) rtl_release_firmware(tp); /* restore original MAC address */ - rtl_rar_set(tp, dev->perm_addr); + rtl_rar_set(tp, tp->dev->perm_addr); } static const struct net_device_ops rtl_netdev_ops = { @@ -5446,7 +5436,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (!tp->counters) return -ENOMEM; - pci_set_drvdata(pdev, dev); + pci_set_drvdata(pdev, tp); rc = r8169_mdio_register(tp); if (rc) From patchwork Sat May 30 21:55:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1301287 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=bBMnXoV6; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ZFjb75cDz9sSw for ; Sun, 31 May 2020 08:00:19 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729382AbgE3WAT (ORCPT ); Sat, 30 May 2020 18:00:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728741AbgE3WAR (ORCPT ); Sat, 30 May 2020 18:00:17 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F351C03E969 for ; Sat, 30 May 2020 15:00:17 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id n5so7646796wmd.0 for ; Sat, 30 May 2020 15:00:17 -0700 (PDT) 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=crG4E3kuy2W2YxYv21NV8BPelIbycfVrq+mYiF0r58w=; b=bBMnXoV6RvCWShsWlYmuBJ/UUCMJh++fwfIPV7Zaleure8uEvpQu67u95Vf80ivSpS ZjZGMmuKAZzzHgS0ZVXO5P0+4zF/d+KmGylNl7NM+LO3KeEfFSIS//DKAGClUgUjCrkm HRaeN7HbyXvfVbfMjTBAHvyv9m6l6b5SI+CO0khbzrgh0bbwO0zab4wY9oY76S0k6UjO +uwf3oNifHi6hCDlMqRK6h8j8EINDVtXuYqOwwovfkh+a7nPJ0jAPpbn4JENlnGVecoL lGbfLAB2pwlbtqpuhbLuBSoVOl1Y5ZX/lxdyELjhitmfqoZm1h9E73ylP0fBRxSBc/7B xafA== 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=crG4E3kuy2W2YxYv21NV8BPelIbycfVrq+mYiF0r58w=; b=IOfamQvSo2l7NWiLyDHc4TkCaxS5e6agmeGRcOH95uGLfvu2vKKvUNTl72tdSlTft6 VvjskUPgUf4kISmDEFL0aiGrXd7u8wgzL8H1q18nx1vBQrGtAHvGfkHT5GAElaMnRYSd 33WzT3snFrlZaKUXwl3z5y7DwUT6G+ZtfjAdFRJNSkrdvJpSeuDuyKRx2xDZoLhc1ZNZ UM71ST0dICukOCpa/PasrbC3dX+LtN8CN8SY4xyEewxLVIlztMb5Pq4D0qX3JmvAOLdw 2XRvIKLnWN/ZPQO5/k7nNQJnwZ8ExM1Ip8otYstQ32viJkrK1mmmLKxYsRwQtkD6axk4 Yokw== X-Gm-Message-State: AOAM532nxoy2liLz4cX324UGZD8Yq+Rs45sHjgJqQDbNbMw6wnUFMlEs 2236G2eNsFhbxPFLVf/I0PDqThIt X-Google-Smtp-Source: ABdhPJz36E2/K2avV+W0jIj9jxujyFl2a3Y+wGWdGGEy9LCQ2uTOf3A1+TUB50OkFLTMLFH1Biwn5w== X-Received: by 2002:a1c:22d7:: with SMTP id i206mr14414930wmi.186.1590876015861; Sat, 30 May 2020 15:00:15 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:8c73:80e5:b6ba:d8b0? (p200300ea8f2357008c7380e5b6bad8b0.dip0.t-ipconnect.de. [2003:ea:8f23:5700:8c73:80e5:b6ba:d8b0]) by smtp.googlemail.com with ESMTPSA id l204sm5920092wmf.19.2020.05.30.15.00.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 30 May 2020 15:00:15 -0700 (PDT) Subject: [PATCH net-next 2/6] r8169: enable WAKE_PHY as only WoL source when runtime-suspending From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: <443c14ac-24b8-58ba-05aa-3803f1e5f4ab@gmail.com> Message-ID: <770d03ee-a3df-3be5-ff42-811d54055f30@gmail.com> Date: Sat, 30 May 2020 23:55:30 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: <443c14ac-24b8-58ba-05aa-3803f1e5f4ab@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We go to runtime-suspend few secs after cable removal. As cable is removed "physical link up" is the only meaningful WoL source. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 810398ef7..6fcd35ac8 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4884,7 +4884,7 @@ static int rtl8169_runtime_suspend(struct device *device) return 0; rtl_lock_work(tp); - __rtl8169_set_wol(tp, WAKE_ANY); + __rtl8169_set_wol(tp, WAKE_PHY); rtl_unlock_work(tp); rtl8169_net_suspend(tp); From patchwork Sat May 30 21:56:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1301288 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=CcHLodR8; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ZFjf1m2Hz9sT5 for ; Sun, 31 May 2020 08:00:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729390AbgE3WAV (ORCPT ); Sat, 30 May 2020 18:00:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729361AbgE3WAU (ORCPT ); Sat, 30 May 2020 18:00:20 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4737FC03E969 for ; Sat, 30 May 2020 15:00:20 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id f5so7638261wmh.2 for ; Sat, 30 May 2020 15:00:20 -0700 (PDT) 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=G3SmlJEu+nXUUZ8I3M3XdO7W+0Iisl0lSQ/BqjFKrmA=; b=CcHLodR8d6nPJ8W2hma2/zt9LNtYHR+xQEltc3YmlV9ozPb6qYWGxUOGgoDLSf1Ngq eOjrbmmbuMA6SenAkdJDCFbLpUu0ZZd5SeOsBmMMeQS5n609Qv581DiXteGOF2FTEJ6Q F+2FsxHqYs70YtDDIoHq9oCFlCSF6e+Q/CM00DPQMVtPgePJVEA47Q0jiKSCkQZMOSuT gsHXtOdWvp3L2fcoC69RukQ+N0ruALAR19gngiSKcUAb3KZgXlGcK49ch+BExq7heEkl rHnAU1Az8SchjsbNRhxUM2sgHXczwqsnQE3+bAUoW6drBnyPnvsBmS3OmCIRUYLMZsj3 jNWw== 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=G3SmlJEu+nXUUZ8I3M3XdO7W+0Iisl0lSQ/BqjFKrmA=; b=UOTATXiFODTLgKI+v8Vm33zSrReH1oFIWCw+QLmKLOYZiRqHYNKErqv7tCyCewiAEr N6H8IQTx2pc3uRv2ARjrOhbPCXII0E1AfYeKmOhffE+V32/QL0EQBNhrPBiOOazpK6X5 c42bTEoDMl6QnGFn3FyN1XPX+PQqCewZucwaZEnoM0UU46GSHB/nl1FmXkaXAhj9MSPp ervj8WOSx0BockmkdDECVUzbm2SGbZ4G9LkT2zXJP3GgCXx8xBrQYWdrearL3R+eXZk5 W0/83dAQOzpMBAj4ek5WnUnq/taY9c8OyVSALHwqVYKnvoAxUosqMAK/r+obVLrum25a NgOA== X-Gm-Message-State: AOAM531GaBxsenRXZSZb294VbCiAblgAM3A8tkmSblF12SFa77S4phBC U9WNiOB4wX7CQlzXEfyKpmI409ag X-Google-Smtp-Source: ABdhPJwgjJWKlqvHTmERQrF/3LPQQ19jVFhYcaq78w3t1UWGoaqA2VT9kXWM6n/ndktJHmwupWFCGw== X-Received: by 2002:a1c:6446:: with SMTP id y67mr14821599wmb.156.1590876018834; Sat, 30 May 2020 15:00:18 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:8c73:80e5:b6ba:d8b0? (p200300ea8f2357008c7380e5b6bad8b0.dip0.t-ipconnect.de. [2003:ea:8f23:5700:8c73:80e5:b6ba:d8b0]) by smtp.googlemail.com with ESMTPSA id o15sm4673827wmh.35.2020.05.30.15.00.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 30 May 2020 15:00:18 -0700 (PDT) Subject: [PATCH net-next 3/6] r8169: don't reset tx ring indexes in rtl8169_tx_clear From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: <443c14ac-24b8-58ba-05aa-3803f1e5f4ab@gmail.com> Message-ID: <261f63a4-1027-ca1b-6a76-e0eacda72998@gmail.com> Date: Sat, 30 May 2020 23:56:14 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: <443c14ac-24b8-58ba-05aa-3803f1e5f4ab@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In places where the indexes have to be reset, we call rtl8169_init_ring_indexes() anyway after rtl8169_tx_clear(). Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 6fcd35ac8..43652c450 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -3955,7 +3955,6 @@ static void rtl8169_tx_clear_range(struct rtl8169_private *tp, u32 start, static void rtl8169_tx_clear(struct rtl8169_private *tp) { rtl8169_tx_clear_range(tp, tp->dirty_tx, NUM_TX_DESC); - tp->cur_tx = tp->dirty_tx = 0; netdev_reset_queue(tp->dev); } From patchwork Sat May 30 21:57:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1301289 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=WpGwjJXJ; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ZFjh3Qcpz9sSw for ; Sun, 31 May 2020 08:00:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729397AbgE3WAX (ORCPT ); Sat, 30 May 2020 18:00:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729361AbgE3WAV (ORCPT ); Sat, 30 May 2020 18:00:21 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FAF9C03E969 for ; Sat, 30 May 2020 15:00:21 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id h5so1747942wrc.7 for ; Sat, 30 May 2020 15:00:21 -0700 (PDT) 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=ieWtCakj/v4SpzQWaaN0FVFlpC/V1OHkYE8bfoCFu/U=; b=WpGwjJXJv/cuY/qJ9ajoLy8xmOgYCScoTyIG7Zqo2PUcWZHSyu9xt4BCXvu7bSU/Cv 1ZOtvDwLwy10PE1gwt81ycvBmwFYxJBt+34c6elOR/qxl5qobod5Z+i+PqhRm8vK1F+k Skj9ZB5ygrjM+HqhbPz2vAiIt8H8yssmbCpJOHHEapuaNE94i+jlY/rcYtyj3/IGaV8+ 9A5/dS24CGY/pEFGhzpufYLVctQ13ku9lToB6Xj1X3avuCDdl9S8y+tL5FX4f/EB/3Lq cfbUMAp5NX4R9fmKAbuVBmlV0C27/a9D7iZCetU55A6PTmiRspXzoCw06l9oo1YHzQyn s1gQ== 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=ieWtCakj/v4SpzQWaaN0FVFlpC/V1OHkYE8bfoCFu/U=; b=sM94dmoiiinMFlyos7QXI9vx5Vv5DzaRp2t3bcjkdD3aBLM9C8wl+wUd0fTF2lWW8X PZJj+3+Sl5x1zwE5k/Jx17K9TvLUbOBhOlOTfMLl/u/jGG8cZbfSYcepJvrgM6qLhnWb TgWqtT45aTB4UJWdDi0/wo+ExJYP2L0+UwmBdEjyYvLAw58/c97LFNHZmmFiiP+wNdV0 LeyF8IhofigbEg5s0lwd9Gc0OktI0ozK/SyMwdn2u3/jk++puiwELGyybxJlgI76BwEQ 1fLpiVuNyJK5HyGbOCvP1FJ/Yhdtk5VHu3OYQMPNddb6c+TaxMmOgrcTqkNo3O5FXfXb 5w+Q== X-Gm-Message-State: AOAM530Qd5DXZwqRzm5D2VYH7ElaGfIECVg8OtulUBfnPYbh7m+/2s9z vuTgurfB4/l7c5N+p7wgaqSxPv2h X-Google-Smtp-Source: ABdhPJyktxnht8cwjbHMZh5l69dSK1n62Wh2MLofbBNc0QeIEjRP41C6xlCDPEDUGHGp3dXQeCJd5Q== X-Received: by 2002:adf:e744:: with SMTP id c4mr16032350wrn.71.1590876019820; Sat, 30 May 2020 15:00:19 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:8c73:80e5:b6ba:d8b0? (p200300ea8f2357008c7380e5b6bad8b0.dip0.t-ipconnect.de. [2003:ea:8f23:5700:8c73:80e5:b6ba:d8b0]) by smtp.googlemail.com with ESMTPSA id j5sm15200684wrm.57.2020.05.30.15.00.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 30 May 2020 15:00:19 -0700 (PDT) Subject: [PATCH net-next 4/6] r8169: move some calls to rtl8169_hw_reset From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: <443c14ac-24b8-58ba-05aa-3803f1e5f4ab@gmail.com> Message-ID: Date: Sat, 30 May 2020 23:57:10 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: <443c14ac-24b8-58ba-05aa-3803f1e5f4ab@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move calls that are needed before and after calling rtl8169_hw_reset() into this function. This requires to move the function in the code. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 75 +++++++++++------------ 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 43652c450..5f3c50fb0 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2530,36 +2530,6 @@ static void rtl_enable_rxdvgate(struct rtl8169_private *tp) rtl_wait_txrx_fifo_empty(tp); } -static void rtl8169_hw_reset(struct rtl8169_private *tp) -{ - /* Disable interrupts */ - rtl8169_irq_mask_and_ack(tp); - - rtl_rx_close(tp); - - switch (tp->mac_version) { - case RTL_GIGA_MAC_VER_27: - case RTL_GIGA_MAC_VER_28: - case RTL_GIGA_MAC_VER_31: - rtl_loop_wait_low(tp, &rtl_npq_cond, 20, 2000); - break; - case RTL_GIGA_MAC_VER_34 ... RTL_GIGA_MAC_VER_38: - RTL_W8(tp, ChipCmd, RTL_R8(tp, ChipCmd) | StopReq); - rtl_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 666); - break; - case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_61: - rtl_enable_rxdvgate(tp); - fsleep(2000); - break; - default: - RTL_W8(tp, ChipCmd, RTL_R8(tp, ChipCmd) | StopReq); - udelay(100); - break; - } - - rtl_hw_reset(tp); -} - static void rtl_set_tx_config_registers(struct rtl8169_private *tp) { u32 val = TX_DMA_BURST << TxDMAShift | @@ -3958,6 +3928,42 @@ static void rtl8169_tx_clear(struct rtl8169_private *tp) netdev_reset_queue(tp->dev); } +static void rtl8169_hw_reset(struct rtl8169_private *tp) +{ + /* Give a racing hard_start_xmit a few cycles to complete. */ + synchronize_rcu(); + + /* Disable interrupts */ + rtl8169_irq_mask_and_ack(tp); + + rtl_rx_close(tp); + + switch (tp->mac_version) { + case RTL_GIGA_MAC_VER_27: + case RTL_GIGA_MAC_VER_28: + case RTL_GIGA_MAC_VER_31: + rtl_loop_wait_low(tp, &rtl_npq_cond, 20, 2000); + break; + case RTL_GIGA_MAC_VER_34 ... RTL_GIGA_MAC_VER_38: + RTL_W8(tp, ChipCmd, RTL_R8(tp, ChipCmd) | StopReq); + rtl_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 666); + break; + case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_61: + rtl_enable_rxdvgate(tp); + fsleep(2000); + break; + default: + RTL_W8(tp, ChipCmd, RTL_R8(tp, ChipCmd) | StopReq); + fsleep(100); + break; + } + + rtl_hw_reset(tp); + + rtl8169_tx_clear(tp); + rtl8169_init_ring_indexes(tp); +} + static void rtl_reset_work(struct rtl8169_private *tp) { struct net_device *dev = tp->dev; @@ -3965,16 +3971,12 @@ static void rtl_reset_work(struct rtl8169_private *tp) napi_disable(&tp->napi); netif_stop_queue(dev); - synchronize_rcu(); rtl8169_hw_reset(tp); for (i = 0; i < NUM_RX_DESC; i++) rtl8169_mark_to_asic(tp->RxDescArray + i); - rtl8169_tx_clear(tp); - rtl8169_init_ring_indexes(tp); - napi_enable(&tp->napi); rtl_hw_start(tp); netif_wake_queue(dev); @@ -4636,11 +4638,6 @@ static void rtl8169_down(struct net_device *dev) rtl8169_hw_reset(tp); - /* Give a racing hard_start_xmit a few cycles to complete. */ - synchronize_rcu(); - - rtl8169_tx_clear(tp); - rtl8169_rx_clear(tp); rtl_pll_power_down(tp); From patchwork Sat May 30 21:58:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1301291 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=VaIHU7wk; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ZFjl4rGrz9sSw for ; Sun, 31 May 2020 08:00:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729414AbgE3WA0 (ORCPT ); Sat, 30 May 2020 18:00:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729394AbgE3WAW (ORCPT ); Sat, 30 May 2020 18:00:22 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61F6BC03E969 for ; Sat, 30 May 2020 15:00:22 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id j10so7655561wrw.8 for ; Sat, 30 May 2020 15:00:22 -0700 (PDT) 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=HVsMpGoGIHGR133lf3XM6reFNWpHA57wOr0SnKR8xrs=; b=VaIHU7wkiGFwl9KR7hjnFcuJ4jo8Q9XKGokgwiHIxJ5qBgn6Bx4/2f7fYbG8CO1T0n ex1SlE9KXFSK4SMMnlqlkpqM+pFPt+LyLyeWmm/TMWNZkBrzBm7iCtwYiimjocvOmu/x cNWx8LR6OJednJgVKbPe3VVXUsm+Z5VYnFiByFO5CfqDvuCSLxVdp8cuqJXAHZfjAtCm olCEKp/zh+AzOElG/8JJ/VySSuFKlTKJBQZ3UmhihgQh/lVkPwSGTYyEKsl5KopmTvST shUfRo1qP3OyULMCa3gQG9tTYEVTWDBqV/ysRhl3z4YVoo2ZvaRdmYvtavqXZi7cNIjN Wv/A== 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=HVsMpGoGIHGR133lf3XM6reFNWpHA57wOr0SnKR8xrs=; b=Us8NtVqv301kZ8A+nEQ0XOkwt8OAGNf5k9Vv/zu1QM5Ewls0nHKtX+kP0eFXppBNn1 eLmSY+7cify2uQVwUkLH5KXABvdW5UQbPrE17Tl9DifjkSQUdB/ZKADF8bSbzo+uvUx4 aujDSjQ6tQkujeYtI1PeRXPOCsozs68HEsjyenLfgHwrTGwfXWmTAd1mI4NkmZCR+ufd t8dQ6cEAvCy1Nx5blUjhEwUY4Lls4kchxnYH9UimRne63EXy6aPx7Aojz0wBDAjB1Xj4 MF8Kp+9VzF1YqZYKWAi/bUaHl14DdUQ0danCbqTpwpqlqAzSBUfoDrCAWTOPlQIQWoIb 2zXQ== X-Gm-Message-State: AOAM532mMLYHIzMKU1t9XAm704o577+zjCUvmjB+8vh+jhRQTMLNa0vL ayJAzwXmptETEx5XTv3Rx34gYc3e X-Google-Smtp-Source: ABdhPJxqsbBE5XNAXTY83kKVn8H3wsqGL48x/Bjvip664l4jwH8fYKAy4Wm4xb7zHZLa6RS6Xy5gow== X-Received: by 2002:adf:ed01:: with SMTP id a1mr16109763wro.271.1590876020826; Sat, 30 May 2020 15:00:20 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:8c73:80e5:b6ba:d8b0? (p200300ea8f2357008c7380e5b6bad8b0.dip0.t-ipconnect.de. [2003:ea:8f23:5700:8c73:80e5:b6ba:d8b0]) by smtp.googlemail.com with ESMTPSA id o15sm5561161wmm.31.2020.05.30.15.00.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 30 May 2020 15:00:20 -0700 (PDT) Subject: [PATCH net-next 5/6] r8169: make rtl8169_down central chip quiesce function From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: <443c14ac-24b8-58ba-05aa-3803f1e5f4ab@gmail.com> Message-ID: <9acbefbd-1542-c1b5-14ae-8a98eb5d8390@gmail.com> Date: Sat, 30 May 2020 23:58:35 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: <443c14ac-24b8-58ba-05aa-3803f1e5f4ab@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Functionality for quiescing the chip is spread across different functions currently. Move it to rtl8169_down(). Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 33 ++++++++--------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 5f3c50fb0..fd93377f9 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4627,20 +4627,21 @@ static int r8169_phy_connect(struct rtl8169_private *tp) return 0; } -static void rtl8169_down(struct net_device *dev) +static void rtl8169_down(struct rtl8169_private *tp) { - struct rtl8169_private *tp = netdev_priv(dev); + rtl_lock_work(tp); - phy_stop(tp->phydev); + /* Clear all task flags */ + bitmap_zero(tp->wk.flags, RTL_FLAG_MAX); + phy_stop(tp->phydev); napi_disable(&tp->napi); - netif_stop_queue(dev); rtl8169_hw_reset(tp); - rtl8169_rx_clear(tp); - rtl_pll_power_down(tp); + + rtl_unlock_work(tp); } static int rtl8169_close(struct net_device *dev) @@ -4653,12 +4654,9 @@ static int rtl8169_close(struct net_device *dev) /* Update counters before going down */ rtl8169_update_counters(tp); - rtl_lock_work(tp); - /* Clear all task flags */ - bitmap_zero(tp->wk.flags, RTL_FLAG_MAX); - - rtl8169_down(dev); - rtl_unlock_work(tp); + netif_stop_queue(dev); + rtl8169_down(tp); + rtl8169_rx_clear(tp); cancel_work_sync(&tp->wk.work); @@ -4817,17 +4815,8 @@ static void rtl8169_net_suspend(struct rtl8169_private *tp) if (!netif_running(tp->dev)) return; - phy_stop(tp->phydev); netif_device_detach(tp->dev); - - rtl_lock_work(tp); - napi_disable(&tp->napi); - /* Clear all task flags */ - bitmap_zero(tp->wk.flags, RTL_FLAG_MAX); - - rtl_unlock_work(tp); - - rtl_pll_power_down(tp); + rtl8169_down(tp); } #ifdef CONFIG_PM From patchwork Sat May 30 21:59:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1301290 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=DFVdjpHN; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ZFjk55bgz9sSr for ; Sun, 31 May 2020 08:00:26 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729403AbgE3WAZ (ORCPT ); Sat, 30 May 2020 18:00:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729399AbgE3WAX (ORCPT ); Sat, 30 May 2020 18:00:23 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47A0DC08C5CA for ; Sat, 30 May 2020 15:00:23 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id y17so7641054wrn.11 for ; Sat, 30 May 2020 15:00:23 -0700 (PDT) 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=L3sJ9UAFiPIPJqL6wgaAS1RvHsBnhVoNYb2cuGsmZb4=; b=DFVdjpHNDczoMZcBdF1v8R6yVEbc7QTEw/HB+MZfjPFdYL0fpkzvA0x00xlcf4tmJF pYPNdtpJo4j2sKyi5x8SVWgCjyRvbRAEhIsH5zcu+EACUxSLKhcku3mkCFWlq8mx2BXF d1MxwPVEyiMP69S6s6N8LNTr4zTwf3n0ivsCkYPH0q7ZhzXQZxYb817UiXdZWOUHI9q1 MIdfx+agS7wKc1d8YvobykpeGgY1VTajJsZ4mT1Vaxk2/qk3t8w2kLKDa8h2zD9KFoex H3WMxXfyGExsjzZyW+4drpJxS9eLpPMe5zXlRNTqSsNvflvpcQ47DIelkEVVBcRJ/HGr AqDw== 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=L3sJ9UAFiPIPJqL6wgaAS1RvHsBnhVoNYb2cuGsmZb4=; b=baetqlyGRKBZzt+DhGu5dtaw9IdUKDEmZ4f/Mg45atDcL6SN+GLwW/vMfJSjnGuttW 2EEqt8q7Fnd82dfkUMjVPPPBQKEwF2o84XgWeoSKUDi+zaNIm2v0Da7nL2qSVziHOpc4 I+L+KNjJQ7s0ftoKHwVy/xM0IILH8DJu4z45vxC2sRClQBVJOjpUvN2nUO8O5bMNmDBO FVvJDzj18wGZjTyM9LMu0sTfvlVTufCW3V6X4MnHcM3XFSt+VHPdUjaNr5jWA3NNcD06 ixcmNKf6M0dFMKNLjxMlpQiQdbDcASntKVli1iPhGk8oaI8QSkPG+e8RR37mHZlQSQ6u CLMQ== X-Gm-Message-State: AOAM530Ses85QXM9M1x/FRynU+tZW6OXgvNFjkghetki0n9ONM5WY4W7 3oZ7LKIc89vZmV+sN2JY7DzkzmQo X-Google-Smtp-Source: ABdhPJx/ISOSGdH/yGEE4TvOMWy+xRcUmeUOLx0W4879nlzAG9yzjEg18DdarV/0Xn0brwJ1oc9FDw== X-Received: by 2002:a5d:4c81:: with SMTP id z1mr16110217wrs.371.1590876021822; Sat, 30 May 2020 15:00:21 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:8c73:80e5:b6ba:d8b0? (p200300ea8f2357008c7380e5b6bad8b0.dip0.t-ipconnect.de. [2003:ea:8f23:5700:8c73:80e5:b6ba:d8b0]) by smtp.googlemail.com with ESMTPSA id 5sm4780599wmz.16.2020.05.30.15.00.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 30 May 2020 15:00:21 -0700 (PDT) Subject: [PATCH net-next 6/6] r8169: improve handling power management ops From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: <443c14ac-24b8-58ba-05aa-3803f1e5f4ab@gmail.com> Message-ID: <95e94fdd-3b51-6a76-0b54-3a53150b3ba8@gmail.com> Date: Sat, 30 May 2020 23:59:58 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: <443c14ac-24b8-58ba-05aa-3803f1e5f4ab@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Simplify handling the power management callbacks. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 28 ++++++++--------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index fd93377f9..4d2ec9742 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4821,7 +4821,7 @@ static void rtl8169_net_suspend(struct rtl8169_private *tp) #ifdef CONFIG_PM -static int rtl8169_suspend(struct device *device) +static int __maybe_unused rtl8169_suspend(struct device *device) { struct rtl8169_private *tp = dev_get_drvdata(device); @@ -4847,7 +4847,7 @@ static void __rtl8169_resume(struct rtl8169_private *tp) rtl_unlock_work(tp); } -static int rtl8169_resume(struct device *device) +static int __maybe_unused rtl8169_resume(struct device *device) { struct rtl8169_private *tp = dev_get_drvdata(device); @@ -4909,24 +4909,12 @@ static int rtl8169_runtime_idle(struct device *device) } static const struct dev_pm_ops rtl8169_pm_ops = { - .suspend = rtl8169_suspend, - .resume = rtl8169_resume, - .freeze = rtl8169_suspend, - .thaw = rtl8169_resume, - .poweroff = rtl8169_suspend, - .restore = rtl8169_resume, - .runtime_suspend = rtl8169_runtime_suspend, - .runtime_resume = rtl8169_runtime_resume, - .runtime_idle = rtl8169_runtime_idle, + SET_SYSTEM_SLEEP_PM_OPS(rtl8169_suspend, rtl8169_resume) + SET_RUNTIME_PM_OPS(rtl8169_runtime_suspend, rtl8169_runtime_resume, + rtl8169_runtime_idle) }; -#define RTL8169_PM_OPS (&rtl8169_pm_ops) - -#else /* !CONFIG_PM */ - -#define RTL8169_PM_OPS NULL - -#endif /* !CONFIG_PM */ +#endif /* CONFIG_PM */ static void rtl_wol_shutdown_quirk(struct rtl8169_private *tp) { @@ -5458,7 +5446,9 @@ static struct pci_driver rtl8169_pci_driver = { .probe = rtl_init_one, .remove = rtl_remove_one, .shutdown = rtl_shutdown, - .driver.pm = RTL8169_PM_OPS, +#ifdef CONFIG_PM + .driver.pm = &rtl8169_pm_ops, +#endif }; module_pci_driver(rtl8169_pci_driver);