net: stmmac: Power up SERDES after the PHY link
Subsystems (5)
Jon Hunter
maintainerPATCH v6 1/2 net: stmmac: Power up SERDES after the PHY link
From: Revanth Kumar Uppala <[email protected]>
The Tegra MGBE ethernet controller requires that the SERDES link is powered-up after the PHY link is up, otherwise the link fails to become ready following a resume from suspend. Add a variable to indicate that the SERDES link must be powered-up after the PHY link.
---
Changes since V5:
- None
Changes since V4:
- This patch was added in the 5th iteration of the series.
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +++++-- include/linux/stmmac.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +5 -2
@@ -988,6 +988,9 @@ static void stmmac_mac_link_up(struct phylink_config *config,struct stmmac_priv *priv =netdev_priv (to_net_dev (config->dev));u32 old_ctrl, ctrl; +if (priv->plat->serdes_up_after_phy_linkup && priv->plat->serdes_powerup) + priv->plat->serdes_powerup (priv->dev, priv->plat->bsp_priv); + old_ctrl =readl (priv->ioaddr +MAC_CTRL_REG ); ctrl = old_ctrl & ~priv->hw->link.speed_mask;
@@ -3801,7 +3804,7 @@ static int __stmmac_open(struct net_device *dev,stmmac_reset_queues_param (priv); -if (priv->plat->serdes_powerup) { +if (!priv->plat->serdes_up_after_phy_linkup && priv->plat->serdes_powerup) { ret = priv->plat->serdes_powerup (dev, priv->plat->bsp_priv);if (ret <0 ) { netdev_err(priv->dev, "%s: Serdes powerup failed\n",
@@ -7510,7 +7513,7 @@ int stmmac_resume(struct device *dev)stmmac_mdio_reset (priv->mii); } -if (priv->plat->serdes_powerup) { +if (!priv->plat->serdes_up_after_phy_linkup && priv->plat->serdes_powerup) { ret = priv->plat->serdes_powerup (ndev, priv->plat->bsp_priv);
include/linux/stmmac.h +1 -0
@@ -271,5 +271,6 @@ struct plat_stmmacenet_data {int msi_tx_base_vec;bool use_phy_wol;bool sph_disable; + bool serdes_up_after_phy_linkup; };#endif
Signature · 1 line
2.25.1
Jon Hunter
maintainerPATCH v6 2/2 net: stmmac: tegra: Add MGBE support
From: Bhadram Varka <[email protected]>
Add support for the Multi-Gigabit Ethernet (MGBE/XPCS) IP found on NVIDIA Tegra234 SoCs.
---
Changes since V5:
- Fixed clang warning
- Updated Kconfig help information
Changes since V4:
- Reduce time spent polling for the RX link to be ready
- Propagate the errors when bringing up the link fails.
- Added suspend/resume support
- Ensure clocks are disabled again on probe/resume failure Changes since V3:
- None
Changes since V2:
- None
Changes since V1:
- None
drivers/net/ethernet/stmicro/stmmac/Kconfig | 9 + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + .../net/ethernet/stmicro/stmmac/dwmac-tegra.c | 388 ++++++++++++++++++ 3 files changed, 398 insertions(+) create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c
drivers/net/ethernet/stmicro/stmmac/Kconfig +9 -0
@@ -235,6 +235,15 @@ config DWMAC_INTEL_PLAT the stmmac device driver. This driver is used for the Intel Keem Bay SoC. +config DWMAC_TEGRA + tristate "NVIDIA Tegra MGBE support" + depends on ARCH_TEGRA || COMPILE_TEST + help + This selects the Multi-GigaBit Ethernet (MGBE) Controller that is + found on the NVIDIA Tegra SoC devices. This driver provides the glue + layer on top of the stmmac driver required for these NVIDIA Tegra SoC + devices. + config DWMAC_VISCONTI tristate "Toshiba Visconti DWMAC support" default ARCH_VISCONTI
drivers/net/ethernet/stmicro/stmmac/Makefile +1 -0
@@ -31,6 +31,7 @@ obj-$(CONFIG_DWMAC_DWC_QOS_ETH) += dwmac-dwc-qos-eth.o obj-$(CONFIG_DWMAC_INTEL_PLAT) += dwmac-intel-plat.o obj-$(CONFIG_DWMAC_GENERIC) += dwmac-generic.o obj-$(CONFIG_DWMAC_IMX8) += dwmac-imx.o +obj-$(CONFIG_DWMAC_TEGRA) += dwmac-tegra.o obj-$(CONFIG_DWMAC_VISCONTI) += dwmac-visconti.o stmmac-platform-objs:= stmmac_platform.o dwmac-altr-socfpga-objs := altr_tse_pcs.o dwmac-socfpga.o
drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c new file +388 -0
388 lines not on this page · raw message
Signature · 1 line
2.25.1
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 8 lines · On Thu, 1 Dec 2022 15:58:43 +0000 you wrote:
From: Revanth Kumar Uppala <[email protected]>
The Tegra MGBE ethernet controller requires that the SERDES link is powered-up after the PHY link is up, otherwise the link fails to become ready following a resume from suspend. Add a variable to indicate that the SERDES link must be powered-up after the PHY link.
[...]
Here is the summary with links:
- [V6,1/2] net: stmmac: Power up SERDES after the PHY link
https://git.kernel.org/netdev/net-next/c/a46e90101242 - [V6,2/2] net: stmmac: tegra: Add MGBE support https://git.kernel.org/netdev/net-next/c/d8ca113724e7
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html