Received-SPF: pass (google.com: domain of linux-kernel+bounces-39550-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Clark Wang <xiaoning.wang@nxp.com>
To: alexandre.torgue@foss.st.com,
	joabreu@synopsys.com,
	davem@davemloft.net,
	edumazet@google.com,
	kuba@kernel.org,
	pabeni@redhat.com,
	mcoquelin.stm32@gmail.com,
	shawnguo@kernel.org,
	s.hauer@pengutronix.de,
	kernel@pengutronix.de,
	festevam@gmail.com
Cc: linux-imx@nxp.com,
	netdev@vger.kernel.org,
	linux-stm32@st-md-mailman.stormreply.com,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH] net: stmmac: fix wrong place to call pinctrl state change
Date: Fri, 26 Jan 2024 10:44:32 +0800
Message-Id: <20240126024433.2928223-1-xiaoning.wang@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?dnv/bn60p4gGBd/IBOcjGMJmwXcNOavNy7pipZrormorfyvOG//ISr5X2WKL?=
 =?us-ascii?Q?0iaJ2PgCUmi+S27FS9XKzJNKym4BtRbO6jyS/M+4UQsqwy0i+giKRgsBlVo2?=
 =?us-ascii?Q?cm9KI1AnF0wJdjdhZUbR7pME6KP5ZuesRXvdM7W7/3oGMfp7n3j3tJP5COMP?=
 =?us-ascii?Q?mMwhBIlNkdifQ9KgYwi5bhxpn7IWpOxXb2BnqOsMP3Jzlb3IPS0Bhda5vdOd?=
 =?us-ascii?Q?gJSm/2aQLF17gfFS+6IH/cbIOHorw9Vop2/+DUH/SGO8a/lBZQ7QCZ+so/P5?=
 =?us-ascii?Q?VNZijjGsFBPjEqevbiM6VINsvBd45XDe9c6NRUduVg1VVrBigJQ0BZyKijWk?=
 =?us-ascii?Q?KfoZY2NiuRMtutw4Hv6IrpBqJadE19UlSSDySe4azQ4oInDhOX2XWlACRn7+?=
 =?us-ascii?Q?frms6+dhEHAzOV64HeXZjtpuguUfVktCtdFF9OQL3UaDnAqvX+95wSTBiEf8?=
 =?us-ascii?Q?oOHJ3iLhtnILaoF0E69XnINHP03IBRgjmXZGJQcyClq2bEJT4jPAvMcVzcMf?=
 =?us-ascii?Q?sdN/IHHN13XgiFXA8H7Cg5PJDl+97tKIhH7WZBzUOpli5U0VJq2u52Bojnmf?=
 =?us-ascii?Q?D2teb218IS36RGZtc89kk5LVeIk8mVjdebERY+HQlP9t7XPdsMKNdz1S9MJa?=
 =?us-ascii?Q?se/oayBGIxRJZeFnK6tePnzk+1YLrU26pBMz5KMY5kwWkD4k8b7M9SJVPURu?=
 =?us-ascii?Q?z/3Ve10dEyFMXloBNR8EEnR6Gmof0zNSWYmjfUxXDRK+i4ZCht5CxfsgBGTm?=
 =?us-ascii?Q?SHmbXLhrhnHmcfbzTepH0SNJan2QKdIwwfNhchmNBh7SMYmBikreL/qz8+Ew?=
 =?us-ascii?Q?B5hqUbiybFqhyHRxP1nBWmbbBX0BjKhtCmT9UNy0chkptJsJ2G7FS8OU2okP?=
 =?us-ascii?Q?8MbgcRKefVRKAqhTksHIAyK0hR1y2R/mO7piitcE9HbQPswPDgLpG0mbF1tp?=
 =?us-ascii?Q?w0dHL5alBd+hDPt5yvFu6/rOBaZtkDfSmDWPiCzozPlq4nOL03nPUde7QO7N?=
 =?us-ascii?Q?xktpHBLwYVsMPku6ET04+7OoyyN1j5xyQJ99QeIup1UD8goX1n4SRbc/46fU?=
 =?us-ascii?Q?a6RtQXTzNyxXcjRdqDTCl9cH4D9JMhPGvezajEStN6b8yvvzo0KIk9xWYOhJ?=
 =?us-ascii?Q?ByvGuu2cQIkeMYYBtpkEWYxXkH6iOeG4YiSL5I5RlyawNxwm78X/bYurNmvH?=
 =?us-ascii?Q?Kye2tNgaxs0riN2OK7L7UcpoJMj/HUKCJIBijJJ/1YC1kx1fFxxeZAedLy6W?=
 =?us-ascii?Q?3kSLnf8oW5UY1yJYuRTYniOq2zv0PlxyTL8bFYEVK5dbzPhMpaRhnKIdbymI?=
 =?us-ascii?Q?dFG6CyKEKGfRId2MEIfh/V3J6IDgFVJXCqs7DxzfxTQ1RtPCEiBbH/dSd61+?=
 =?us-ascii?Q?GwQUTfqpIrf8W9E1dwdrs804Ha1hq7SX7X6MfpmS1wZGMmrLaEsr9f1WP0cZ?=
 =?us-ascii?Q?1/av/zKgeC4k1S+eaSWcfF1RKZzL0nzE7LYyQnvhGqtHQwtWFToR8vrSxWiT?=
 =?us-ascii?Q?8kTcG66dT2NvEzy92VryYRKhIk77vfPFkHdWNvZBL002JI/wMl01l6CvnJHH?=
 =?us-ascii?Q?YXaEzJesR8phmH+9oYCksagdTpWwzowc9Rc7tJfP?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 983c40ec-ee2b-4543-b735-08dc1e18db82
X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8382.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2024 02:45:29.2773
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: siuAk6gSI/uXguJoRbbyBeM146N2c6ZCJTuu2TpvqM5x8i5OKQeSyZ7eVMxjV5A9JqibMIQmu0vLkHSKRKJWcg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6811

The previous patch put the phylink_suspend after the pm_runtime_force_suspend
to fix an issue. But in phylink_suspend, it will call mdio read/write. If the
iomux of the pins of MDIO bus have been changed to others, the MDIO bus will
not functional.
So put pinctrl_pm_select_sleep_state to the right place to fix this issue.

Fixes: 90702dcd19c0 ("net: stmmac: fix MAC not working when system resume back with WoL active")
Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
Reviewed-by: Wei Fang <wei.fang@nxp.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index b334eb16da23..9104ebf49c5d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7851,7 +7851,6 @@ int stmmac_suspend(struct device *dev)
 		priv->irq_wake = 1;
 	} else {
 		stmmac_mac_set(priv, priv->ioaddr, false);
-		pinctrl_pm_select_sleep_state(priv->device);
 	}
 
 	mutex_unlock(&priv->lock);
@@ -7863,6 +7862,7 @@ int stmmac_suspend(struct device *dev)
 		if (device_may_wakeup(priv->device))
 			phylink_speed_down(priv->phylink, false);
 		phylink_suspend(priv->phylink, false);
+		pinctrl_pm_select_sleep_state(priv->device);
 	}
 	rtnl_unlock();
 
-- 
2.34.1