From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EB83C433FE for ; Fri, 8 Oct 2021 10:24:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5921A60FD8 for ; Fri, 8 Oct 2021 10:24:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239786AbhJHK0m (ORCPT ); Fri, 8 Oct 2021 06:26:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236118AbhJHK0k (ORCPT ); Fri, 8 Oct 2021 06:26:40 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78B12C061570; Fri, 8 Oct 2021 03:24:45 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id p1so7816511pfh.8; Fri, 08 Oct 2021 03:24:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=a9+SkQaOPjsBTe9c6aiqQVMNMLolkjNbz68KZM8fxyk=; b=DFRXnnToUO5DrTYgeR64i6seqNB2yC38VBpzv1sBYG1oXZCgJ6GOqLUCfsATR2fsoh 6xQLqTxnWSULuLc9ZeIJUqe16YJgN+3EFgWuMiooxYGKiHeOOd+BlCDcdYp+q27Iqcjl oOI6j6juDnrm3hW+0hzZA/nasRCczpIyaCaeRHBxeWMFKBAnBmu2ZLbI0IWCMPGixnwM syjyYHgLbbFosb2ysbnGVuh3a8USteuYKMRKWSsDXI2IKrF2OC7PwCnuWvWKQeuOFFGi 06rXT8H9H4P3VZ9G6dvV6LpKAEu8dUf4/AVD37LXJB3LrwCXidSRzkiFnllONbgrU9Zj dCpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=a9+SkQaOPjsBTe9c6aiqQVMNMLolkjNbz68KZM8fxyk=; b=iq7ELpSdWng9vMAhIYzK6OL3Wly5T2xVMIhxmptupX2BTsTXpEOwAXbIjU9Xt+C2uB 5amcNrYvfp+CwB/4MEb/fAOZWRtxtMq6RkivdL6w5hoRM6XSHZsxWcmIrfGvtHHN+u/c a8B4gXrzW/pCrH8lrQapfE0eIrN1htzhGfqwcKBgAcaBjtKwkoDMe8cUrPyOi9r3Qr10 6BBKkER3Pzi/AIpQv6J/a1/lvBPTlutYxYoFlz7DsEdiZW+RyvydCPRICNOgUkjcnFvz jTZXUA7870zCe5oVdIDmbNvJoQOFvAN2I5y5r2/6uprGf/Kwh9NbHyDX24kiVqotzt+f 1JOQ== X-Gm-Message-State: AOAM5310FGtJ2qSyBv04TEGmLgfmnlKlywUngRICV6nvsS1IDEnk2FNa z67LzQ70uKYIDRKB3D6l9ms= X-Google-Smtp-Source: ABdhPJy77L0NPD0IPs0pHKmluyLSKJzH8GoOC/pXSo2mzaH+7ffl2xTl/0AOMbNsRCF22s0tLg8AUQ== X-Received: by 2002:a63:8f47:: with SMTP id r7mr1545186pgn.270.1633688684790; Fri, 08 Oct 2021 03:24:44 -0700 (PDT) Received: from jensen.next ([113.109.79.206]) by smtp.gmail.com with ESMTPSA id s37sm2491835pfg.44.2021.10.08.03.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 03:24:44 -0700 (PDT) From: hmz007 To: peppe.cavallaro@st.com, alexandre.torgue@foss.st.com, joabreu@synopsys.com, davem@davemloft.net, kuba@kernel.org, mcoquelin.stm32@gmail.com, p.zabel@pengutronix.de, lgirdwood@gmail.com, broonie@kernel.org Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, hmz007 Subject: [PATCH] net: stmmac: dwmac-rk: Add runtime PM support Date: Fri, 8 Oct 2021 18:24:10 +0800 Message-Id: <20211008102410.6535-1-hmz007@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 2d26f6e39afb ("fix unbalanced pm_runtime_enable warnings") also enables runtime PM, which affects rk3399 with power-domain. After an off-on switch of power-domain, the GMAC doesn't work properly, calling rk_gmac_powerup at runtime resume fixes this issue. Fixes: 2d26f6e39afb ("net: stmmac: dwmac-rk: fix unbalanced pm_runtime_enable warnings") Signed-off-by: hmz007 --- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index ed817011a94a..a9eb98691a66 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "stmmac_platform.h" @@ -1626,7 +1627,8 @@ static int rk_gmac_remove(struct platform_device *pdev) struct rk_priv_data *bsp_priv = get_stmmac_bsp_priv(&pdev->dev); int ret = stmmac_dvr_remove(&pdev->dev); - rk_gmac_powerdown(bsp_priv); + if (!pm_runtime_status_suspended(&pdev->dev)) + rk_gmac_powerdown(bsp_priv); return ret; } @@ -1638,7 +1640,7 @@ static int rk_gmac_suspend(struct device *dev) int ret = stmmac_suspend(dev); /* Keep the PHY up if we use Wake-on-Lan. */ - if (!device_may_wakeup(dev)) { + if (pm_runtime_active(dev) && !device_may_wakeup(dev)) { rk_gmac_powerdown(bsp_priv); bsp_priv->suspended = true; } @@ -1660,7 +1662,24 @@ static int rk_gmac_resume(struct device *dev) } #endif /* CONFIG_PM_SLEEP */ -static SIMPLE_DEV_PM_OPS(rk_gmac_pm_ops, rk_gmac_suspend, rk_gmac_resume); +#ifdef CONFIG_PM +static int rk_gmac_runtime_suspend(struct device *dev) +{ + rk_gmac_powerdown(get_stmmac_bsp_priv(dev)); + return 0; +} + +static int rk_gmac_runtime_resume(struct device *dev) +{ + rk_gmac_powerup(get_stmmac_bsp_priv(dev)); + return 0; +} +#endif + +static const struct dev_pm_ops __maybe_unused rk_gmac_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(rk_gmac_suspend, rk_gmac_resume) + SET_RUNTIME_PM_OPS(rk_gmac_runtime_suspend, rk_gmac_runtime_resume, NULL) +}; static const struct of_device_id rk_gmac_dwmac_match[] = { { .compatible = "rockchip,px30-gmac", .data = &px30_ops }, -- 2.33.0 From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6DC0C433EF for ; Fri, 8 Oct 2021 10:26:24 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 91F6C60FD8 for ; Fri, 8 Oct 2021 10:26:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 91F6C60FD8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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: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:In-Reply-To:References: List-Owner; bh=vwJVoEDMivazvXheSV9lF9T/E7v+Qw1kRS+8nApGq4k=; b=W2yr2Np9gvNbI7 KIn2z+WI9NnSB7gxU8LJdeCy8lQvthAsM9u9Mguj2Ipg+UwK6dzQ/jbxqb+esbUaBLQcvRxeZBEbo JchTx5ua5oOg/6WS8kni+AMFws4IeskueqtKSsin/UhfDNLyVE2zT6svt5JqJTvxxjNQhdMh7X7gm BTzjoq/wEDPTbQkPW5nOjYqWlvQW0+SFftNr4vuCRUMaFZhMN1FbtUpuJXkVOmfG3Px17wepw6Bpu 3qlIRpG1/Yw7ABZPcoZb0wFaJDt6qvSgAqzkzfJyp+zsxdLVilp5boLwVEJv06cBJdqLM+5qOVwGr rQo5dX2LIx88ePR5cQZg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYn3a-002MYn-W9; Fri, 08 Oct 2021 10:24:51 +0000 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYn3W-002MWj-Gw for linux-arm-kernel@lists.infradead.org; Fri, 08 Oct 2021 10:24:47 +0000 Received: by mail-pf1-x431.google.com with SMTP id 187so7813777pfc.10 for ; Fri, 08 Oct 2021 03:24:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=a9+SkQaOPjsBTe9c6aiqQVMNMLolkjNbz68KZM8fxyk=; b=DFRXnnToUO5DrTYgeR64i6seqNB2yC38VBpzv1sBYG1oXZCgJ6GOqLUCfsATR2fsoh 6xQLqTxnWSULuLc9ZeIJUqe16YJgN+3EFgWuMiooxYGKiHeOOd+BlCDcdYp+q27Iqcjl oOI6j6juDnrm3hW+0hzZA/nasRCczpIyaCaeRHBxeWMFKBAnBmu2ZLbI0IWCMPGixnwM syjyYHgLbbFosb2ysbnGVuh3a8USteuYKMRKWSsDXI2IKrF2OC7PwCnuWvWKQeuOFFGi 06rXT8H9H4P3VZ9G6dvV6LpKAEu8dUf4/AVD37LXJB3LrwCXidSRzkiFnllONbgrU9Zj dCpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=a9+SkQaOPjsBTe9c6aiqQVMNMLolkjNbz68KZM8fxyk=; b=Inu5+6qBDHWJdoSvCHVEWNCGfxBkFF8pZ3ANMqzDtfrSo4k2eDyGvhi8Nuhxe8p+Kh +4Ge8RIZ7sl2URe7UIdFSDO5VE66MEMF4Kgx4q1zdisHx9EcUOP8438MQznETpwQxO0R uH7c1fgT6/U1smAAxzyXvqQK6TqPZLYL6IUk6bipv8NWirzu0437jh5OPuzLsCqeOuip 4MzywfIWASAJYa9vr4zZt9qxWQ6ZvcdVE5/r2cQHiTukfVxhN1A/JiUaQ4pmZmM7gx0/ bpSYJDgk55OspOCiGL7576R/AVIKMEBCmtBCT49Uwt2lv3fhqMYbIkGmAxQNU8l5WrIS EFvA== X-Gm-Message-State: AOAM531kMYI5egCbEO9Yi7nqVMFRULHhrGQM4sSLbbRazsm8WsBicyyt PopZtFE1SI5T3k0gsbLeO68= X-Google-Smtp-Source: ABdhPJy77L0NPD0IPs0pHKmluyLSKJzH8GoOC/pXSo2mzaH+7ffl2xTl/0AOMbNsRCF22s0tLg8AUQ== X-Received: by 2002:a63:8f47:: with SMTP id r7mr1545186pgn.270.1633688684790; Fri, 08 Oct 2021 03:24:44 -0700 (PDT) Received: from jensen.next ([113.109.79.206]) by smtp.gmail.com with ESMTPSA id s37sm2491835pfg.44.2021.10.08.03.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 03:24:44 -0700 (PDT) From: hmz007 To: peppe.cavallaro@st.com, alexandre.torgue@foss.st.com, joabreu@synopsys.com, davem@davemloft.net, kuba@kernel.org, mcoquelin.stm32@gmail.com, p.zabel@pengutronix.de, lgirdwood@gmail.com, broonie@kernel.org Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, hmz007 Subject: [PATCH] net: stmmac: dwmac-rk: Add runtime PM support Date: Fri, 8 Oct 2021 18:24:10 +0800 Message-Id: <20211008102410.6535-1-hmz007@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211008_032446_602170_552F3BBF X-CRM114-Status: GOOD ( 14.78 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit 2d26f6e39afb ("fix unbalanced pm_runtime_enable warnings") also enables runtime PM, which affects rk3399 with power-domain. After an off-on switch of power-domain, the GMAC doesn't work properly, calling rk_gmac_powerup at runtime resume fixes this issue. Fixes: 2d26f6e39afb ("net: stmmac: dwmac-rk: fix unbalanced pm_runtime_enable warnings") Signed-off-by: hmz007 --- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index ed817011a94a..a9eb98691a66 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "stmmac_platform.h" @@ -1626,7 +1627,8 @@ static int rk_gmac_remove(struct platform_device *pdev) struct rk_priv_data *bsp_priv = get_stmmac_bsp_priv(&pdev->dev); int ret = stmmac_dvr_remove(&pdev->dev); - rk_gmac_powerdown(bsp_priv); + if (!pm_runtime_status_suspended(&pdev->dev)) + rk_gmac_powerdown(bsp_priv); return ret; } @@ -1638,7 +1640,7 @@ static int rk_gmac_suspend(struct device *dev) int ret = stmmac_suspend(dev); /* Keep the PHY up if we use Wake-on-Lan. */ - if (!device_may_wakeup(dev)) { + if (pm_runtime_active(dev) && !device_may_wakeup(dev)) { rk_gmac_powerdown(bsp_priv); bsp_priv->suspended = true; } @@ -1660,7 +1662,24 @@ static int rk_gmac_resume(struct device *dev) } #endif /* CONFIG_PM_SLEEP */ -static SIMPLE_DEV_PM_OPS(rk_gmac_pm_ops, rk_gmac_suspend, rk_gmac_resume); +#ifdef CONFIG_PM +static int rk_gmac_runtime_suspend(struct device *dev) +{ + rk_gmac_powerdown(get_stmmac_bsp_priv(dev)); + return 0; +} + +static int rk_gmac_runtime_resume(struct device *dev) +{ + rk_gmac_powerup(get_stmmac_bsp_priv(dev)); + return 0; +} +#endif + +static const struct dev_pm_ops __maybe_unused rk_gmac_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(rk_gmac_suspend, rk_gmac_resume) + SET_RUNTIME_PM_OPS(rk_gmac_runtime_suspend, rk_gmac_runtime_resume, NULL) +}; static const struct of_device_id rk_gmac_dwmac_match[] = { { .compatible = "rockchip,px30-gmac", .data = &px30_ops }, -- 2.33.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel