From:   Meng Li <Meng.Li@windriver.com>
To:     peppe.cavallaro@st.com, alexandre.torgue@foss.st.com,
        joabreu@synopsys.com, davem@davemloft.net, kuba@kernel.org,
        mcoquelin.stm32@gmail.com
Cc:     netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org, meng.li@windriver.com
Subject: [PATCH v3] net: stmmac: socfpga: add runtime suspend/resume callback for stratix10 platform
Date:   Mon, 15 Nov 2021 15:04:23 +0800
Message-Id: <20211115070423.6845-1-Meng.Li@windriver.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?37mFAozxmzqYcXcZzC5Qr3lgf/h/4mLHOMHj+KRBAmp+27sLXVYwsyj2AKN8?=
 =?us-ascii?Q?Seh2MLn5feYZhBvEtub6YknR0hWV3Wc4B+aOzoRFeL6bzXnckCfpJCntzNhr?=
 =?us-ascii?Q?aKoMXFAWDEyW8Jls2M+JrPunrHLodwnItIwoP4MaiO+cV3O6HGNnJEExY9T8?=
 =?us-ascii?Q?jybQrrTVyfQtfPyKxk+XL2Z1q2wsGkdcaxrllAetFN7rnBhuJEhWNqfyEQlt?=
 =?us-ascii?Q?SG+DCF41fuWZuga74KCIkx0X36oS4/mRxwgdtdaN8ty84qfpwsoBdOXtf8sf?=
 =?us-ascii?Q?y7MseLUfQk3aeIN/URFTvQxu0XiCvOcLSnc4mqX7OApQGGKoGhe8OC4fA+EK?=
 =?us-ascii?Q?JxJGb1uZ+soFlS0CsVJetZepphQ839ACZvL1n1o64v4Pz2hTrypVQObIR5HN?=
 =?us-ascii?Q?x/LjYbUHghOKx2gIxEa8CrA1sbQZ3sbG1BvmSRAUcKiK7FE7kibMz/0S5Ndd?=
 =?us-ascii?Q?is8g2j2JlPmqGW2NUnWCLeO0C1+O6uFaTpOBTB4Jx4/m/1Gx3MUIcwDu8iOG?=
 =?us-ascii?Q?Ga0H1ww1/ZkCwBZQU/z6hzra/Al2nrgwdBAwb0eXMPqT7VYzWJnkwu+GuY7q?=
 =?us-ascii?Q?9S2qHHQTkSKEkIVM+Bp4XUeZW9Btvvr22fhFc2nkSDvznKYUIqCkMqb4IJ6n?=
 =?us-ascii?Q?AmOqBpIg2ipzAEHWJSLF/hR28cKT7SIReE/NmYWV2JUSrbDg7CgwxaXivK4n?=
 =?us-ascii?Q?eMy6qmF/oUnBLaZO4iV3Wk1Rsh+FTeAjYdkbCGh0ozpgX1IblJtAQRWu8XLr?=
 =?us-ascii?Q?cjqMOW5Mq9EmFnCq1d+hVJRTQqAdTvlhdfWF6bVEBWwGfNYPgBvwhPrTQgq0?=
 =?us-ascii?Q?wLGvSFj84ReIhGSpebQRsDwIOOed0wVDOXbxZgOM39UKDIgphUTGdVl0802F?=
 =?us-ascii?Q?l/XxTPmT3erXZVeR44RQ1v41A+HgEpIjRVcnDO14/o7PMRP9VaX24SH8322F?=
 =?us-ascii?Q?OVY+y5KmAV0pAzjtKhV8nPNAG6NBFUZ1DdIHRvqQdXdLXCujiEG8AAVak/ns?=
 =?us-ascii?Q?MVyUqI+Zupi1ugTwNHWPg2eB4NX0+f/Mpe+82cOroc63ZkUtYYRX4hyLpRr3?=
 =?us-ascii?Q?9GKY67niHTxstyrCsCCezl6LwMYTAYGQP457ogvnou0IR6pee2LthdHPBLTH?=
 =?us-ascii?Q?JJ0ibCkfoEXmqGFG79DnSpNexv7zf5Ht9IaofEjpvIU9Qo7XLM9gNZ0sR2NM?=
 =?us-ascii?Q?SXADHz7Z7/zzgK3hOz7Vt2PitiOhbpKQvx6Ot79EL33Eq2GcmPeO+hib0SKx?=
 =?us-ascii?Q?VsK0CsbfBk/rk9u5hcd8yXGc29dd9fdjjvocESNKblp4+AsZtTS3XCqEtr71?=
 =?us-ascii?Q?psJzSrjr3+b2nGmZdCiyCM4+Qj5pfVC2atFiFyx+cDC6RgwXi9BbqRg6/C1L?=
 =?us-ascii?Q?Yvqn3fZFX4h0lQKC2rU27x9hGVH89jfqLvfqU8fwRShcZpjtApnnf40/CRh4?=
 =?us-ascii?Q?0Ry6LcYk77e0qW+pdQYUBWFsJOFExRwNb65ZLcGRvkr1kQg27dszUSNLBVrv?=
 =?us-ascii?Q?ZXlSk3gVEOPwWuZtE8P7YMAfZrzvcY63bKBzNqv/3IKHHTj7xsjfp0ULAiS9?=
 =?us-ascii?Q?iTJpBYPte6Tv8xVPMnUjyNFKbHGuYKFoNYeSUsCIc5ECaCQBGsLhCmLtP6DZ?=
 =?us-ascii?Q?aCFsIg1bO56a9o7C1786ZCE=3D?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2c10b091-fd33-4bcb-40fb-08d9a806314e
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5191.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2021 07:04:40.2079
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ZIQArLNgkTykwhem+VBHwTlJZr3EVp7sxsN7Ayu+zxpEoWqp95gOpcyzdXf3etFVFKBgB1DbOHZPiRcg+IGAdg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4981
X-Proofpoint-ORIG-GUID: rxQUH702JIPAJpOx7dSjkwPvzr-MbVUP
X-Proofpoint-GUID: rxQUH702JIPAJpOx7dSjkwPvzr-MbVUP
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475
 definitions=2021-11-15_04,2021-11-12_01,2020-04-07_01
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0
 mlxlogscore=999 suspectscore=0 mlxscore=0 bulkscore=0 spamscore=0
 priorityscore=1501 adultscore=0 malwarescore=0 phishscore=0
 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2110150000 definitions=main-2111150039
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Meng Li <meng.li@windriver.com>

