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 v2] net: stmmac: socfpga: add runtime suspend/resume callback for stratix10 platform
Date:   Fri, 12 Nov 2021 16:34:34 +0800
Message-Id: <20211112083434.6459-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?7H45z6zt+sT3tcidHCE11fVqhVbwRLODEbN3uNONkPBJZQ4Z9YchsLa28U3O?=
 =?us-ascii?Q?30ismfoObGzDZtPxxYVj8jUqJRxHwrdOLIBsRB6Dl1yZGSx8nM7rMGAAbv/0?=
 =?us-ascii?Q?L4MzhVVcZ4dUaoaE5kuAMsz3SmOYUhjWI93DFFni5KkAjn5e63LoPhbVZsxm?=
 =?us-ascii?Q?+5VosXRbVPQyGRE6yrBOcbsb0ZcbzkxPZ5bg0dxPqJIuUQNQ6OlxZ8+cMULD?=
 =?us-ascii?Q?CzuRVVJ+eI+XCP6gvvRqxAuNE95f9MiH5KJfq/Ikq2I1+7wGwUkCA0SveB6v?=
 =?us-ascii?Q?RI/oHtjiksRSXS2l0gwmcUDxdhpYoBOYgBuzbgdoJkZw4UbyA/dNb2bGcKKy?=
 =?us-ascii?Q?u0dN009QvKyClTVwrGWrMfnA3aPgUV0Rpb4l2PabjEfWWy491zeQss6O4Ud/?=
 =?us-ascii?Q?cfejbLz/yzeDPpe7VrXr9nPS2X1daSNFDjDeXnH5pkyst5Hkd3QeFeWwC1s/?=
 =?us-ascii?Q?BG4liyLCDKoXAwyd3dqrhVHdhLt1g8NnOivGBWp0aY8/0DOtBXGhNVhJncDu?=
 =?us-ascii?Q?dGtFnrmFB+DpZW+gO52ydS+pfsRVplbhzYhtD42AH4uyDDrPhWpgXXBijB0i?=
 =?us-ascii?Q?10doEM/P/xSZo6o2DGuBgQ2f/avibFNH+eY/VsRTpx5BMGFaynAQVhLiJPx5?=
 =?us-ascii?Q?i/AX+qiaGHZkkX+4MRdgrJ6VjD3cfsD+uCURmCZc2fERQFLku9ASMLDactKD?=
 =?us-ascii?Q?2tFuICsJDsLeyUehdnLofhZPBmhW4BFbhVmL/u954+1wrnLd0GazcjQKFHx8?=
 =?us-ascii?Q?itizAFqG5sriKrPQLl0cD66WJvTQtJidb+oIyqA+/nWv9NpVCjmHHl7Wijp8?=
 =?us-ascii?Q?+SNYvRrDHET7y3Wxj6Rv5plBxKyUyuPUirzN+DC+ZUMe4q982QSYUKVK9fa+?=
 =?us-ascii?Q?43prsoArQwYzM8BAhWKuu4HsEX47052ZFVYrb4s19hTg5ciOhdYCDj84G4Jt?=
 =?us-ascii?Q?+H+hu7EsNkc+p2mR1acToDOE4GDzR06KJ2qOfgThA2RQN3r4cbkQGFik4cQJ?=
 =?us-ascii?Q?Awenz0N8jbaWWrQRLd54tqT1QkuGs3rem6QLc8ptLGPyQo59WLvrOH4sM18d?=
 =?us-ascii?Q?bLa8BVgLHOyMN7YeDuuQg2Ga858qN/tf5MADT97ckiq08Q6NJVa2a6sXD+kU?=
 =?us-ascii?Q?4eYeIe/xYy22m1F1bPKlQvEPOLX5FFyxHpnnZU92VBVsaT5dYQexpPFVB9zn?=
 =?us-ascii?Q?KBjQIq91p2oRBtuU8o2ANB1vVffePErlxooXFHJ7OaveJ74hr6kcQ2L3n0iD?=
 =?us-ascii?Q?NfzVp6Jjw2/m1sa4aZb/ew5JHxVAUZGwXWtnyPaPZH60+3WhxZNN7xk9WEpJ?=
 =?us-ascii?Q?0+2YhpnsxP00WB0nywcC3XIdm2/tB9eY/Yzds6/qObuFUCIV74baZbvlYzQL?=
 =?us-ascii?Q?3+fQIrFPgam9YQhUNJjWRcGXYmPatQN+F63yW7UwChnfpNqQQeYsosX3ZhHo?=
 =?us-ascii?Q?q6bFJxX8LwVsEFUAoZo9Btw+tdhHZkb5Hyg/Cofn12Zf4NqGjm+VaHFzvSbp?=
 =?us-ascii?Q?Mq6Ri1iZqPCTezBOOwK8xlGzb4D6wdkoPF3zCgCLsvszutW4brz4ie3bci5Q?=
 =?us-ascii?Q?ypNZvIYE2A6nzR31ICeK3ouHYOOEfIMMOakF/tG981U+OjKVKJY4tYA/FByX?=
 =?us-ascii?Q?FJ/B/FGANhZ/qPnz90bU0zA=3D?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 087d1c8e-35d4-4afe-c6d8-08d9a5b74d22
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5191.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 08:34:54.3300
 (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: I0y9vwUvVZ0ijee7pLiHMONdSylRnAmtsNMQ2TBx7KyFDiPfUWeidvD/54AkQ+lFHSZ5TkevS/couxDE4rJ0lw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4965
X-Proofpoint-GUID: AToL47A_6rqM--CBi2uaCzcITg2hIDEJ
X-Proofpoint-ORIG-GUID: AToL47A_6rqM--CBi2uaCzcITg2hIDEJ
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-12_03,2021-11-11_01,2020-04-07_01
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0
 lowpriorityscore=0 impostorscore=0 mlxlogscore=999 phishscore=0
 priorityscore=1501 spamscore=0 suspectscore=0 bulkscore=0 mlxscore=0
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2110150000 definitions=main-2111120046
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>
---

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);
+}
+
+const static 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