Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
To:     Sasha Levin <sashal@kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
CC:     "David S . Miller" <davem@davemloft.net>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: RE: [PATCH AUTOSEL 4.19 44/73] net: phy: Fix not to call phy_resume()
 if PHY is not attached
Thread-Topic: [PATCH AUTOSEL 4.19 44/73] net: phy: Fix not to call
 phy_resume() if PHY is not attached
Thread-Index: AQHUkpyH3yB+48+oQE6bwchuEEBeOqV8GIBw
Date:   Thu, 13 Dec 2018 04:48:07 +0000
Message-ID: <OSAPR01MB229047CACB004208BC5F48ACD8A00@OSAPR01MB2290.jpnprd01.prod.outlook.com>
References: <20181213042838.75160-1-sashal@kernel.org>
 <20181213042838.75160-44-sashal@kernel.org>
In-Reply-To: <20181213042838.75160-44-sashal@kernel.org>
Accept-Language: ja-JP, en-US
Content-Language: ja-JP
received-spf: None (protection.outlook.com: renesas.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 3a9334b1-b27f-415f-9fb3-08d660b62d43
X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Dec 2018 04:48:07.7273
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 53d82571-da19-47e4-9cb4-625a166a4a2a
X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB4098
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi,

> From: Sasha Levin, Sent: Thursday, December 13, 2018 1:28 PM
>=20
> From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
>=20
> [ Upstream commit ef1b5bf506b1f0ee3edc98533e1f3ecb105eb46a ]

This upstream commit is also reverted on mainline
as I mentioned other email thread[1]

[1]
https://lore.kernel.org/lkml/OSAPR01MB2290FE36AF50B2F29170383DD8A00@OSAPR01=
MB2290.jpnprd01.prod.outlook.com/T/#u

Best regards,
Yoshihiro Shimoda

> This patch fixes an issue that mdio_bus_phy_resume() doesn't call
> phy_resume() if the PHY is not attached.
>=20
> Fixes: 803dd9c77ac3 ("net: phy: avoid suspending twice a PHY")
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
>  drivers/net/phy/phy_device.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
>=20
> diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
> index 20d1be2b070b..16a94f5b8073 100644
> --- a/drivers/net/phy/phy_device.c
> +++ b/drivers/net/phy/phy_device.c
> @@ -76,7 +76,7 @@ static LIST_HEAD(phy_fixup_list);
>  static DEFINE_MUTEX(phy_fixup_lock);
>=20
>  #ifdef CONFIG_PM
> -static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)
> +static bool mdio_bus_phy_may_suspend(struct phy_device *phydev, bool sus=
pend)
>  {
>  	struct device_driver *drv =3D phydev->mdio.dev.driver;
>  	struct phy_driver *phydrv =3D to_phy_driver(drv);
> @@ -88,10 +88,11 @@ static bool mdio_bus_phy_may_suspend(struct phy_devic=
e *phydev)
>  	/* PHY not attached? May suspend if the PHY has not already been
>  	 * suspended as part of a prior call to phy_disconnect() ->
>  	 * phy_detach() -> phy_suspend() because the parent netdev might be the
> -	 * MDIO bus driver and clock gated at this point.
> +	 * MDIO bus driver and clock gated at this point. Also may resume if
> +	 * PHY is not attached.
>  	 */
>  	if (!netdev)
> -		return !phydev->suspended;
> +		return suspend ? !phydev->suspended : phydev->suspended;
>=20
>  	if (netdev->wol_enabled)
>  		return false;
> @@ -126,7 +127,7 @@ static int mdio_bus_phy_suspend(struct device *dev)
>  	if (phydev->attached_dev && phydev->adjust_link)
>  		phy_stop_machine(phydev);
>=20
> -	if (!mdio_bus_phy_may_suspend(phydev))
> +	if (!mdio_bus_phy_may_suspend(phydev, true))
>  		return 0;
>=20
>  	return phy_suspend(phydev);
> @@ -137,7 +138,7 @@ static int mdio_bus_phy_resume(struct device *dev)
>  	struct phy_device *phydev =3D to_phy_device(dev);
>  	int ret;
>=20
> -	if (!mdio_bus_phy_may_suspend(phydev))
> +	if (!mdio_bus_phy_may_suspend(phydev, false))
>  		goto no_resume;
>=20
>  	ret =3D phy_resume(phydev);
> --
> 2.19.1