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;
Date:   Thu, 22 Dec 2022 21:04:11 +0100
From:   Piotr Raczynski <piotr.raczynski@intel.com>
To:     Clark Wang <xiaoning.wang@nxp.com>
CC:     <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>, <netdev@vger.kernel.org>,
        <linux-stm32@st-md-mailman.stormreply.com>,
        <linux-arm-kernel@lists.infradead.org>,
        <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/2] net: stmmac: resume phy separately before calling
 stmmac_hw_setup()
Message-ID: <Y6S4O2tgf6ntc/vG@nimitz>
References: <20221221080144.2549125-1-xiaoning.wang@nxp.com>
 <20221221080144.2549125-3-xiaoning.wang@nxp.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20221221080144.2549125-3-xiaoning.wang@nxp.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NKv0a07p5uuZz6cFpUaSGcpu6u17m5Sve7XEM5ybVHXsgU4BQ2O4AnM4Y9qH?=
 =?us-ascii?Q?UMKu23eR4W/abjtv7urSQeViLdQHT8+txDSwdD1dGS0LAjVBchT0qJK//h01?=
 =?us-ascii?Q?37KHLIqYimhLRQ+xH1puxP1hbhsJLRftQyc0rgZ5zJfDMiSm/PbB7FpPHFn6?=
 =?us-ascii?Q?PyRP34PczLfK0aWtOCCbY9pWsu/0wKkxDnvPym9VT2p2sBWq2RzrkB0/t5Ou?=
 =?us-ascii?Q?ijOTTQp1lUBVmwmDk2W9Fj1yPxi6u2JeSpJJL/zTb5Ii3VoJzzzCvJyRK2+4?=
 =?us-ascii?Q?BclO2/iqvEW7LmzPE/F8AiCoNjozhmB/6/u2AiEhJyO5DHAJMa/1Gi8JR3FV?=
 =?us-ascii?Q?8mYDLLJzVsJ7X87NpZ8dDrxravAUkD8os93r3urSoS9oWhqSl68p9ak0bcvi?=
 =?us-ascii?Q?gBdFX4aaACPBzWhg4i5WQxqC+oi20i1xxoZgaSX+zLP91Ruvt0isAslSG8r0?=
 =?us-ascii?Q?KZZZS+SWzPOoyZ6l7hk64i0mE5D0VGnugmC38Bhjltl2Yj0W4zNOMu0F5b0L?=
 =?us-ascii?Q?FL0ZsujBff0Vr2nVod5GKag1i/KTKfuj0H81vvihIb/2c6oHtyLrXuEtCWbs?=
 =?us-ascii?Q?1IaGU427iITDHrX2Bgjd7qQN0EmUw5PQGupHa0SUYytq7SjMJIsIZE+Iw7N0?=
 =?us-ascii?Q?DeV9ySZ8nZjRQkZNOLz/z/AsdVfn8C383OiLXNDyocDgW/1YLv/XsRcffUUS?=
 =?us-ascii?Q?/+ZJOlQDCE4pwFL7zU10umQLvl7+tOJK3AvsobMnOfmvDHdTzObdSe2f0rQi?=
 =?us-ascii?Q?RqxHErBtILXJhASb/0EsGtG5DzF9LFiTc9GL5GN/WrdXCAFsBZ8oMd1pytxg?=
 =?us-ascii?Q?1ZFazQchLr63GLaPoSae7zpSWAyVSjKBtI2p/JhEyQXkW0sGXoQKCmfhF6uX?=
 =?us-ascii?Q?g2I3CVSGi6/7itakFGe6iSUdo2X8yOyB1czx+ie81+q2a4UzbzsqT1bWJCXa?=
 =?us-ascii?Q?0I6nTN0a5NhDEV//35n9xMp9RMRIP/NCv3fEkjr/nT/hYkHu6Wy743SXoPle?=
 =?us-ascii?Q?PlN+GpUeJufi+YdpEU9BC2dwldiUjrp0L7jhueMXIjUqjCAm41bTxq+ZZR1i?=
 =?us-ascii?Q?WkGg/7Ph9PZvhTIBdRf6JQE1BoUnNAu+GQT83L2v2E/0fdL4hU+wZZMzzsMn?=
 =?us-ascii?Q?JRbSxp5NBidEhd6VZd4+Jz4jiZODPjPV0LjzwJSkORewcZ/oFSK5QdekHI0m?=
 =?us-ascii?Q?mQ+MCP2zvcPKDh/pRhuq82njC0ChDUTNPlgUdJSXv4banoJqyCF82UenQldS?=
 =?us-ascii?Q?5VktoSLcR3n7YXbcQqkPkS/A9heYbYePvrnLooyYay04fAVUMxOg0uNFuJLt?=
 =?us-ascii?Q?YorT6x30tBs0hyN6eXw2K1jFgv8+uh6EdJctU4O4Odr7n+cvCGP755SH2X3q?=
 =?us-ascii?Q?eAcgyrXRWZeuowemdIHEDVqbooVIndvA8QnoOpi3Qe0WaSLOSOUfXFSb8aUa?=
 =?us-ascii?Q?OfEBni+gkPEblHyDZQxsrE8auss70EJuDyQOiUNv5XMOJp067AoEYrJDlXBm?=
 =?us-ascii?Q?woDnbh9etzlgZVR5Lqz2vYbZLLkURdZTnbmxLLKe51j0hF5vWKZR+RO+Kqcn?=
 =?us-ascii?Q?U+jVHB+QEgkPCgzejoATccQl+51PSoOsFkZYSp4jXGMsPdnREyvPjbutazZz?=
 =?us-ascii?Q?cQ=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 93780171-d9e7-4d3b-8907-08dae457b0bc
X-MS-Exchange-CrossTenant-AuthSource: BN6PR1101MB2227.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Dec 2022 20:04:10.6811
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: CXXi3vWlHUteII2Ua11y1EYv8djVqVQHgwT3dc56p/tHG0NF9a0vuXZH5i07V7au9hGEpOFUAQert7UIUpBj3IC98oUbFphESnAQlE8qAwE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR11MB5218
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,
        SPF_NONE 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 Wed, Dec 21, 2022 at 04:01:44PM +0800, Clark Wang wrote:
> 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.
							  first.
> Then can call the stmmac_hw_setup() before calling phy_resume().

It'd be nice to add Fixes tag with appropriate commit id.
Other than that looks fine.

Reviewed-by: Piotr Raczynski <piotr.raczynski@intel.com>

> 
> 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
>