From patchwork Fri Jun 3 17:29:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Palatin X-Patchwork-Id: 629951 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rLrgs1J6Hz9s5J for ; Sat, 4 Jun 2016 03:29:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=IC0UvpCk; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161116AbcFCR31 (ORCPT ); Fri, 3 Jun 2016 13:29:27 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:36428 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932695AbcFCR30 (ORCPT ); Fri, 3 Jun 2016 13:29:26 -0400 Received: by mail-pa0-f46.google.com with SMTP id te7so12869295pab.3 for ; Fri, 03 Jun 2016 10:29:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=HkbO8AYjiYw/L9vpg0vRMorzCWrwQVyXT7kxo9klDTw=; b=IC0UvpCkeIixOfSvSlvlOvDxAiJxbsl39JuyMZ8aNot45L2r6VhPZmmT9dAqy+Ucn7 fV9kUumUWo7Xdor5IyI0pCe47U/nP8Qg7RCXv+q86qqXW/i5X8+WrBDbQ9VGLpiJ8TNy kpBoesG2dwEQOB3zvIFNFPWniPi4rPtfB7P9Q+tmvWnGZUTiSIQzifn19N/IMoGnoFgU yulOAw06ukGY9p4BSPrH137m/L9l3Xznnhzo1DtJjQb+L1N4sD5uamO8/mZi3tj1jOXw fiWhBvGYdERG1YhF4LaMQLIBap6XpHnIjQ0udNL5RLW7n0O/0Clm8DzUFz6mhbDOo7FP uK6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=HkbO8AYjiYw/L9vpg0vRMorzCWrwQVyXT7kxo9klDTw=; b=d1tGulrlHp/xNSHPpdbooNg3Bd5EvwqEzarvuiUYfjROx+cuufCnpn29YtS/UHGUGu SQFQE9bS2Fd4noTXa10315/lHGhv7GsqaNIpOJdXg3ZhCj08H8Dwjo1ap8Ymfz4na20w wCwrV3M4O2G/n43WvLx69G9Hl0JPV6KhgMnyCmq5YC1/kwmQWm5QsLPHGmc4HSt3pBsm ST7mssFleYK0uenSkk5pr8+D9AO9imgDtdKM3NIhNseOSWtUOx9vruOVgXm7Ecv4R2C3 B4i1AmXp20QjLm5qOjbX3WHKX2RMrKbVc/yliI7jywiMMJ86cSgEL714ONnvYZbUByS9 nYVg== X-Gm-Message-State: ALyK8tK/hifg+mtRDzmxBmdmHozHrs/WY9fhdig5wIlFqokHoMNvUJCfle0EKhkCAYozOtwW X-Received: by 10.67.3.161 with SMTP id bx1mr6506015pad.86.1464974965207; Fri, 03 Jun 2016 10:29:25 -0700 (PDT) Received: from vp2.mtv.corp.google.com ([172.22.67.225]) by smtp.gmail.com with ESMTPSA id fl1sm7316093pab.43.2016.06.03.10.29.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Jun 2016 10:29:24 -0700 (PDT) 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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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); }