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 45/73] net: phy: micrel: add toggling phy
 reset if PHY is not attached
Thread-Topic: [PATCH AUTOSEL 4.19 45/73] net: phy: micrel: add toggling phy
 reset if PHY is not attached
Thread-Index: AQHUkpyG2HNJQGrK8kudwY3/T/elaKV8FwRw
Date:   Thu, 13 Dec 2018 04:44:41 +0000
Message-ID: <OSAPR01MB2290FE36AF50B2F29170383DD8A00@OSAPR01MB2290.jpnprd01.prod.outlook.com>
References: <20181213042838.75160-1-sashal@kernel.org>
 <20181213042838.75160-45-sashal@kernel.org>
In-Reply-To: <20181213042838.75160-45-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: b9ecee6c-2325-48ac-0723-08d660b5b25a
X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Dec 2018 04:44:41.4623
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 53d82571-da19-47e4-9cb4-625a166a4a2a
X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB2195
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 <sashal@kernel.org>, Sent: Thursday, December 13, 2018 =
1:28 PM
>=20
> From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
>=20
> [ Upstream commit 8c85f4b81296a530b8af2796c110fa482ac42d4f ]

Since this upstream commit are reverted by the following commit,
we should not backport it.

---
commit 7b566f70e1bf65b189b66eb3de6f431c30f7dff2
Author: David S. Miller <davem@davemloft.net>
Date:   Tue Dec 4 08:47:44 2018 -0800

    phy: Revert toggling reset changes.

    This reverts:

    ef1b5bf506b1 ("net: phy: Fix not to call phy_resume() if PHY is not att=
ached
    8c85f4b81296 ("net: phy: micrel: add toggling phy reset if PHY is not  =
attac

    Andrew Lunn informs me that there are alternative efforts
    underway to fix this more properly.

    Signed-off-by: David S. Miller <davem@davemloft.net>
---

Best regards,
Yoshihiro Shimoda

> This patch adds toggling phy reset if PHY is not attached. Otherwise,
> some boards (e.g. R-Car H3 Salvator-XS) cannot link up correctly if
> we do the following method:
>=20
>  1) Kernel boots by using initramfs.
>  --> No open the nic, so phy_device_register() and phy_probe()
>      deasserts the reset.
>  2) Kernel enters the suspend.
>  --> So, keep the reset signal as deassert.
>  --> On R-Car Salvator-XS board, unfortunately, the board power is
>      turned off.
>  3) Kernel returns from suspend.
>  4) ifconfig eth0 up
>  --> Then, since edge signal of the reset doesn't happen,
>      it cannot link up.
>  5) ifconfig eth0 down
>  6) ifconfig eth0 up
>  --> In this case, it can link up.
>=20
> Reported-by: Hiromitsu Yamasaki <hiromitsu.yamasaki.ym@renesas.com>
> 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/micrel.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
>=20
> diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
> index 3db06b40580d..327f00034d01 100644
> --- a/drivers/net/phy/micrel.c
> +++ b/drivers/net/phy/micrel.c
> @@ -23,6 +23,7 @@
>   *			 ksz9477
>   */
>=20
> +#include <linux/delay.h>
>  #include <linux/kernel.h>
>  #include <linux/module.h>
>  #include <linux/phy.h>
> @@ -725,6 +726,13 @@ static int kszphy_resume(struct phy_device *phydev)
>  {
>  	int ret;
>=20
> +	if (!phydev->attached_dev) {
> +		/* If the PHY is not attached, toggle the reset */
> +		phy_device_reset(phydev, 1);
> +		udelay(1);
> +		phy_device_reset(phydev, 0);
> +	}
> +
>  	genphy_resume(phydev);
>=20
>  	ret =3D kszphy_config_reset(phydev);
> --
> 2.19.1