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 V2 2/2] net: stmmac: resume phy separately before calling stmmac_hw_setup()
Date:   Wed,  1 Feb 2023 18:38:37 +0800
Message-Id: <20230201103837.3258752-2-xiaoning.wang@nxp.com>
In-Reply-To: <20230201103837.3258752-1-xiaoning.wang@nxp.com>
References: <20230201103837.3258752-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?BW9umz8DyjwUYSTTxl3DFZ2Bzmai9cB33eC+J/Z8h3xXMXi/FPnhjZJhIsG/?=
 =?us-ascii?Q?1rqzFoytPLiCBfsMptYfslVYT/4q+/Ot4c+zGQy26h4jYbmPIL1Sym9CLdNh?=
 =?us-ascii?Q?/iNfPU2koiXdrQfO7BkvmDuQQ4qKUOMEwWEUf2Ii4T1WVTmM8jwf8w8HqxcF?=
 =?us-ascii?Q?wL3mxF76+L1SRE58zRZ09Pyg3VuqNDfYKjPkCMPOqNbqxES551mPqtrXvPO5?=
 =?us-ascii?Q?c1Na+V1QKUYKoDTdvazeo0ky5gFIfqBTZU12F2gKuyWr1utcGLak9xQmL+lC?=
 =?us-ascii?Q?5+lXLgmPFsT6JSLPoWFVh3JM+6ZDA6Fnxal4gYGhdiBQZLvRBlz6XcZ3uz4r?=
 =?us-ascii?Q?B43Gky+iMV+YcqtY8253KUmPLApak1fCjhtOWnpwvOdyuAyBSv5ZTxN8DDLg?=
 =?us-ascii?Q?/qEysJL2V3V8MF9iYOnqni/c6kVASKJPFc2j/S1QAubkjEmJqco05yjKcbQS?=
 =?us-ascii?Q?Pu+FWR0nYmyiULYeRH4WST4CDbS8uXVzyiwUbbuxIMgGxnZGX39ribMxckwc?=
 =?us-ascii?Q?SgLHUT0l7NxuWoGbJ4IBs0J7aBos91ir+udkF+y+b4mRPT0THC1wy/ctOKHA?=
 =?us-ascii?Q?nhfxc7uBVGdIHtTStIaDHCKA+NiJzyspk5LWmRszri0/X71Y3rbIF5OZXYhP?=
 =?us-ascii?Q?U129aqgFPXpjTO6hfJu7w3QFG2R+qf5hkn73dBaBbRT8GUHjL9dCCejg5mKB?=
 =?us-ascii?Q?9onD2E3lsEp2IqFuV91A23DA02GdywWfMD6NhuW08WVHvuGzRhQsudp+voY6?=
 =?us-ascii?Q?NZI/OAgSHm46rXKHm17UxfC8is90820+qu5ekAFUJpmz9W5R0APiapafC18I?=
 =?us-ascii?Q?ybrvD8GgrvwNuzksk2Eyt34oZVBoMhfcJ7hCXozreBYWaGP//2EgDHpEQg78?=
 =?us-ascii?Q?HownrZghbbHMH9+XpRGF3BIwT4RN7+LoZ9YLcb+Yr8MZzBO3AySSxybbDqpJ?=
 =?us-ascii?Q?q61EI7LKjSdb0A/rFyfACaFSwF/jMgugYL0UQrmzhQwjdnAgw1mhQJkjw+x+?=
 =?us-ascii?Q?AyhW5ZZl+P/t07pV+7yOCiN8J5WV9mdaxav6GZleA1OQ6G/SXx+vAzpTAsM8?=
 =?us-ascii?Q?RsXxmQeqmHAk7uNWSezVoCCKQUlwB2ENGi1Tn7kH8TalTrR+t4b4VVp45ycF?=
 =?us-ascii?Q?c272+oHn+8dty1YMh/71TQDwvVfq7Hgh62ADB0/p9PW300wZ/M8XaokhrFMo?=
 =?us-ascii?Q?cvpsSiK6Nq6teDRD8vMFd16JhP5Jqkt6ZpqRlB9vAzGuXcRxyydemFINP/aS?=
 =?us-ascii?Q?Gtd6+A018iN/cL5WzgNiEHKrjmsyY8z7WW3W9tMrskPlMzNEHGGvKgguJ1gN?=
 =?us-ascii?Q?oqD/cHO6eJGPrUnay7BROnt08aMDisPTT/zk0oU4pqu+1HzjRcS2DfXA2Srd?=
 =?us-ascii?Q?OlkJ30xu2VS5nauoE7wDL425hJLJRXmnXJ498qIibvCQMuuvSKgmVQL+LDSR?=
 =?us-ascii?Q?W3JuVd34eMPq8m3jWGGCs78OwgowU9ySr4vJtC6gs7irKy+qVN8l1lhvGLAE?=
 =?us-ascii?Q?Pq1JY8vsTDfSGJfidm3T+kWD4spCC/zjdSmYDwmUBknS582LfibpuwoRrmtD?=
 =?us-ascii?Q?5M/YwdI6SzaYc2Emntc5mcJiT7YcxznztPGPG4ZW1wEUbLa7ue1s/t91UOeS?=
 =?us-ascii?Q?fQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b3656736-c9a7-43c2-b6bd-08db04409bd4
X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB2939.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 10:39:34.4383
 (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: i35yVUcjEAlApECkRXt9W0jdZHSRyH4+1GRViyOhsDL0L23Dm3d+W9n9ug9uIm4OaiFSIaBL7KsVfz3IRetHYw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB7170
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().

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
---
 .../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 1a5b8dab5e9b..38777e408d96 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7538,16 +7538,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);
@@ -7565,6 +7558,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