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:   Xiaolei Wang <xiaolei.wang@windriver.com>
To:     andrew@lunn.ch, hkallweit1@gmail.com
Cc:     f.fainelli@gmail.com, linux@armlinux.org.uk, davem@davemloft.net,
        edumazet@google.com, kuba@kernel.org, pabeni@redhat.com,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [v2][PATCH] net: phy: Don't WARN for PHY_READY state in mdio_bus_phy_resume()
Date:   Fri, 19 Aug 2022 16:24:51 +0800
Message-Id: <20220819082451.1992102-1-xiaolei.wang@windriver.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?q/vY+I2h+JffAhXdXvqB2JCDiFjVu0bcVfgAt06Pr5Ie6AYveC5U6gTgsaax?=
 =?us-ascii?Q?4iIfwM8z0aXqr60chA0B/k9u/5s3j6YUop80koHpoGXRDYQRy9xsl3w6JFGj?=
 =?us-ascii?Q?SGcpUzTOjFV+3IkiQoiH2/ctGQSqQqMEE/REpsnlMy2QQKj58R2sEoCp+bbu?=
 =?us-ascii?Q?cmWg3uX2GJszsZ0tTaLzSMDsM/GC8rWwckoiEjYkzfU8AzbpEiuiIm5AWFtQ?=
 =?us-ascii?Q?8N05UhATKI9GN7v1Dn832OxXjKjONw9ExazXGG/nareOPGsFMTRJjUTBSUhz?=
 =?us-ascii?Q?qOwEH9BNlZ4XIqB20I6BTTDe6Ltr7YSBnrd2GuFoBpfhXWgj750ymj34ShO8?=
 =?us-ascii?Q?IcD3b5o9CeMz85TP1njxnkFNykwjQcCw4yQxzDLouZxfS3KnrW/DT/c1XTxZ?=
 =?us-ascii?Q?GiUEzSaC0snZEsuxGDb4eFmoj94zogxDc9nQOCcPOBoHgLstuvAFnZz014DR?=
 =?us-ascii?Q?ocOdDZhslgqMO9qAyXPKPdgktmgXgNvs+vkTyils8Lmq0FV146iSq0BGSG7Y?=
 =?us-ascii?Q?E3Dsn1fuEwiH9NKC5gIMDoQGjMLCfL4Mw+L/u/u3en9fdm/VMsCVAhyfeneu?=
 =?us-ascii?Q?7LdtbjyYlrF56U4nfqQ7qWxBxlzc+3Itx9oTg1VH0AzemGVjnyxXbAkbcwzY?=
 =?us-ascii?Q?eUyi0K7PNwrCeRk92588slarRIHfsV7Z74NuIBTegiYBxjfWny5dx7C/CkDc?=
 =?us-ascii?Q?3ZnL5ackCw8YQUzMuSZ1NyIZtq5KzkBW68iQEW8MlPG8CsNVdfO0VlkBvUiz?=
 =?us-ascii?Q?b9KKaGCZWV17SR3GFHWA3STtleJndHYw0uF8PfV5XaQpRd0ACM7cjjjVJvNx?=
 =?us-ascii?Q?BDnthRacgMJcwRYBtxYuryliT+CkLNTvqR0jSfq0AY5mXxZk5OJ6n+XUBEWQ?=
 =?us-ascii?Q?wjfEfEVcmBCvvDTj8QSrmhFxrkuDip291iSsp3yEP08eunyGeIv7AGLEPcjf?=
 =?us-ascii?Q?yNioR0bT0sa8SpMmSzNLWMiBt13YMfi1nHVJqn2PxCrYTNkBmI0JeyRUlwYU?=
 =?us-ascii?Q?xKFCpKT6r08BjH40Tv6qwvHizdBddoGhbFur85A9mr6Hb+dub6e7MnXeFBN1?=
 =?us-ascii?Q?BQlStu4RNMXZzZyn5o+M+5a/0jf2o+rBCXn5KZjBUjnwbf9pK5IqPgDnHPjG?=
 =?us-ascii?Q?iTC96U6nFOKm9qSfTvfvPYT3ABVhXJ9bjDO6B2EJx45H9xQxO/ulijMzEDWY?=
 =?us-ascii?Q?CXRYPdZNDAAZvYgR5HxE5yDmO+dfh6r/E5aQnp83ZHQi3DVk/mu2FOVFmbnH?=
 =?us-ascii?Q?My+1JxJpsknzE1b823L5JA+rvj03s6T0+++WP4N4X2WYFcHKqyMCbui4FDpv?=
 =?us-ascii?Q?Yr8th4t3d2jLsgExjp9NWzUdWXhtkAARYuXStPUMF99BWTKQ/VwD7nJHctep?=
 =?us-ascii?Q?jgf2dg/b/dam5ls2BwG16u7uq9gBYaoNGc5FTkkDxudaKjDcyD/BuHYi3gDu?=
 =?us-ascii?Q?YpGt2A/fLu1QLyjXRryc1DjwQr/wLX82504PVG6PORGzLGAD9g2IAXJSaX/8?=
 =?us-ascii?Q?bzxvg4shrmhLiHgHiWtHlzN2hIYTi7ptPmSFQH3YkdYiuBNFP8xmy0h807kY?=
 =?us-ascii?Q?NeDla9pZ9SSem6g0QzeqSTD+Cw1qSMkzFF+xoatxl+/Hbbcn/sWdfBN3I4Sd?=
 =?us-ascii?Q?gg=3D=3D?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 475f34c2-955e-4176-f72f-08da81bc56c6
X-MS-Exchange-CrossTenant-AuthSource: MW5PR11MB5764.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2022 08:25:13.7623
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: EOSA6iepWrVCcCkeOxCoko/FT4Nq3iBwwYvt7vWCFk5JVu3Zx4cPK6Yt6ZEn7jmJ3ybGvT5roYBk5+kibZNznZvhjPsZ1GbVw2v3/ELbVhk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB6790
X-Proofpoint-ORIG-GUID: N2BVbmzK64V5FFj4yhggnwhLokkWP7wT
X-Proofpoint-GUID: N2BVbmzK64V5FFj4yhggnwhLokkWP7wT
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-19_04,2022-08-18_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0
 spamscore=0 impostorscore=0 suspectscore=0 phishscore=0 clxscore=1011
 lowpriorityscore=0 mlxscore=0 adultscore=0 priorityscore=1501
 mlxlogscore=933 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2207270000 definitions=main-2208190033
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,
        SPF_PASS,T_SCC_BODY_TEXT_LINE 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

For some MAC drivers, they set the mac_managed_pm to true in its
->ndo_open() callback. So before the mac_managed_pm is set to true,
we still want to leverage the mdio_bus_phy_suspend()/resume() for
the phy device suspend and resume. In this case, the phy device is
in PHY_READY, and we shouldn't warn about this. It also seems that
the check of mac_managed_pm in WARN_ON is redundant since we already
check this in the entry of mdio_bus_phy_resume(), so drop it.

Fixes: 744d23c71af3 ("net: phy: Warn about incorrect mdio_bus_phy_resume() state")
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
---
 drivers/net/phy/phy_device.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 0c6efd792690..12ff276b80ae 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -316,11 +316,11 @@ static __maybe_unused int mdio_bus_phy_resume(struct device *dev)
 
 	phydev->suspended_by_mdio_bus = 0;
 
-	/* If we managed to get here with the PHY state machine in a state other
-	 * than PHY_HALTED this is an indication that something went wrong and
-	 * we should most likely be using MAC managed PM and we are not.
+	/* If we manged to get here with the PHY state machine in a state neither
+	 * PHY_HALTED nor PHY_READY this is an indication that something went wrong
+	 * and we should most likely be using MAC managed PM and we are not.
 	 */
-	WARN_ON(phydev->state != PHY_HALTED && !phydev->mac_managed_pm);
+	WARN_ON(phydev->state != PHY_HALTED && phydev->state != PHY_READY);
 
 	ret = phy_init_hw(phydev);
 	if (ret < 0)
-- 
2.25.1