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:     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: [PATCH] net: phy: Don't WARN for PHY_READY state in mdio_bus_phy_resume()
Date:   Thu, 18 Aug 2022 15:29:43 +0800
Message-Id: <20220818072943.1201926-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?RaD3/HvwiZLtuIKzocLfqJRzTdeS2Z8+ZkIYGDvs4ZU2VQCL9I4YzHVny075?=
 =?us-ascii?Q?1xHyLgzjp2zfnKqtRoQKCxPjwHC658Cj9TMa8QGcmusxpjVDZVOdE4lfFVPg?=
 =?us-ascii?Q?TZQMHoWSso5ZIkJp1NDlp7ZMNpWUH/suDv1yD2tWNedqfzbt+WpI6vQLq8sX?=
 =?us-ascii?Q?W/LQMAuxx75BdQ0emWXCHo1FtGRcINMob7c53BzuU/E4NIqFViPqJhmnnrk/?=
 =?us-ascii?Q?Lloe4iT5jgsu5QwJ4qwHWfX/W7sT0llcMhDNhrJGFXMV3nunCaaG3XFGDA/h?=
 =?us-ascii?Q?QGfbXFUfk+1irX/5tm4lGytZ/9CT94p+odEGC/rpE/1GdxpRCrxlgtkCK59h?=
 =?us-ascii?Q?ThVIcGEJ/fB8morGy0yxZs5HJjzvBJtoZfv6PnqaxJX8sdbH+O6sW2v9LfR1?=
 =?us-ascii?Q?zdalqxxV2yo4/xhDnmYosXbu9136EAUT1nHWS8uR4Kkhv+lbpD1mtaUU2ApV?=
 =?us-ascii?Q?Rt9owFP70gR5Z/VoHnC4IT34qFgfetciqBLzdaBvlaCf5PI5FXwt4a23NdOQ?=
 =?us-ascii?Q?Z3L0OJMeuqNgaCVvMw2ifskDwc9bdX2CZTy4tcJixjB1y85wD2x3hj/MBDxK?=
 =?us-ascii?Q?HRndT81lcYb6oxS0pONIynPkMmfAAe++mQi6/8hf8N9dXZb8EN1AkQNhmsV3?=
 =?us-ascii?Q?YAicTuS/N+eM5teroe6SE6p3d+pzlzNsFTpgKG28+hB1leWAV2mFDwUJJ7ds?=
 =?us-ascii?Q?2R6OcC90HZdhEhPSzJQ0nG5LWLfZqVj7X98CSeU/cwvYbEP7tgh3GX5exmcm?=
 =?us-ascii?Q?EiJQZqE64z/1UNE33itukRqhSFOdNqVHxmYMrMKNzld6xA3a/fSnPVXvXX9I?=
 =?us-ascii?Q?FZKmp3N5s1zUbty9neLE6nzc0Pt/IzSiTRIezVmIUZegXYvTQiYrfRRRJDmr?=
 =?us-ascii?Q?jE047aEJixma+xMOTgPqvpzm0WAsJCJKuEXVtro5PcR4+rETChCBfMWLwIB1?=
 =?us-ascii?Q?eeIN8QoSc2ltAEH/zj3VZ3xf5MXe+rJHx2HD/Fewao9YG/eiZJ0B1cuxl+zH?=
 =?us-ascii?Q?jfE4wuIy1p6L343GaT42IJor6jNvyQQLMOuP93SC6DRYZkx9naCpJS87Tc7e?=
 =?us-ascii?Q?KEzl14ytedj6Wb4aTskHmARbXqVgaYP1yI6zd0l1hJ6Lke3h0QROzZO39nLE?=
 =?us-ascii?Q?K/UE3zKug9mz80BlgjAyYods/WPIp91I/Z0MNzLPitQJaLoRTljaHkxC/aFo?=
 =?us-ascii?Q?0RALD27GCLIUj4LPsX9vwp3z7IWQ2vr113ruAdCp13HvKlLNrirPTHQE3JdA?=
 =?us-ascii?Q?1C+h6utrn7n31u/bXAgswu7yMxVUmNLD2ntF7Wtk/gQTDnVRG6iXpn1zxuBy?=
 =?us-ascii?Q?jPtiaVVH4Wv65u3zCKhowTb9IVxth1jFPa/8PNDKnDdFtvx+bgXlmhde1rcf?=
 =?us-ascii?Q?NxAXhxKVC4aWRR6dB/JaYwU9M3ayE07SwcplJUxJ5XS2fIWuCVkbiDoDWNFy?=
 =?us-ascii?Q?FZk60uQ/CwYYAOGjdtT/PorgD9+ffforzyKc5DQg7DIs74+xsWm9o2aoC2qr?=
 =?us-ascii?Q?TV4Nt5bAP9B1o5Isb1nQmOS9orfMonbIkYk2B+oaI05E2zk2dj8keAEptVaX?=
 =?us-ascii?Q?MPsng1L/fGHNCx5y55XlijLYKjaiUhuOCTkUt7VJOHHN/N5DfFmdexsGaNDL?=
 =?us-ascii?Q?9Q=3D=3D?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 31b2b6b6-53d1-40fd-7813-08da80eb7667
X-MS-Exchange-CrossTenant-AuthSource: MW5PR11MB5764.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2022 07:30:02.0695
 (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: gC+GghQRUtv2F3yWbmzFRuvf8wUF1++O6D/jQFC4ohlMuH0VKnMXKY63W1UslV7LY8hf834bUKa20GPuI+Q10MDpBudfCHDa0SOM6SFdm3w=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB6686
X-Proofpoint-ORIG-GUID: NLmQkaWfAQ9prJyVrzKGzQGUI3DNkPSb
X-Proofpoint-GUID: NLmQkaWfAQ9prJyVrzKGzQGUI3DNkPSb
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-18_02,2022-08-16_02,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-2208180022
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,URIBL_BLOCKED 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: fba863b81604 ("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