From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161125AbcFCR31 (ORCPT ); Fri, 3 Jun 2016 13:29:27 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:35132 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932136AbcFCR30 (ORCPT ); Fri, 3 Jun 2016 13:29:26 -0400 From: Vincent Palatin To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Alexandre Torgue , Giuseppe Cavallaro , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Vincent Palatin Subject: [PATCH] net: stmmac: dwmac-rk: keep PHY up for WoL Date: Fri, 3 Jun 2016 10:29:20 -0700 Message-Id: <1464974960-26672-1-git-send-email-vpalatin@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Do not shutdown the PHY if Wake-on-Lan is enabled, else it cannot wake us up. Signed-off-by: Vincent Palatin --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 0cd3ecf..2e45e75 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -534,6 +534,10 @@ static int rk_gmac_init(struct platform_device *pdev, void *priv) struct rk_priv_data *bsp_priv = priv; int ret; + /* Keep the PHY up if we use Wake-on-Lan. */ + if (device_may_wakeup(&pdev->dev)) + return 0; + ret = phy_power_on(bsp_priv, true); if (ret) return ret; @@ -549,6 +553,10 @@ static void rk_gmac_exit(struct platform_device *pdev, void *priv) { struct rk_priv_data *gmac = priv; + /* The PHY was up for Wake-on-Lan. */ + if (device_may_wakeup(&pdev->dev)) + return; + phy_power_on(gmac, false); gmac_clk_enable(gmac, false); } -- 2.8.0.rc3.226.g39d4020