According to upstream commit 5ec55823438e("net: stmmac:
add clocks management for gmac driver"), it improve clocks
management for stmmac driver. So, it is necessary to implement
the runtime callback in dwmac-socfpga driver because it doesn't
use the common stmmac_pltfr_pm_ops instance. Otherwise, clocks
are not disabled when system enters suspend status.

Fixes: 5ec55823438e ("net: stmmac: add clocks management for gmac driver")
Cc: stable@vger.kernel.org
Signed-off-by: Meng Li <Meng.Li@windriver.com>
---

v3:
 - adjust the static position to fix a building warning

v2:
 - add static when define socfpga_dwmac_pm_ops
 - add fixed tag
 
---
 .../ethernet/stmicro/stmmac/dwmac-socfpga.c   | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
index 85208128f135..e478a4017caa 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -485,8 +485,28 @@ static int socfpga_dwmac_resume(struct device *dev)
 }
 #endif /* CONFIG_PM_SLEEP */
 
-static SIMPLE_DEV_PM_OPS(socfpga_dwmac_pm_ops, stmmac_suspend,
-					       socfpga_dwmac_resume);
+static int __maybe_unused socfpga_dwmac_runtime_suspend(struct device *dev)
+{
+	struct net_device *ndev = dev_get_drvdata(dev);
+	struct stmmac_priv *priv = netdev_priv(ndev);
+
+	stmmac_bus_clks_config(priv, false);
+
+	return 0;
+}
+
+static int __maybe_unused socfpga_dwmac_runtime_resume(struct device *dev)
+{
+	struct net_device *ndev = dev_get_drvdata(dev);
+	struct stmmac_priv *priv = netdev_priv(ndev);
+
+	return stmmac_bus_clks_config(priv, true);
+}
+
+static const struct dev_pm_ops socfpga_dwmac_pm_ops = {
+	SET_SYSTEM_SLEEP_PM_OPS(stmmac_suspend, socfpga_dwmac_resume)
+	SET_RUNTIME_PM_OPS(socfpga_dwmac_runtime_suspend, socfpga_dwmac_runtime_resume, NULL)
+};
 
 static const struct socfpga_dwmac_ops socfpga_gen5_ops = {
 	.set_phy_mode = socfpga_gen5_set_phy_mode,
-- 
2.17.1