From:   Clark Wang <xiaoning.wang@nxp.com>
To:     peppe.cavallaro@st.com, alexandre.torgue@foss.st.com,
        joabreu@synopsys.com, davem@davemloft.net, edumazet@google.com,
        kuba@kernel.org, pabeni@redhat.com, mcoquelin.stm32@gmail.com,
        linux@armlinux.org.uk, andrew@lunn.ch, hkallweit1@gmail.com
Cc:     netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        linux-imx@nxp.com
Subject: [PATCH net-next V4 2/2] net: stmmac: resume PHY separately before calling stmmac_hw_setup()
Date:   Wed, 22 Feb 2023 17:26:36 +0800
Message-Id: <20230222092636.1984847-2-xiaoning.wang@nxp.com>
In-Reply-To: <20230222092636.1984847-1-xiaoning.wang@nxp.com>
References: <20230222092636.1984847-1-xiaoning.wang@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tFc+Wx/10YtwNqPwdyzahO4huoPjifH/fqId0n/3TUQF7gPm9Sit/MrVVnuc?=
 =?us-ascii?Q?PM/uIJByzFUU5wESd3+ZFDlgt8v3p+r9eZdGmb0gU9mqD+TlV1FeekPrKIWp?=
 =?us-ascii?Q?zP2kJ5oRDGSUm1TJRvU7SMzwLMfSlWcUXhfOjbhZvjFfrc4ykzd/37296EXi?=
 =?us-ascii?Q?f64c7xsE28hPUScZh9yu1s0dhsXXgy7PWGFP8Gv4CVUUY8AECvyHKMpXmP5E?=
 =?us-ascii?Q?GlxDEOSMlFVSpTo9nQHD8wESmPTgyz9HzBQjBAW91e2IuUZ0H/WhGc66221l?=
 =?us-ascii?Q?SWS/2Fqu8UumcoPhxZKPJ8NwM08Duea0Es4FlG9pHlKWv6PK/MCR2AS+5lpT?=
 =?us-ascii?Q?slEy1fzQBdXTlKiuny2QVLDbnRgmRi0ZV67OZBmb3pdXCvd7/BC0hZ19mqgn?=
 =?us-ascii?Q?M0SJdzk96kP9q2FUnLbyI0ObBRHLLAh6xtqwYbFr7zUIkhHi5JfO3dBhXKzp?=
 =?us-ascii?Q?gAU/D9axKnsc9pQ6R0f0dnf7dgZAsp9G/5E7nHIYfd9CCSqjzHmEXURHJ40u?=
 =?us-ascii?Q?ghTR2osayhNteXXC3TxWtmatjupbyK8mJZ8xo5D1kBsB2xg4N6pVViEU5iXT?=
 =?us-ascii?Q?i6imYLHRi9BT+B6u37IVYyyMPmTGDwkjGlNXSSlRvruKHb2CCkaXVHZPwMTK?=
 =?us-ascii?Q?sJD6webwEfbmBl7BugRcT3LCein5A3UwxUIqcAj0dLRHgzOtS3Wol52kogSn?=
 =?us-ascii?Q?/ZBIVGAmbjwKs+E8pS0LeoAWTHlgnmUnYjR1QZaStei8nCo1O26uHLhhj8/l?=
 =?us-ascii?Q?Hu7S6LuNCHbNc2tcFJHZIB6FELL7jTFqxlFhpVGHwW1s08WlrYB97UI7DvlQ?=
 =?us-ascii?Q?teAqpk0kiXlUHhDaIHCBXvrRNh9HLhu76fuijeo6lLXBC/qogWOB8rig+h2I?=
 =?us-ascii?Q?Lzf1UZWxN7tTkyAGcAPb5z/+aRavRE8V3cN6s+XdGm9QgoM6DQWoOdAAhxiv?=
 =?us-ascii?Q?rGEGe/f//wmxZc+l2LERI2v+9jyaa3KEN+9go/8ohb5g/J138Kzs86100Wx+?=
 =?us-ascii?Q?YBakRMuUvOVQL/3XwmKj+e3s12R1DzNacXRW+df75uO9ZluSZSydPLih0yax?=
 =?us-ascii?Q?/nveiworvOP0A7JBrAszoaPCa/dAA9v8ZWUob/bEk1h+dUm5C63Rs3xp3YUu?=
 =?us-ascii?Q?M6YgfQFPxl2d6HbNSfIDfQxHYrOzUHGWkptBgtXjDSOejL2WlXJQRw/6dZFv?=
 =?us-ascii?Q?Xiz71Pewd4vH6663G2VRR7G2+Uq2lzvA0df351sL6jImJJlE7/Tut3pDWYx0?=
 =?us-ascii?Q?o2hNzhCv8HrT55b229GpNaAEKgvhEciXdwCa8VIsJlhV02HTen6d4eqDtMQx?=
 =?us-ascii?Q?07f0Dj+vvE6V16or9qRt82OgQIBkbaYYrlh0ocUTxLWEB6NN22qNguC3nQCX?=
 =?us-ascii?Q?rfIlSZVsHUze3ihOQI5SFwubkYFBefnQ9peTHjRK+hEbPIWFWWE3TlsnETrC?=
 =?us-ascii?Q?2z6cqGucqdS1/V1J13NULCc02w0eLfV4F80d6yhREG1nrw3ga9XrWgEFd5dy?=
 =?us-ascii?Q?ZV94jAoa/U0pBwOIhf43uCPIIjThyKfNtKZq/T/MCsi6Ax7GLuNQpqAPOWhS?=
 =?us-ascii?Q?qkpXacBQmFShJqdx8uzx5NuwR8KL6ADqTxgrfzzdNJe4SYIUXRsSSPTki9Ae?=
 =?us-ascii?Q?og=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b0d58544-40b2-47d8-7dfe-08db14b7335d
