From patchwork Mon May 18 15:02:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Gupta X-Patchwork-Id: 1292575 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=iC18Lt1F; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49Qj280RQyz9sSF for ; Tue, 19 May 2020 01:03:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728230AbgERPDY (ORCPT ); Mon, 18 May 2020 11:03:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727036AbgERPDX (ORCPT ); Mon, 18 May 2020 11:03:23 -0400 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1848CC061A0C; Mon, 18 May 2020 08:03:23 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id y18so5078466pfl.9; Mon, 18 May 2020 08:03:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q0vJRwaWiHDVlGbG3eVh8/uWQVt4wHmZxTm6RgydJQg=; b=iC18Lt1F9S0QFmiy4w8gAPf9ngNJphTTHweMRteryTOpuIddajPWCthBnN/60KUdX2 AeoXNZnevaZiRDGOqujyYZk9lQKYvubij7TsyyiAeifkWphQpeekEdx601BFlR7vhZ3E cMYsRAffHe1qpRzuxgWFZoxIYX6tRiAo9yd41QrHHuZS91aH8WXhC8xIp85qfKW3JroU N3uUvA9CKdnaldcQUC5OshIuuMc9FFbYalXNMszjfK8MwnfpxsmXagQdimhgQmyCPwAk X4j29MG9Q8fphqnM9mz4NLN7p9KJ7RbMqkQG0a6njvPax0UgThhe2qbnfquK3v0y7aRr iPUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q0vJRwaWiHDVlGbG3eVh8/uWQVt4wHmZxTm6RgydJQg=; b=YXEP7i3ZRaBQIyIP5Je/3VsWj+XP4xIxmTiLHiTiEKilVHMseI4C204yotAMlUZuV1 pngA8ZhrkkqK22+z395a/4HRhhpwVUwnWUuyh/pu2wtLjI/4KH/g6DU6f4zCpyWM/Vp/ HiYHvHiG8HX3rgn6f9VToTuTWnk0HVYjc3s095v3xgZbSpVI24tK821obg6bJe+WhTqo Sz732Izq7B49ohkE2DQVXM6hq6tLnf2+zMaPe9HWiw/zlRui5nGCpmT+g0jfsY3TsLcG XELaheDWS5lY3Jnzwj0tuG2768XpnZZCouUMN+N07yCMtZB8biglvJjH7Og5OD6OiVj9 gK5g== X-Gm-Message-State: AOAM530iOtY7bZDqJO4wIXay3x0o6VVLyKM82crmRmU1F5w4AKOCJMct rXm91iezp+kOt74DQOzTsjw= X-Google-Smtp-Source: ABdhPJy0cN4s+kAwOA6UoSUDKcF5V6dFfDZ6hRyOGNVqB8Vkht1ipy/lVMrfS40Y1q+zHnKfH0zROw== X-Received: by 2002:aa7:81cf:: with SMTP id c15mr17732953pfn.211.1589814202338; Mon, 18 May 2020 08:03:22 -0700 (PDT) Received: from varodek.iballbatonwifi.com ([103.105.152.209]) by smtp.gmail.com with ESMTPSA id k1sm7963142pgh.78.2020.05.18.08.03.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2020 08:03:21 -0700 (PDT) From: Vaibhav Gupta To: Heiner Kallweit , Vaibhav Gupta , netdev@vger.kernel.org, Bjorn Helgaas , Bjorn Helgaas , bjorn@helgaas.com, linux-kernel-mentees@lists.linuxfoundation.org, rjw@rjwysocki.net, "David S . Miller" Cc: Vaibhav Gupta , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, skhan@linuxfoundation.org Subject: [PATCH net-next v3 1/2] realtek/8139too: use generic power management Date: Mon, 18 May 2020 20:32:13 +0530 Message-Id: <20200518150214.100491-2-vaibhavgupta40@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200518150214.100491-1-vaibhavgupta40@gmail.com> References: <20200518150214.100491-1-vaibhavgupta40@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org compile-tested only With legacy PM hooks, it was the responsibility of a driver to manage PCI states and also device's power state. The generic approach is to let PCI core handle the work. PCI core passes "struct device*" as an argument to the .suspend() and .resume() callbacks. As these callabcks work with "struct net_device*", extract it from "struct device*" using dev_get_drv_data(). Signed-off-by: Vaibhav Gupta --- drivers/net/ethernet/realtek/8139too.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c index 5caeb8368eab..227139d42227 100644 --- a/drivers/net/ethernet/realtek/8139too.c +++ b/drivers/net/ethernet/realtek/8139too.c @@ -2603,17 +2603,13 @@ static void rtl8139_set_rx_mode (struct net_device *dev) spin_unlock_irqrestore (&tp->lock, flags); } -#ifdef CONFIG_PM - -static int rtl8139_suspend (struct pci_dev *pdev, pm_message_t state) +static int __maybe_unused rtl8139_suspend(struct device *device) { - struct net_device *dev = pci_get_drvdata (pdev); + struct net_device *dev = dev_get_drvdata(device); struct rtl8139_private *tp = netdev_priv(dev); void __iomem *ioaddr = tp->mmio_addr; unsigned long flags; - pci_save_state (pdev); - if (!netif_running (dev)) return 0; @@ -2631,38 +2627,30 @@ static int rtl8139_suspend (struct pci_dev *pdev, pm_message_t state) spin_unlock_irqrestore (&tp->lock, flags); - pci_set_power_state (pdev, PCI_D3hot); - return 0; } - -static int rtl8139_resume (struct pci_dev *pdev) +static int __maybe_unused rtl8139_resume(struct device *device) { - struct net_device *dev = pci_get_drvdata (pdev); + struct net_device *dev = dev_get_drvdata(device); - pci_restore_state (pdev); if (!netif_running (dev)) return 0; - pci_set_power_state (pdev, PCI_D0); + rtl8139_init_ring (dev); rtl8139_hw_start (dev); netif_device_attach (dev); return 0; } -#endif /* CONFIG_PM */ - +static SIMPLE_DEV_PM_OPS(rtl8139_pm_ops, rtl8139_suspend, rtl8139_resume); static struct pci_driver rtl8139_pci_driver = { .name = DRV_NAME, .id_table = rtl8139_pci_tbl, .probe = rtl8139_init_one, .remove = rtl8139_remove_one, -#ifdef CONFIG_PM - .suspend = rtl8139_suspend, - .resume = rtl8139_resume, -#endif /* CONFIG_PM */ + .driver.pm = &rtl8139_pm_ops, }; From patchwork Mon May 18 15:02:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Gupta X-Patchwork-Id: 1292577 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=gJ+nmeTE; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49Qj2D0LM3z9sSF for ; Tue, 19 May 2020 01:03:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728264AbgERPDb (ORCPT ); Mon, 18 May 2020 11:03:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726998AbgERPDa (ORCPT ); Mon, 18 May 2020 11:03:30 -0400 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37D92C061A0C; Mon, 18 May 2020 08:03:30 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id q8so3271936pfu.5; Mon, 18 May 2020 08:03:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=89NAWHbMqaWrTmR4XBFd6RaaE9tXY8/qNz7kfdyAHpo=; b=gJ+nmeTEhiidK4lcg/MEpTINIRc47wPb8Rfa82RqD2giHWu25sQf8b1uyzm70ybDDz D16A2NhBINLmkvt+H2fL9ckfqyfdEzm7/a880R8ae0F5HGxM1lYxurNkoxBhLQ4+NGj6 nFI4R1oZhQi5Z4mUOc36TPqvVUfUa33nNYmkfeLewhRNnCCztapf8QXYmD24t8Ioguz3 AfsIaNVSJF0rs3kAcLuc6EtcGdUf4haM33cvWDys7Ilyt8gdUF6QZfdBQCqWif/r+vdA rQsFdzEMrU+LZhXeBDoBJ0Omqf7eEYYDZxZYKbgoNkR/vKlD+FKmmgplCg3oxAbe/6yI WMaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=89NAWHbMqaWrTmR4XBFd6RaaE9tXY8/qNz7kfdyAHpo=; b=MpQ0Rsn8hgK40PruVFqrm6Rb1NiEI+mAapKR4tchM7jcACIi4rHmTwSavXoC1DmCSy xE0FFEvFV3Gk+e4ip7kv/9KPxvc8DZcd+lV8J6UzoeEOFDh1oazY4qnBUvPFowPht0YZ NbmrcSNn8u3gBHSaa2fUO/fK7hqkFlO27hsrPyPgYn98Isv5R+8rZrFxNrsa4f+kXxtI qYsBi9eExw/3s5lwB6WS4LAe3CXE+YffgXPrhy1r3oqgmgiQmpjh+3IxK7mT5QGRR3J4 iyiNhEdFzWs0gGMoPWhLh5SG/z4aLv8U2Yb1kIi5dQ7TSFgguJHNsau1QtuVaTDzITGG xDMg== X-Gm-Message-State: AOAM530U11YLikhr4JPzw1Uj9OwnW4DZNvsG+emonala+ILlexPSczZh CBCVKy2wRNDFJ4HqcAT8AV92UHKHyIPK8Q== X-Google-Smtp-Source: ABdhPJxgAK2EsPrRzqc+FBc+sNQH5pRWNatd9DrBmJGIAgTAN3kwU45TEYHMqpRVgfECekigyuJ5FQ== X-Received: by 2002:a63:e70b:: with SMTP id b11mr2270409pgi.88.1589814209675; Mon, 18 May 2020 08:03:29 -0700 (PDT) Received: from varodek.iballbatonwifi.com ([103.105.152.209]) by smtp.gmail.com with ESMTPSA id k1sm7963142pgh.78.2020.05.18.08.03.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2020 08:03:29 -0700 (PDT) From: Vaibhav Gupta To: Heiner Kallweit , Vaibhav Gupta , netdev@vger.kernel.org, Bjorn Helgaas , Bjorn Helgaas , bjorn@helgaas.com, linux-kernel-mentees@lists.linuxfoundation.org, rjw@rjwysocki.net, "David S . Miller" Cc: Vaibhav Gupta , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, skhan@linuxfoundation.org Subject: [PATCH net-next v3 2/2] realtek/8139cp: use generic power management Date: Mon, 18 May 2020 20:32:14 +0530 Message-Id: <20200518150214.100491-3-vaibhavgupta40@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200518150214.100491-1-vaibhavgupta40@gmail.com> References: <20200518150214.100491-1-vaibhavgupta40@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org compile-tested only With legacy PM hooks, it was the responsibility of a driver to manage PCI states and also device's power state. The generic approach is to let PCI core handle the work. The suspend callback enables/disables PCI wake on the basis of "cp->wol_enabled" variable which is unknown to PCI core. To utilise its need, call device_set_wakeup_enable(). Signed-off-by: Vaibhav Gupta --- drivers/net/ethernet/realtek/8139cp.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c index 60d342f82fb3..e291e6ac40cb 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c @@ -2054,10 +2054,9 @@ static void cp_remove_one (struct pci_dev *pdev) free_netdev(dev); } -#ifdef CONFIG_PM -static int cp_suspend (struct pci_dev *pdev, pm_message_t state) +static int __maybe_unused cp_suspend(struct device *device) { - struct net_device *dev = pci_get_drvdata(pdev); + struct net_device *dev = dev_get_drvdata(device); struct cp_private *cp = netdev_priv(dev); unsigned long flags; @@ -2075,16 +2074,14 @@ static int cp_suspend (struct pci_dev *pdev, pm_message_t state) spin_unlock_irqrestore (&cp->lock, flags); - pci_save_state(pdev); - pci_enable_wake(pdev, pci_choose_state(pdev, state), cp->wol_enabled); - pci_set_power_state(pdev, pci_choose_state(pdev, state)); + device_set_wakeup_enable(device, cp->wol_enabled); return 0; } -static int cp_resume (struct pci_dev *pdev) +static int __maybe_unused cp_resume(struct device *device) { - struct net_device *dev = pci_get_drvdata (pdev); + struct net_device *dev = dev_get_drvdata(device); struct cp_private *cp = netdev_priv(dev); unsigned long flags; @@ -2093,10 +2090,6 @@ static int cp_resume (struct pci_dev *pdev) netif_device_attach (dev); - pci_set_power_state(pdev, PCI_D0); - pci_restore_state(pdev); - pci_enable_wake(pdev, PCI_D0, 0); - /* FIXME: sh*t may happen if the Rx ring buffer is depleted */ cp_init_rings_index (cp); cp_init_hw (cp); @@ -2111,7 +2104,6 @@ static int cp_resume (struct pci_dev *pdev) return 0; } -#endif /* CONFIG_PM */ static const struct pci_device_id cp_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139), }, @@ -2120,15 +2112,14 @@ static const struct pci_device_id cp_pci_tbl[] = { }; MODULE_DEVICE_TABLE(pci, cp_pci_tbl); +static SIMPLE_DEV_PM_OPS(cp_pm_ops, cp_suspend, cp_resume); + static struct pci_driver cp_driver = { .name = DRV_NAME, .id_table = cp_pci_tbl, .probe = cp_init_one, .remove = cp_remove_one, -#ifdef CONFIG_PM - .resume = cp_resume, - .suspend = cp_suspend, -#endif + .driver.pm = &cp_pm_ops, }; module_pci_driver(cp_driver);