Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Clark Wang <xiaoning.wang@nxp.com>
To:     linux@armlinux.org.uk, 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, 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
Subject: [PATCH 2/2] net: stmmac: resume phy separately before calling stmmac_hw_setup()
Date:   Wed, 21 Dec 2022 16:01:44 +0800
Message-Id: <20221221080144.2549125-3-xiaoning.wang@nxp.com>
In-Reply-To: <20221221080144.2549125-1-xiaoning.wang@nxp.com>
References: <20221221080144.2549125-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?cb/jqMKrevFSKhDf6sLL3E5E7DKHdb9eDZ6C1BE78sc9ZYaNjzBLplf/4LAZ?=
 =?us-ascii?Q?evXkY8u9hAb6dizJJH4YbYeYndpjzz1F/X2EfZlNWA90u2tIj49Txi3IWUE1?=
 =?us-ascii?Q?VX+wstBLnoYkM3moLpo8hLJ/ue0M2q3VC6TJS9CljwXHuRRd0ye/B2gA/z7S?=
 =?us-ascii?Q?rWcpDPralf0mB1mAEU27wGd26NFkQTPeS7u3e67aK7NJrNFvibynQ+6NscS3?=
 =?us-ascii?Q?ooHHRbKHj4w8Yxm38C95QiwLvEHWL2cuuoxqhtTK15LAHrEKXQGYIwizoM3i?=
 =?us-ascii?Q?olHsn64T93mpmfI9GmpWTKWoX1Y1I8tMlbHSdG2UKuiX3H4HWqj6gmk80GWD?=
 =?us-ascii?Q?ZltcFSkJRy6EMJIAXhb/hVVo+i/ZZdgLh24hfFoux5/Q0vV+PyHKoAdwqGlG?=
 =?us-ascii?Q?XxMRo49o/dBZdbW2UETFNiYzlowcE2TuJWjvhDSVYCp8Z/SQwWDVk+eXhIws?=
 =?us-ascii?Q?3/NIT7oE3kr/oDSQTN6a4Nz2ERkz4JPJeyht6VqcE+NtzIoCZ/kcHIi+1lN+?=
 =?us-ascii?Q?rT95b0cOnRfbfqfkXtsE/uxHQB5UUWvoIkxeLWcFDEsBaHel1dNs2YO9nPIg?=
 =?us-ascii?Q?r69NT7DymAl1nVpBJgOEoackMTMlM3QDdOi3jopSqMFjtBZI4C7gykNuEGQ9?=
 =?us-ascii?Q?i9DsvmJddN8cMXFs1HYA2ud0ydZoL0rjksanFw0GMgr0Z1CA5xUhfC9rwV7p?=
 =?us-ascii?Q?wJVPjj0b7YdO4BWrzT7cHfEriawcoT6ztaqzZd6BlEzSNqXC6MJCIv4JhdvK?=
 =?us-ascii?Q?gmpx8H5kmZRwLa1CD7dzNr9zDiEv4YhN5+MzDr0KeYt3f7tiJqtIHaO3873V?=
 =?us-ascii?Q?yYY0PssPFeK9gIJHq8oV09IH74mEPWzkEr/UsduvJwVUlUCtgoYXYs4k6LDb?=
 =?us-ascii?Q?7jehsk8z9hWsyodT6QoB7Jvd/ZeOf6y4FOM9PoggW8/Suw023lCBGEqXBiEI?=
 =?us-ascii?Q?2N2+WXg0WxDzVymgQtI7mQFOQQ5zuBecbx1urVc8jkDdlai6E2WjEaO5sQmh?=
 =?us-ascii?Q?lU7tLRmTvdNoCEgTIZZo2mGLcSnrOQwnJKWF5y3GHe5K1ipsjKjg/qKzNt5g?=
 =?us-ascii?Q?S+2RMpyVecCPt8pCWaoHnP/OGeQxIa4JtAN4tQ7UmXKBnt7fA3f9SrnjVjXb?=
 =?us-ascii?Q?+5RRU7rkWGsZy9HrrOX+MIoGukzh5dckAxom9pD+RTevyr/5ara6wRO/c5NE?=
 =?us-ascii?Q?pTlU/qBJYY4TkwJ6vMc9QLBAA5wE/W7m4LYI9VwhNVr7yYtK5a67tPbDKYHY?=
 =?us-ascii?Q?aNF8NvWivVkozcV6gtM4f/FrorPDJbvmuN8ECpNwW6ZfIIba3o3gsMlcFjwm?=
 =?us-ascii?Q?kZE4W9BtztLzewpO6dmgigwduKAP5c7ZeoEawQ0U88knl/PlceJaZvzU8PXP?=
 =?us-ascii?Q?p4IRUhww/8LFuvOx/IxTMqs1vkQb5XXE/LCHr+GY9qcManp0Xsho4Hgrajgz?=
 =?us-ascii?Q?+faMMdj8Ptpi28+i18V2LKZHNBg3op9+FbCUL5bozribU+JFgXyy/bcZHEHg?=
 =?us-ascii?Q?kN9M1qR+xSC2S5v3tk9/DGyRI5eKCC0SViglNGO/gKBXx82ebDBcI9ago2RR?=
 =?us-ascii?Q?nQD3Lyzzybt+SaJ2DTTLHMKs/2CNAedUCtSMpRqF?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6a95fdf1-618e-4dc2-0750-08dae329bc7a
X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB2939.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2022 08:02:42.4436
 (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: AQ19MTJ+keJQGMjcedrJT/8GOVa4mVi2s05Pn5AF2UQUgf8entqhxGw13hFNtBz4MVqM1SCtuLYhSRv58u0HUw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8426
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
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 fristly.
Then can call the stmmac_hw_setup() before calling phy_resume().

Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
---
 .../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 c6951c976f5d..d0bdc9b6dbe8 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7532,16 +7532,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);
@@ -7559,6 +7552,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