From nobody Sun Feb 8 09:32:59 2026 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 DA19B202C5C; Tue, 4 Nov 2025 15:17:27 +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=1762269450; cv=none; b=PxuOOWZXzqc7FTa0c8NfNFHLKYE6SaYpdLH+oRHv5BHC+nSwLgRtE6QRIUiUnOC7Ciyp94LfPUVd22eDFJcm+TT4wBIGnOqybCfjSiwl3o+WrHKuGL07lFaMyp6OqQFQf22/q6yNmhwmcti1NPjXS4gvz/Umb+Fdw/n+A3JUnyc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762269450; c=relaxed/simple; bh=X1/6Xk+r37L1BEB0kWKL8MILdGHdA0/JEUGijrIi0KI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u+I3ifjaJUXX75H0/NOxBgCk9GNjx1z/5kaqk6cXmnO1HgnOQ57UdhEAm+mxhsskQG+APpXgX853H0RIouea9VS3nGDT0rwXOivO12Mbx1mIyzhQKSrL6WevVD9igZ1/lz8KR+ExW9mawSrnIMMxns2ogIDoktLzpaqKmqb0g24= 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=WrpeAfoi; 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="WrpeAfoi" Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4CE2F2624C; Tue, 4 Nov 2025 16:17:26 +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 y9cin3ma4C6I; Tue, 4 Nov 2025 16:17:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1762269445; bh=X1/6Xk+r37L1BEB0kWKL8MILdGHdA0/JEUGijrIi0KI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WrpeAfois28NdLClwidKC7UF6OyolitvwoUD9UenIFXZpFuUkU4uNmt6LwuMg6Jj/ JXtBVwHuSnaN+ZkVSLYDdOYYzdx9QdHO4UyGwUqXhxqWoB+4kH+V4LEBtD/vH36L6y 3IPINS+iyujPnGyThUvyJJUcGIn/0t5754IrySC12HjiYgxhCEoKk5Qj4P6/lH5IJj yOyPjL+jMLHKeNNd3EHQ9bDGC2W5mf6FKAEb2BLqVBZbNQ3Sk9Q7jjAKuxD/Z4wQv1 jlWXmiPv4jVyDu9Mk9L1ubD4Mok+Es/t8jBSY+IlSumi/YIzJNQPD5zcffYe71QjCf xfo8Z43Y4mNyg== 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 Subject: [PATCH net-next v3 1/3] net: stmmac: Add generic suspend/resume helper for PCI-based controllers Date: Tue, 4 Nov 2025 15:16:45 +0000 Message-ID: <20251104151647.3125-2-ziyao@disroot.org> In-Reply-To: <20251104151647.3125-1-ziyao@disroot.org> References: <20251104151647.3125-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) --- drivers/net/ethernet/stmicro/stmmac/Kconfig | 8 ++++ drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + .../ethernet/stmicro/stmmac/stmmac_libpci.c | 48 +++++++++++++++++++ .../ethernet/stmicro/stmmac/stmmac_libpci.h | 12 +++++ 4 files changed, 69 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..1350f16f7138 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -349,6 +349,14 @@ config DWMAC_VISCONTI =20 endif =20 +config STMMAC_LIBPCI + tristate "STMMAC PCI helper library" + depends on PCI + default y + help + This selects the PCI bus helpers for the stmmac driver. If you + have a controller with PCI interface, say Y or M here. + 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 Sun Feb 8 09:32:59 2026 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 3A2AA239E97; Tue, 4 Nov 2025 15:17:36 +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=1762269458; cv=none; b=czGafy45iKUF1SlpAoyvVuOcbplRepCa/kS78BNNmanzNCskIX7d8O3vMu9CEvGb6ubz5+YHMXNtWDOztuTMgxo/PiK23Eum1ATNoQ+x+VI7iKWTFi1vXBWuZcPmyk0mrcK7UyPvvCWAg/YnJzxFa6ajw9tRi2geCxyThaEga4Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762269458; c=relaxed/simple; bh=HFWNC322p9MDNILlse/9+tk0gmWbj3GRTnHZZzpy53c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CYtXtskvGCS7x3/oL3J5WWroY/R7Pq+1dSUWvP2D6p7ExoyoAJbuoFck7tV4CfCFCZepFURCfUbSxt7L+FZz/oQkqQmVxo/uVl2TqkZfdlINU+PdJtJgbhsbYXRfjvQS314lXSHO7/2+ALkhLAt0wxHqEnmQAP0sGuP5gnZaQyE= 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=W5+ISS6B; 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="W5+ISS6B" Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 82FB420EF2; Tue, 4 Nov 2025 16:17:35 +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 tb92WTFfUfMD; Tue, 4 Nov 2025 16:17:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1762269454; bh=HFWNC322p9MDNILlse/9+tk0gmWbj3GRTnHZZzpy53c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=W5+ISS6Bb/sAD6fKIM3QYmL6uvkSBeM1y0XhLd4W5Xrbg5RGkOfzX2OVqvbGBuULb ML1NVrapw+QesEQ5/kbTWiHb4fC5bU5lOLT3llkTghVrCWhVJKTRRxQL64B1PD7Rbu WgUAWz6hK103nl2/L46a0iSb7iaa25CucvwzaBWQftPQpXjc/N+bpLJLUZDBtciu0j vUshUkkIB3Qe8ZHWpwrjcNZlZrZEF8UIp4ZvEltKzfPUgXW273sKRgpZUROujVFbs7 He+ea4kuzVKFmXbwLrrAxm2CYkO3fyFcpFCzd/CmkX8z+N5RzjIEfbwdcA+Cc0ANo4 ikqu8XFh0D0+g== 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 Subject: [PATCH net-next v3 2/3] net: stmmac: loongson: Use generic PCI suspend/resume routines Date: Tue, 4 Nov 2025 15:16:46 +0000 Message-ID: <20251104151647.3125-3-ziyao@disroot.org> In-Reply-To: <20251104151647.3125-1-ziyao@disroot.org> References: <20251104151647.3125-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 --- drivers/net/ethernet/stmicro/stmmac/Kconfig | 4 +++ .../ethernet/stmicro/stmmac/dwmac-loongson.c | 36 ++----------------- 2 files changed, 7 insertions(+), 33 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethe= rnet/stmicro/stmmac/Kconfig index 1350f16f7138..7ec7c7630c41 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -367,6 +367,8 @@ config DWMAC_INTEL This selects the Intel platform specific bus support for the stmmac driver. This driver is used for Intel Quark/EHL/TGL. =20 +if STMMAC_LIBPCI + config DWMAC_LOONGSON tristate "Loongson PCI DWMAC support" default MACH_LOONGSON64 @@ -376,6 +378,8 @@ config DWMAC_LOONGSON This selects the LOONGSON PCI bus support for the stmmac driver, Support for ethernet controller on Loongson-2K1000 SoC and LS7A1000 bri= dge. =20 +endif + config STMMAC_PCI tristate "STMMAC PCI bus support" depends on STMMAC_ETH && PCI diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers= /net/ethernet/stmicro/stmmac/dwmac-loongson.c index 2a3ac0136cdb..584dc4ff8320 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 @@ -525,37 +526,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; @@ -600,8 +570,8 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, c= onst struct pci_device_id plat->bsp_priv =3D ld; plat->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 Sun Feb 8 09:32:59 2026 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 B519119644B; Tue, 4 Nov 2025 15:18:37 +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=1762269519; cv=none; b=m2+ZjpnrvrUGtLqlfrVNQDkykxZz6dFSpcC7Lpks9v7UHp/PVtdDPIu8PfVrRd3wS4NiQA61UYAR6oeYwRIgbuAuteI0P3Plzbk8rzHUCKRs6fYa4HwIqaAPR+ojnd5esnMRjS4Hce3oD+qGEcoHZ5WW2JyYaKYA/9HrEAjEfxA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762269519; c=relaxed/simple; bh=d999Gw2gebQ4f4VMTPEHK+xcUWBQzBf0MbaJId6XIGs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RkvRa5xgBBsn6tv8laS7h+mZIH/MgCZW/x02oU1WfR4aDCvlkBiaz+J83x8Wq448JTZtxAonBwF3k9BIaCkTGzmvBG5PMhob5SJmyB/KD0VGZIbG61pkK6b3Ag/wmstcqYCluK6SMju9+36Agvl9urfZMf8/iWK/3l59bR/YGVU= 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=iF/gu8yS; 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="iF/gu8yS" Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 778752626F; Tue, 4 Nov 2025 16:18:36 +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 XlOfxSJXBXVb; Tue, 4 Nov 2025 16:18:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1762269515; bh=d999Gw2gebQ4f4VMTPEHK+xcUWBQzBf0MbaJId6XIGs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iF/gu8ySs67ScCnyuf+9o3Gh0+Yi83OpdMTKoyNmRcsUAzv0ukoEBTlLv0j/pFWn+ TnIEHKrxa2BXYMSkcTWy/ipJiX4nuZs9aJ4MOJEQCYZKm7REoc99ITUXPzCvGMp0e7 aTHEZptH2lmoCLSUyhZ4SCWhwLBwVM8HHQxsbRohaG5fnwTmNfMt6xtKepv1adkn0l IGT7/nAR4mV4hFz1OrOVl/krpJOlTcpeAMcYPP0JAzqlf3fTFLf19/zB716jTskjj2 1omfYI4Q8szn1qUjpvV2tAPeaWLikGA/B1s2jGb/uoA1ZP/znvjRA2sI5XjoQWJC6r MXQAOa3VK3sCA== 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 Subject: [PATCH net-next v3 3/3] net: stmmac: pci: Use generic PCI suspend/resume routines Date: Tue, 4 Nov 2025 15:16:47 +0000 Message-ID: <20251104151647.3125-4-ziyao@disroot.org> In-Reply-To: <20251104151647.3125-1-ziyao@disroot.org> References: <20251104151647.3125-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 --- drivers/net/ethernet/stmicro/stmmac/Kconfig | 5 +-- .../net/ethernet/stmicro/stmmac/stmmac_pci.c | 36 ++----------------- 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethe= rnet/stmicro/stmmac/Kconfig index 7ec7c7630c41..59aa04e71aab 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -378,8 +378,6 @@ config DWMAC_LOONGSON This selects the LOONGSON PCI bus support for the stmmac driver, Support for ethernet controller on Loongson-2K1000 SoC and LS7A1000 bri= dge. =20 -endif - config STMMAC_PCI tristate "STMMAC PCI bus support" depends on STMMAC_ETH && PCI @@ -392,4 +390,7 @@ config STMMAC_PCI If you have a controller with this interface, say Y or M here. =20 If unsure, say N. + +endif + endif diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net= /ethernet/stmicro/stmmac/stmmac_pci.c index 94b3a3b27270..fa92be672c54 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); @@ -139,37 +140,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 * @@ -249,8 +219,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