X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB2939.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2023 09:28:47.8580
 (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: sMl89UcPZE78ujwogS0UCzig8xWSpqFj8aEachDAtJJZmPWe2CE542WCB+bTkS0KNpQ9Jjeeibd6/3XWXWYvLA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8468
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On some platforms, MAC cannot work after resumed from the suspend with WoL
enabled.

We found the stmmac_hw_setup() when system resumes will called after the
stmmac_mac_link_up(). So the correct values set in stmmac_mac_link_up()
are overwritten by stmmac_core_init() in phylink_resume().

So call the new added function in phylink to resume PHY firstly.
Then can call the stmmac_hw_setup() before calling phy_resume().

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: Piotr Raczynski <piotr.raczynski@intel.com>
---
V2:
 - add Fixes tag
V3: no change
V4:
 - Unify MAC and PHY in comments and subject to uppercase.
---
 .../net/ethernet/stmicro/stmmac/stmmac_main.c    | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index e4902a7bb61e..75857b85921a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7541,16 +7541,9 @@ int stmmac_resume(struct device *dev)
 	}
 
 	rtnl_lock();
-	if (device_may_wakeup(priv->device) && priv->plat->pmt) {
-		phylink_resume(priv->phylink);
-	} else {
-		phylink_resume(priv->phylink);
-		if (device_may_wakeup(priv->device))
-			phylink_speed_up(priv->phylink);
-	}
-	rtnl_unlock();
 
-	rtnl_lock();
+	phylink_phy_resume(priv->phylink);
+
 	mutex_lock(&priv->lock);
 
 	stmmac_reset_queues_param(priv);
@@ -7568,6 +7561,11 @@ int stmmac_resume(struct device *dev)
 	stmmac_enable_all_dma_irq(priv);
 
 	mutex_unlock(&priv->lock);
+
+	phylink_resume(priv->phylink);
+	if (device_may_wakeup(priv->device) && !priv->plat->pmt)
+		phylink_speed_up(priv->phylink);
+
 	rtnl_unlock();
 
 	netif_device_attach(ndev);
-- 
2.34.1