From patchwork Fri Jul 21 11:03:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Felsch X-Patchwork-Id: 123815 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp144584vqg; Fri, 21 Jul 2023 04:47:45 -0700 (PDT) X-Google-Smtp-Source: APBJJlGG97fUvIj+i9Nwt1RBYtp4Vc8ZWcDckqUBgVtZdgVJeWCxzppXfzuRcCrJsE8HoI5gmCB3 X-Received: by 2002:a17:906:5a54:b0:993:f9b2:93c1 with SMTP id my20-20020a1709065a5400b00993f9b293c1mr1293593ejc.9.1689940065528; Fri, 21 Jul 2023 04:47:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689940065; cv=none; d=google.com; s=arc-20160816; b=ArK2JFNZ+gHDHc+gxwbDGRG+IRqWiM1kBJbRogpYtxn55dGiLTdtPZZpAvTYQ45VDd Io7jqVaKKyxuNEYjuEDU/uEePxB2KgmfMaJsTH8h0gPQFchMfaKQ92jA3BqzCRsorb9a MkWVOPCAefyebUoUr2d6oqTduByTn85yISsroQGCQgozbcFiBqa1GY/6WY8A1XHRwg8r ccH485XY5GWaVhXpvO4NUrtMvmNcTBlBqihqqx/lhlsn/Lq24GbtkIJJzjIseTGjRwgI GUg1k4rqdj2IiFTtqA4e+qLVYlQvy06n/iJ0Yez8hHdZNr4X2oGee9kSs68bob2H+m9P mnog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=1vS1YQieIpXzSNCMdP4isLtJWQYxixPgRsQ0uczaA8o=; fh=/jmAP7gN7zembLy1LEj3LQ6EGWKPXnThWr+GY2cg3sk=; b=dbKcAnjaSP4wUTaomgIc9hqJt6jEhP6UK8i2w2qfYVNeq876WzXFUmyggcvyXrO/ac cWy4e+QVV2pkpOQSb8IvrlvsW/NGS0kvrwqYQXXrk7v1Pp5Zld10ELBl+uxvG1JXs6OW APPZ1h0oUEWp/PQez3cp7Yx1+RWi1SQzXHSFuiVVUAj37W1z3qCwpWpyPh4uKAWgMgQO BGjOMaXCur4n0JoSSJxaWoxcKvgcp3pQap8SIBdyY3cr4k1H2vo0TufAANsovU0Au3En Nfubmx8gsM05krxm+QcaYdlIj8PiB2h58m+YrFRZCSGwVL8HTzlvoRLO3guL/4ERXoXm QO3g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b16-20020a170906039000b0099279210464si1894358eja.420.2023.07.21.04.46.58; Fri, 21 Jul 2023 04:47:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231441AbjGULIz (ORCPT + 99 others); Fri, 21 Jul 2023 07:08:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231876AbjGULIE (ORCPT ); Fri, 21 Jul 2023 07:08:04 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D8D0449A for ; Fri, 21 Jul 2023 04:04:33 -0700 (PDT) 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 1qMnvK-0000Ly-Jj; Fri, 21 Jul 2023 13:03:50 +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-arm-kernel@lists.infradead.org Subject: [PATCH net-next v4 1/3] dt-bindings: net: snps,dwmac: add phy-supply support Date: Fri, 21 Jul 2023 13:03:43 +0200 Message-Id: <20230721110345.3925719-1-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.39.2 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-kernel@vger.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772030594162766411 X-GMAIL-MSGID: 1772030594162766411 Document the common phy-supply property to be able to specify a phy regulator. Signed-off-by: Marco Felsch Acked-by: Krzysztof Kozlowski --- Changelog: v4: - no changes v3: - no changes v2 - add ack-by Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index ddf9522a5dc23..847ecb82b37ee 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -160,6 +160,9 @@ properties: can be passive (no SW requirement), and requires that the MAC operate in a different mode than the PHY in order to function. + phy-supply: + description: PHY regulator + snps,axi-config: $ref: /schemas/types.yaml#/definitions/phandle description: From patchwork Fri Jul 21 11:03:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Felsch X-Patchwork-Id: 123806 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp135290vqg; Fri, 21 Jul 2023 04:27:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlEV1cWrbeOqeNHexparZ7cUUxAu0tnlyIUuVuxJ3HrKMuzbESnaE4dxgbAlA1Zoi3ygXsO8 X-Received: by 2002:a17:902:eccb:b0:1b8:5735:2850 with SMTP id a11-20020a170902eccb00b001b857352850mr1460162plh.32.1689938874031; Fri, 21 Jul 2023 04:27:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689938873; cv=none; d=google.com; s=arc-20160816; b=Bi10RzVCFdT5enMo7fswNxcqnGDirc07/FTJxzO9Xm5HdaxMbDm+KHxXVidtMzbHh0 4CYbRPF8g11aoVI0ipPKrwqje0Fbh/7Hgipzg7KjPLKWRPCOL1h8kuJZKa9Z68n6cbqn 3yWUqWg5DXfigXNhXn6VG99ziOtTQKxfWZoP5kslgk/CKKbUu3CFYI+/TCTAAS7uHIzI KuYBExJlHFy7+ZhJaAndEBXP1tOc3XhdwOsyN+WhBHH0Xr6dQdMNWWccxZHS8kL+AL1g oqLchXm4T6YqoORsKNJ6JPhI5/qNoG7Dx8//e176k6cdsTRWpFwcpNK7D+XNaimj1mlD 2jQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=OQ4IDKxjNH061s8OF6cm8tVEYtBz0EbQpLSU3CyvVhw=; fh=/jmAP7gN7zembLy1LEj3LQ6EGWKPXnThWr+GY2cg3sk=; b=lIvOlqhQUitPPwukxdbYdXbtD8yqedt8EpUWxVqrhtYRop0JkJk/UBiFaqtdIEb8/1 M8d/yfN0yXdAj7Sk8HeZ10rI40tc9elkCCTCGAqWWfy7g3mCSP+p47YdYqMedMDOwvqH IgMbqRt5y6J0Kn6QOlKt+lLbk27VHYiN2XtV1VZsx19WQ5LfM78+kHy3ecAR68SwfBzY CctXopxQNAbVjghILITmXOmpoqO1CSL4tYQ0wzuUL/CBeM91zEGQl4iE7F4hyzkAjCKT rVMIkcsBqzP0fFEl8b5CizHstuCJFy/inZ/4Xfz70U75NuOEcmSrSpR776q6LwAK+Y0o F/qg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q12-20020a170902f34c00b001b7dcf3dd97si2706352ple.302.2023.07.21.04.27.40; Fri, 21 Jul 2023 04:27:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229890AbjGULJA (ORCPT + 99 others); Fri, 21 Jul 2023 07:09:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231916AbjGULIG (ORCPT ); Fri, 21 Jul 2023 07:08:06 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96A2730E2 for ; Fri, 21 Jul 2023 04:04:34 -0700 (PDT) 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 1qMnvL-0000Ly-A7; Fri, 21 Jul 2023 13:03:51 +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-arm-kernel@lists.infradead.org Subject: [PATCH net-next v4 2/3] net: stmmac: introduce small helper to check STMMAC_FLAG_USE_PHY_WOL Date: Fri, 21 Jul 2023 13:03:44 +0200 Message-Id: <20230721110345.3925719-2-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230721110345.3925719-1-m.felsch@pengutronix.de> References: <20230721110345.3925719-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-kernel@vger.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772029345123242482 X-GMAIL-MSGID: 1772029345123242482 Add a convenient helper to make it easier to check the STMMAC_FLAG_USE_PHY_WOL flag which is useful for the follow up commit. Signed-off-by: Marco Felsch --- Changelog: v4: - new patch drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index e7ca52f0d2f2d..add271ec8d801 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -6949,6 +6949,11 @@ static void stmmac_service_task(struct work_struct *work) clear_bit(STMMAC_SERVICE_SCHED, &priv->state); } +static bool stmmac_use_phy_wol(struct stmmac_priv *priv) +{ + return priv->plat->flags & STMMAC_FLAG_USE_PHY_WOL; +} + /** * stmmac_hw_init - Init the MAC device * @priv: driver private structure @@ -6983,7 +6988,7 @@ static int stmmac_hw_init(struct stmmac_priv *priv) */ priv->plat->enh_desc = priv->dma_cap.enh_desc; priv->plat->pmt = priv->dma_cap.pmt_remote_wake_up && - !(priv->plat->flags & STMMAC_FLAG_USE_PHY_WOL); + !stmmac_use_phy_wol(priv); priv->hw->pmt = priv->plat->pmt; if (priv->dma_cap.hash_tb_sz) { priv->hw->multicast_filter_bins = From patchwork Fri Jul 21 11:03:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Felsch X-Patchwork-Id: 123818 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp145832vqg; Fri, 21 Jul 2023 04:50:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlGgmcoFNsUV3ttiDoXsozKo1uPHmtxscuLrsKlWNjzay8fVggYl0Mr0joPp4VKCpeZjPUv+ X-Received: by 2002:a17:907:77c9:b0:98e:1b9b:aef7 with SMTP id kz9-20020a17090777c900b0098e1b9baef7mr1469229ejc.64.1689940226642; Fri, 21 Jul 2023 04:50:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689940226; cv=none; d=google.com; s=arc-20160816; b=iUo8hXcHmeqLS43n87/HE5+CesNfwIx8HPkEbkyxYA8rn1lZqn8EHkKJsx5Q814nSu n1XY+K7Mu6QObEm1PlKG7BT1U4Prv5ItZPYUApD48Ds90ftiEnoTCC3Zurph6hjN9Eq1 rHEvMJUzbZaJXRRqkSWfrSQZA4BfVlhT8WYeeNHFhYl+7JrQnNfghHrOBoxQm+NkwOeM S1w4deMHpBMtIyk1fhtKW4Dd0TJZnmvw99kIlze/u+e0dEzlnhxfQ7CL79PM/IGVrLdU TsNOH1bSArbMJLNJ4DL9/k4D7wh6GBQ9u5syPLhne+sWQL3d58s6It17TsLvb+6s4RV/ 4UYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=whN+t2JmroRRSp8DiMtknmUwzwJEVMMK8S8q7ffO5QU=; fh=/jmAP7gN7zembLy1LEj3LQ6EGWKPXnThWr+GY2cg3sk=; b=ssTjZi7ZgVxV7TdCzkeIxzAgiYPqqCvzQQLet43Lfl+K0EiOGFyJThrwFvq1wd4O8N RU2efB1ga6bVuaPiJmOzjKaG/CSs+04t62aRUmqII9bwMN/1MBDbB+3Hw8tJybGVheFn OtiPlk2C6E3/gK8oc/1TynPbl76Nd89p8k7sOKd6uf/g0XpGNcwmUsN5hfDu2uDSs7nc euV4p8b4qB7ZnGyzwSsTPFc3E9t/k22jFfv2xtbJmp1oo9maz/NREGNncAUo+pisMtJs wxHwIUGHxPkSwhAvsxXeDQ4QennrcMEYx0XLbc17HqxqylKGUGmAK8GJaU1dl1c0KANp rwew== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id va29-20020a17090711dd00b0099279210460si2037482ejb.643.2023.07.21.04.50.03; Fri, 21 Jul 2023 04:50:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231426AbjGULJG (ORCPT + 99 others); Fri, 21 Jul 2023 07:09:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231897AbjGULIF (ORCPT ); Fri, 21 Jul 2023 07:08:05 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3DEC449D for ; Fri, 21 Jul 2023 04:04:33 -0700 (PDT) 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 1qMnvM-0000Ly-0H; Fri, 21 Jul 2023 13:03:52 +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-arm-kernel@lists.infradead.org Subject: [PATCH net-next v4 3/3] net: stmmac: add support for phy-supply Date: Fri, 21 Jul 2023 13:03:45 +0200 Message-Id: <20230721110345.3925719-3-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230721110345.3925719-1-m.felsch@pengutronix.de> References: <20230721110345.3925719-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-kernel@vger.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772030763359785315 X-GMAIL-MSGID: 1772030763359785315 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. Signed-off-by: Marco Felsch --- Changelog v4: - fix use_phy_wol - v3-link: https://lore.kernel.org/lkml/20230720072304.3358701-1-m.felsch@pengutronix.de v3: - rebased onto net-next/main - fixed changelog style - v2-link: https://lore.kernel.org/lkml/20230718132049.3028341-1-m.felsch@pengutronix.de v2: - adapt stmmac_phy_power - move power-on/off into stmmac_main to handle WOL - adapt commit message - v1-link: https://lore.kernel.org/lkml/20230717164307.2868264-1-m.felsch@pengutronix.de .../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 add271ec8d801..9ec8964ab3582 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 @@ -1128,6 +1129,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 @@ -1253,7 +1303,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, @@ -7593,6 +7644,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); @@ -7656,6 +7708,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 (!stmmac_use_phy_wol(priv)) + stmmac_phy_power_off(priv); } rtnl_unlock(); @@ -7738,6 +7792,8 @@ int stmmac_resume(struct device *dev) priv->irq_wake = 0; } else { pinctrl_pm_select_default_state(priv->device); + if (!stmmac_use_phy_wol(priv)) + 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 23d53ea04b24d..18988da4614cd 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -424,6 +425,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 ef67dba775d04..b5d2d75de2759 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -222,6 +222,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;