From patchwork Tue Jul 18 13:20:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Felsch X-Patchwork-Id: 13318585 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 90288C001B0 for ; Wed, 19 Jul 2023 08:35:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=THijIN+Qcfyv+LCUsu383jcpFy8GWyDqs0J6/hYtd5A=; b=wGOVWln96Z9S9l tw8kU2D9M14UYs2IsZYVbtXOYIAHsmLGl1Pdwar0c7cS5hVwxPAdeCapW2wY4xZszLCnoUG0viula ugt27b6Hf15xsR5Gt7fl9Ws4B6zi3nh8ZKi2V1gSe2ESmiAyIgVbXPzFu9A9vxFvZ1Bialbf3eaw2 Rup/+bJIoLTBfTereLkE8KQoPnnOsMWm5go6uLBJswZHx9TV4Cas1NuThvL92b7gHMqDFZIiT5iZd fKPTT9w3yWJDSxu/Sk1N5XC3nPIDT2AveU5Llw9wFLRn3Nz5CgtXkPlstzPVSKFx0RjC/ewae5Klp 9UN5c6f7P4xPybu8Rr7g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qM2eh-006OT3-0O; Wed, 19 Jul 2023 08:35:31 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qM2eg-006OSe-0e for linux-arm-kernel@bombadil.infradead.org; Wed, 19 Jul 2023 08:35:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=tsJJVxCO/ZuHd7PmJP/FxBVjkM1MXSbCaP9I3Yl1Jhg=; b=FXICNTi5u6JRXa9enmtJrjHwDj Te22LVRlHNv7DHL50QfkJP4HoaxuB0AJNEikPQCgA+zTJOPXhyMZD46r+/+qzNxLuFFegnZPNDU4t NHUKh+Lc6URnXa9NxT8kgzrsbN36o/YiSJNeAye2fiMPaQg7exZwDNJGjyALXkdYi/dD0N1/8qdlY 2ADtqZHBYpE1uGuri+fQCNLTx/QSpjFaK2NpBzzJZpFpEn6OroN85moij5PRgzEFF5eHmNfUSYu7n 2eV/pRPpEtGBtBTXqhSW3WoM5XL2CknE1XvhWaH36cxWKhLKUQO5uL69MWDWHaZbBPwaM4GTdQBsY O5vJOwyQ==; Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qLkdl-00BZXT-0g for linux-arm-kernel@lists.infradead.org; Tue, 18 Jul 2023 13:21:23 +0000 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qLkdK-00062z-Og; Tue, 18 Jul 2023 15:20:54 +0200 From: Marco Felsch To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, peppe.cavallaro@st.com, alexandre.torgue@foss.st.com, joabreu@synopsys.com, mcoquelin.stm32@gmail.com Cc: devicetree@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH net-next v2 2/2] net: stmmac: add support for phy-supply Date: Tue, 18 Jul 2023 15:20:49 +0200 Message-Id: <20230718132049.3028341-2-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230718132049.3028341-1-m.felsch@pengutronix.de> References: <20230718132049.3028341-1-m.felsch@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:1101:1d::28 X-SA-Exim-Mail-From: m.felsch@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230718_142121_363079_5BD3B967 X-CRM114-Status: GOOD ( 21.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add generic phy-supply handling support to control the phy regulator to avoid handling it within the glue code. Use the generic stmmac_platform code to register a possible phy-supply and the stmmac_main code to handle the power on/off. Changelog Signed-off-by: Marco Felsch --- v2: - adapt stmmac_phy_power - move power-on/off into stmmac_main to handle WOL - adapt commit message Signed-off-by: Marco Felsch --- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 58 ++++++++++++++++++- .../ethernet/stmicro/stmmac/stmmac_platform.c | 10 ++++ include/linux/stmmac.h | 1 + 3 files changed, 68 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 0fca81507a779..c3700316fed6c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -31,6 +31,7 @@ #include #include #include +#include #ifdef CONFIG_DEBUG_FS #include #include @@ -1123,6 +1124,55 @@ static void stmmac_check_pcs_mode(struct stmmac_priv *priv) } } +/** + * stmmac_phy_power - PHY regulator on/off + * @priv: driver private structure + * @enable: turn on the regulator if true else turn it off + * Enable or disable the regulator powering the PHY. + */ +static int stmmac_phy_power(struct stmmac_priv *priv, bool enable) +{ + struct regulator *regulator = priv->plat->phy_regulator; + struct device *dev = priv->device; + + if (!regulator) + return 0; + + if (enable) { + int ret; + + ret = regulator_enable(regulator); + if (ret) + dev_err(dev, "Fail to enable regulator\n"); + + return ret; + } + + regulator_disable(regulator); + + return 0; +} + +/** + * stmmac_phy_power_on - PHY regulator on + * @priv: driver private structure + * Enable the PHY regulator + */ +static int stmmac_phy_power_on(struct stmmac_priv *priv) +{ + return stmmac_phy_power(priv, true); +} + +/** + * stmmac_phy_power_off - PHY regulator off + * @priv: driver private structure + * Disable the PHY regulator + */ +static void stmmac_phy_power_off(struct stmmac_priv *priv) +{ + stmmac_phy_power(priv, false); +} + /** * stmmac_init_phy - PHY initialization * @dev: net device structure @@ -1248,7 +1298,8 @@ static int stmmac_phy_setup(struct stmmac_priv *priv) return PTR_ERR(phylink); priv->phylink = phylink; - return 0; + + return stmmac_phy_power_on(priv); } static void stmmac_display_rx_rings(struct stmmac_priv *priv, @@ -7469,6 +7520,7 @@ void stmmac_dvr_remove(struct device *dev) if (priv->hw->pcs != STMMAC_PCS_TBI && priv->hw->pcs != STMMAC_PCS_RTBI) stmmac_mdio_unregister(ndev); + stmmac_phy_power_off(priv); destroy_workqueue(priv->wq); mutex_destroy(&priv->lock); bitmap_free(priv->af_xdp_zc_qps); @@ -7532,6 +7584,8 @@ int stmmac_suspend(struct device *dev) if (device_may_wakeup(priv->device)) phylink_speed_down(priv->phylink, false); phylink_suspend(priv->phylink, false); + if (!priv->plat->use_phy_wol) + stmmac_phy_power_off(priv); } rtnl_unlock(); @@ -7614,6 +7668,8 @@ int stmmac_resume(struct device *dev) priv->irq_wake = 0; } else { pinctrl_pm_select_default_state(priv->device); + if (!priv->plat->use_phy_wol) + stmmac_phy_power_on(priv); /* reset the phy so that it's ready */ if (priv->mii) stmmac_mdio_reset(priv->mii); diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index eb0b2898daa3d..fb160633ef347 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -423,6 +424,15 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) if (plat->interface < 0) plat->interface = plat->phy_interface; + /* Optional regulator for PHY */ + plat->phy_regulator = devm_regulator_get_optional(&pdev->dev, "phy"); + if (IS_ERR(plat->phy_regulator)) { + if (PTR_ERR(plat->phy_regulator) == -EPROBE_DEFER) + return ERR_CAST(plat->phy_regulator); + dev_info(&pdev->dev, "No regulator found\n"); + plat->phy_regulator = NULL; + } + /* Some wrapper drivers still rely on phy_node. Let's save it while * they are not converted to phylink. */ plat->phy_node = of_parse_phandle(np, "phy-handle", 0); diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 225751a8fd8e3..456bab4a3b362 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -209,6 +209,7 @@ struct plat_stmmacenet_data { int phy_addr; int interface; phy_interface_t phy_interface; + struct regulator *phy_regulator; struct stmmac_mdio_bus_data *mdio_bus_data; struct device_node *phy_node; struct device_node *phylink_node;