From nobody Tue Dec 2 00:25:45 2025 Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAEC8314B76; Mon, 24 Nov 2025 16:04:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=178.21.23.139 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764000303; cv=none; b=ZDdHwlDsEY/i4yWI/OIJdj9GEzIocs5YR8Jbgve9sYB7qINdT0DfKrN1BB8WSPKZ1E/i3uw15c06I/AOD9+KWBAYWJWmNufSB4nlOY7jDbwpMbQHW6fJkGe0I9yt1B+Eqglww2W6lKdap/EpsYx6D9VWoSHzgwcNJCwyElir7xE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764000303; c=relaxed/simple; bh=lDiopGaJl8p8QgZVRajjL9Iy+vuq5EkNHhpIHS0SlTY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uDrS6yGy1Boy4BSC/ZEr3RCEbkF/T8kEC3tFufJxU4UpP1c1/O0Od2BshdpceIUCy3neY7XfnhgVGpZG0XoLkRSnN3KJjoxRiAe2FHYnocWQ+FNSXloawXlDZXvu6BtrftRDUmSM9Hby/QwXpoL7jvEI43va28reUYeftkCiXEg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=disroot.org; spf=pass smtp.mailfrom=disroot.org; dkim=pass (2048-bit key) header.d=disroot.org header.i=@disroot.org header.b=IBwXedlT; arc=none smtp.client-ip=178.21.23.139 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=disroot.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=disroot.org header.i=@disroot.org header.b="IBwXedlT" Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 705082603F; Mon, 24 Nov 2025 17:04:58 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id u_bhM_6Na8oz; Mon, 24 Nov 2025 17:04:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1764000289; bh=lDiopGaJl8p8QgZVRajjL9Iy+vuq5EkNHhpIHS0SlTY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IBwXedlTHZ0dNoRIYHJ8ZmE06xoF4ettZwGGmYaA8eGz3Bf7d9HEwd+NEQKQezFl4 yji/QMWT/m40omcbSSgSCoj3IzS1dbA9w/LUidg2VGIsdWeJ2IppUa1+bSLvOD442S YTZZKZFsUM2dlnQM1olYwn+Nnj67d94kaaAiTfSJltFArL1vGnCDU+9ACLlIJnWbzL oZfEhLTwHVBlHsksh4e6VWaVN1NukVFRkhmzcUH/aySed+sInzHuD/mEEIrkQ9vxs4 FaO4ixTgAcC0SxvoO5S6forZyMdjca8OVCaJgEGUkwAtDLkv9OU2P7atg4Hl7pNKv7 vyO3RLdwXpYhA== From: Yao Zi To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Yanteng Si , Huacai Chen , "Russell King (Oracle)" , Philipp Stanner , Tiezhu Yang , Qunqin Zhao , Yao Zi , Vladimir Oltean , Furong Xu <0x1207@gmail.com>, Kunihiko Hayashi , Jacob Keller Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Mingcong Bai , Kexy Biscuit Subject: [PATCH net-next v5 1/3] net: stmmac: Add generic suspend/resume helper for PCI-based controllers Date: Mon, 24 Nov 2025 16:04:15 +0000 Message-ID: <20251124160417.51514-2-ziyao@disroot.org> In-Reply-To: <20251124160417.51514-1-ziyao@disroot.org> References: <20251124160417.51514-1-ziyao@disroot.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Most glue driver for PCI-based DWMAC controllers utilize similar platform suspend/resume routines. Add a generic implementation to reduce duplicated code. Signed-off-by: Yao Zi Reviewed-by: Russell King (Oracle) Reviewed-by: Yanteng Si --- drivers/net/ethernet/stmicro/stmmac/Kconfig | 5 ++ drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + .../ethernet/stmicro/stmmac/stmmac_libpci.c | 48 +++++++++++++++++++ .../ethernet/stmicro/stmmac/stmmac_libpci.h | 12 +++++ 4 files changed, 66 insertions(+) create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.c create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.h diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethe= rnet/stmicro/stmmac/Kconfig index 87c5bea6c2a2..15ed5c1d071a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -349,6 +349,11 @@ config DWMAC_VISCONTI =20 endif =20 +config STMMAC_LIBPCI + tristate + help + This option enables the PCI bus helpers for the stmmac driver. + config DWMAC_INTEL tristate "Intel GMAC support" default X86 diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/eth= ernet/stmicro/stmmac/Makefile index 1681a8a28313..7bf528731034 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Makefile +++ b/drivers/net/ethernet/stmicro/stmmac/Makefile @@ -44,6 +44,7 @@ obj-$(CONFIG_DWMAC_VISCONTI) +=3D dwmac-visconti.o stmmac-platform-objs:=3D stmmac_platform.o dwmac-altr-socfpga-objs :=3D dwmac-socfpga.o =20 +obj-$(CONFIG_STMMAC_LIBPCI) +=3D stmmac_libpci.o obj-$(CONFIG_STMMAC_PCI) +=3D stmmac-pci.o obj-$(CONFIG_DWMAC_INTEL) +=3D dwmac-intel.o obj-$(CONFIG_DWMAC_LOONGSON) +=3D dwmac-loongson.o diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.c b/drivers/= net/ethernet/stmicro/stmmac/stmmac_libpci.c new file mode 100644 index 000000000000..5c5dd502f79a --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.c @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * PCI bus helpers for STMMAC driver + * Copyright (C) 2025 Yao Zi + */ + +#include +#include + +#include "stmmac_libpci.h" + +int stmmac_pci_plat_suspend(struct device *dev, void *bsp_priv) +{ + struct pci_dev *pdev =3D to_pci_dev(dev); + int ret; + + ret =3D pci_save_state(pdev); + if (ret) + return ret; + + pci_disable_device(pdev); + pci_wake_from_d3(pdev, true); + + return 0; +} +EXPORT_SYMBOL_GPL(stmmac_pci_plat_suspend); + +int stmmac_pci_plat_resume(struct device *dev, void *bsp_priv) +{ + struct pci_dev *pdev =3D to_pci_dev(dev); + int ret; + + pci_restore_state(pdev); + pci_set_power_state(pdev, PCI_D0); + + ret =3D pci_enable_device(pdev); + if (ret) + return ret; + + pci_set_master(pdev); + + return 0; +} +EXPORT_SYMBOL_GPL(stmmac_pci_plat_resume); + +MODULE_DESCRIPTION("STMMAC PCI helper library"); +MODULE_AUTHOR("Yao Zi "); +MODULE_LICENSE("GPL"); diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.h b/drivers/= net/ethernet/stmicro/stmmac/stmmac_libpci.h new file mode 100644 index 000000000000..71553184f982 --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2025 Yao Zi + */ + +#ifndef __STMMAC_LIBPCI_H__ +#define __STMMAC_LIBPCI_H__ + +int stmmac_pci_plat_suspend(struct device *dev, void *bsp_priv); +int stmmac_pci_plat_resume(struct device *dev, void *bsp_priv); + +#endif /* __STMMAC_LIBPCI_H__ */ --=20 2.51.2 From nobody Tue Dec 2 00:25:45 2025 Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 715A6313E37; Mon, 24 Nov 2025 16:05:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=178.21.23.139 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764000304; cv=none; b=nHFHVoMkB4PL8mTdyv+RgDc3ShHntoqZe2mW1WlqOFifRTnvZOI9YEPhKoEDlOv5oi/SFx6iFNfZgYZf2FEq9VYT5nZ0wRilYosHBjTafudDlagZovKj2/unM6TInm9a2THtbMNWXwEojmHwz8dKlPcKtWAvSO0g57UgZJjMs9s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764000304; c=relaxed/simple; bh=KQ83MtFw7xXJmqjMZ4xm2jPserq3Dxyy1D566eYnZHA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XzSHhqhDPrhktTdl1rbhXZ5XzBhs1CMOcQYVAb/UfCPHn8U1uus4zLCqkb1E0cQ/JIR5NI0KvO3g58EMM/zlbFNbl3imlCPPnV6YyuzQM0Guxh/+ihY/nD5LJ9Yctr5nq0flh7b/mqRc+HMmVBelPlFqry7MrNchPSPAR0BgvZI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=disroot.org; spf=pass smtp.mailfrom=disroot.org; dkim=pass (2048-bit key) header.d=disroot.org header.i=@disroot.org header.b=YuIvooqa; arc=none smtp.client-ip=178.21.23.139 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=disroot.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=disroot.org header.i=@disroot.org header.b="YuIvooqa" Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7B55625F35; Mon, 24 Nov 2025 17:05:00 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 9xXmwFRLpA9q; Mon, 24 Nov 2025 17:04:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1764000299; bh=KQ83MtFw7xXJmqjMZ4xm2jPserq3Dxyy1D566eYnZHA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YuIvooqa4fgx+NFjVvFnZO72uh5gIlGD9LnRaWPRPmmKul7lh4YnO5xhXaQtx0B9Q zeKPQJuJlO+kl6CEThPmMDw36VL97W0/A8DRIm4LhjHPYaU34Xb1S4Asrpe/40sOc6 e9utquRZBxdYFsr5KF/fFHxJF0BXaBGEQt8WOivjjV1sJ80tAKFo8eSGg7otW6mLwA 0b4tMPlWJKN4JJS31ExomjHD5JFw6C+y0hnP12UY2n4CNnPg8IxiXH6/ny70wiWZYQ 0th2nIXCzokbV9gFKBxdQbn86ZwKsejHMG1oJrXx2P8TNNj6fv8u1/sWn3P17KP8Z4 O9aQ6Z/WSiovQ== From: Yao Zi To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Yanteng Si , Huacai Chen , "Russell King (Oracle)" , Philipp Stanner , Tiezhu Yang , Qunqin Zhao , Yao Zi , Vladimir Oltean , Furong Xu <0x1207@gmail.com>, Kunihiko Hayashi , Jacob Keller Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Mingcong Bai , Kexy Biscuit , Yanteng Si Subject: [PATCH net-next v5 2/3] net: stmmac: loongson: Use generic PCI suspend/resume routines Date: Mon, 24 Nov 2025 16:04:16 +0000 Message-ID: <20251124160417.51514-3-ziyao@disroot.org> In-Reply-To: <20251124160417.51514-1-ziyao@disroot.org> References: <20251124160417.51514-1-ziyao@disroot.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Convert glue driver for Loongson DWMAC controller to use the generic platform suspend/resume routines for PCI controllers, instead of implementing its own one. Signed-off-by: Yao Zi Reviewed-by: Russell King (Oracle) Acked-by: Yanteng Si --- drivers/net/ethernet/stmicro/stmmac/Kconfig | 3 +- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 36 ++----------------- 2 files changed, 5 insertions(+), 34 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethe= rnet/stmicro/stmmac/Kconfig index 15ed5c1d071a..ad7ae3618099 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -367,8 +367,9 @@ config DWMAC_INTEL config DWMAC_LOONGSON tristate "Loongson PCI DWMAC support" default MACH_LOONGSON64 - depends on (MACH_LOONGSON64 || COMPILE_TEST) && STMMAC_ETH && PCI + depends on (MACH_LOONGSON64 || COMPILE_TEST) && PCI depends on COMMON_CLK + select STMMAC_LIBPCI help This selects the LOONGSON PCI bus support for the stmmac driver, Support for ethernet controller on Loongson-2K1000 SoC and LS7A1000 bri= dge. diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers= /net/ethernet/stmicro/stmmac/dwmac-loongson.c index 5f9472f47e35..107a7c84ace8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c @@ -8,6 +8,7 @@ #include #include #include "stmmac.h" +#include "stmmac_libpci.h" #include "dwmac_dma.h" #include "dwmac1000.h" =20 @@ -502,37 +503,6 @@ static int loongson_dwmac_fix_reset(struct stmmac_priv= *priv, void __iomem *ioad 10000, 2000000); } =20 -static int loongson_dwmac_suspend(struct device *dev, void *bsp_priv) -{ - struct pci_dev *pdev =3D to_pci_dev(dev); - int ret; - - ret =3D pci_save_state(pdev); - if (ret) - return ret; - - pci_disable_device(pdev); - pci_wake_from_d3(pdev, true); - return 0; -} - -static int loongson_dwmac_resume(struct device *dev, void *bsp_priv) -{ - struct pci_dev *pdev =3D to_pci_dev(dev); - int ret; - - pci_restore_state(pdev); - pci_set_power_state(pdev, PCI_D0); - - ret =3D pci_enable_device(pdev); - if (ret) - return ret; - - pci_set_master(pdev); - - return 0; -} - static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_dev= ice_id *id) { struct plat_stmmacenet_data *plat; @@ -577,8 +547,8 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, c= onst struct pci_device_id plat->bsp_priv =3D ld; plat->mac_setup =3D loongson_dwmac_setup; plat->fix_soc_reset =3D loongson_dwmac_fix_reset; - plat->suspend =3D loongson_dwmac_suspend; - plat->resume =3D loongson_dwmac_resume; + plat->suspend =3D stmmac_pci_plat_suspend; + plat->resume =3D stmmac_pci_plat_resume; ld->dev =3D &pdev->dev; ld->loongson_id =3D readl(res.addr + GMAC_VERSION) & 0xff; =20 --=20 2.51.2 From nobody Tue Dec 2 00:25:45 2025 Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EDA2D30FF1C; Mon, 24 Nov 2025 16:06:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=178.21.23.139 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764000363; cv=none; b=WpWLrwGDEusZhXmziHIHPFd0J2X+6dAtD3nqeXjthNjyAlf5IOSrVr2lCRP9p0wwVQXxtJjzlyjhZ26Raj5z738KMwVWhVKu49gb6VgRenf85hcKVRESehi4N0g06K4xQ7oKfqLApRqY8zgr7EoafIfmN7/ONKrGWuLCDQYpkCI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764000363; c=relaxed/simple; bh=tVGA3qkz7Jn3pFsnWVBSvJRfpOJhIduZOIwHA2N9N7s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rqoq28sSHJ/lYF/MWNQDS7GSG8/RuqJqaNfkLqyxxFxwiLGCtdBLzK+bvxVCaqDKS+NVPi2bccwgVuBnjq67PM+6ma1akwimvupJh5ndJ/Bh8lBT7qU3Aag19bA77bmAiZ42D9Om6mzdibcRS9l9hyF2qhXjmKJuUXBaNrAQHy8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=disroot.org; spf=pass smtp.mailfrom=disroot.org; dkim=pass (2048-bit key) header.d=disroot.org header.i=@disroot.org header.b=i/uR/N1r; arc=none smtp.client-ip=178.21.23.139 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=disroot.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=disroot.org header.i=@disroot.org header.b="i/uR/N1r" Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 5304C22F71; Mon, 24 Nov 2025 17:06:00 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id CMQpHf2NTp7J; Mon, 24 Nov 2025 17:05:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1764000351; bh=tVGA3qkz7Jn3pFsnWVBSvJRfpOJhIduZOIwHA2N9N7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=i/uR/N1r6RVrndde0GpFFQVYpW569G6uBJfViOPC+XGrcbLVCKC6CPmcMw8zByR50 8fY+97d9+V9FJagF2DyGck6pHQSoBynmpcSxngMNtRLYen13nclgUf9syCetMyOQpz SvlLFkGBFZCZ3zx4rxBzGa/u+J3Qn4/9Qhj9ySt3PvI0yfkaaTrgxLzNPBlbvPnYlB Dun1EFr3X14/PvTiATHkuf5iklGoLNhMxqwn1kJGJPyGGQsJnJHGOdjBVe5yRxDDaQ m0enm0sSlQltZJjAxtMXi1/s/jDgLZJbINqQdpMsVnn6nLleA68wCAmUjyiuFdLnnj SO5AW+/g3fX/Q== From: Yao Zi To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Yanteng Si , Huacai Chen , "Russell King (Oracle)" , Philipp Stanner , Tiezhu Yang , Qunqin Zhao , Yao Zi , Vladimir Oltean , Furong Xu <0x1207@gmail.com>, Kunihiko Hayashi , Jacob Keller Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Mingcong Bai , Kexy Biscuit , Yanteng Si Subject: [PATCH net-next v5 3/3] net: stmmac: pci: Use generic PCI suspend/resume routines Date: Mon, 24 Nov 2025 16:04:17 +0000 Message-ID: <20251124160417.51514-4-ziyao@disroot.org> In-Reply-To: <20251124160417.51514-1-ziyao@disroot.org> References: <20251124160417.51514-1-ziyao@disroot.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Convert STMMAC PCI glue driver to use the generic platform suspend/resume routines for PCI controllers, instead of implementing its own one. Signed-off-by: Yao Zi Reviewed-by: Russell King (Oracle) Reviewed-by: Yanteng Si --- drivers/net/ethernet/stmicro/stmmac/Kconfig | 3 +- .../net/ethernet/stmicro/stmmac/stmmac_pci.c | 36 ++----------------- 2 files changed, 5 insertions(+), 34 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethe= rnet/stmicro/stmmac/Kconfig index ad7ae3618099..907fe2e927f0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -376,8 +376,9 @@ config DWMAC_LOONGSON =20 config STMMAC_PCI tristate "STMMAC PCI bus support" - depends on STMMAC_ETH && PCI + depends on PCI depends on COMMON_CLK + select STMMAC_LIBPCI help This selects the platform specific bus support for the stmmac driver. This driver was tested on XLINX XC2V3000 FF1152AMT0221 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net= /ethernet/stmicro/stmmac/stmmac_pci.c index afb1c53ca6f8..270ad066ced3 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -14,6 +14,7 @@ #include =20 #include "stmmac.h" +#include "stmmac_libpci.h" =20 struct stmmac_pci_info { int (*setup)(struct pci_dev *pdev, struct plat_stmmacenet_data *plat); @@ -102,37 +103,6 @@ static const struct stmmac_pci_info snps_gmac5_pci_inf= o =3D { .setup =3D snps_gmac5_default_data, }; =20 -static int stmmac_pci_suspend(struct device *dev, void *bsp_priv) -{ - struct pci_dev *pdev =3D to_pci_dev(dev); - int ret; - - ret =3D pci_save_state(pdev); - if (ret) - return ret; - - pci_disable_device(pdev); - pci_wake_from_d3(pdev, true); - return 0; -} - -static int stmmac_pci_resume(struct device *dev, void *bsp_priv) -{ - struct pci_dev *pdev =3D to_pci_dev(dev); - int ret; - - pci_restore_state(pdev); - pci_set_power_state(pdev, PCI_D0); - - ret =3D pci_enable_device(pdev); - if (ret) - return ret; - - pci_set_master(pdev); - - return 0; -} - /** * stmmac_pci_probe * @@ -212,8 +182,8 @@ static int stmmac_pci_probe(struct pci_dev *pdev, plat->safety_feat_cfg->prtyen =3D 1; plat->safety_feat_cfg->tmouten =3D 1; =20 - plat->suspend =3D stmmac_pci_suspend; - plat->resume =3D stmmac_pci_resume; + plat->suspend =3D stmmac_pci_plat_suspend; + plat->resume =3D stmmac_pci_plat_resume; =20 return stmmac_dvr_probe(&pdev->dev, plat, &res); } --=20 2.51.2