Commit 58a69606 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ARM-imx6ul-14x14-evk-Fix-suspend-over-nfs-by-phy' 

Leonard Crestez says:

====================
ARM: imx6ul-14x14-evk: Fix suspend over nfs by phy

Right now attempting doing suspend/resume while root is mounted over NFS
hangs on imx6ul-14x14-evk. This is happening because ksz8081 phy fixups are
lost on resume.

Fix this by using equivalent devicetree properties instead of a phy fixup
and handling those properties on resume in the micrel driver.

In theory it might now be possible to remove the phy fixup from mach-imx6ul
entirely but it is possible that this would break other imx6ul boards which
use the same phy. The solution would be to patch their dts but it's not
clear how to identify affected boards.

This code is shared with imx6ull-14x14-evk but 6ull suspend needs an
unrelated patch: https://lkml.org/lkml/2017/5/30/584

This is something of a corner case so there is no CC: stable.

Changes since v1: https://lkml.org/lkml/2017/5/30/672


 * Split a kszphy_config_reset function for stuff shared between
config_init and resume. Calling config_init directly could be an option but
on some HW variants it does extra stuff like parsing devicetree options.
That would not be appropriate for resume code.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 93818da5 79e498a9

arch/arm/boot/dts/imx6ul-14x14-evk.dts

+6 −0
Original line number Diff line number Diff line
@@ -120,10 +120,16 @@ 


		ethphy0: ethernet-phy@2 {

			reg = <2>;

			micrel,led-mode = <1>;

			clocks = <&clks IMX6UL_CLK_ENET_REF>;

			clock-names = "rmii-ref";

		};



		ethphy1: ethernet-phy@1 {

			reg = <1>;

			micrel,led-mode = <1>;

			clocks = <&clks IMX6UL_CLK_ENET2_REF>;

			clock-names = "rmii-ref";

		};

	};

};

drivers/net/phy/micrel.c

+28 −14
Original line number Diff line number Diff line
@@ -268,23 +268,12 @@ out: 
	return ret;

}



static int kszphy_config_init(struct phy_device *phydev)

/* Some config bits need to be set again on resume, handle them here. */

static int kszphy_config_reset(struct phy_device *phydev)

{

	struct kszphy_priv *priv = phydev->priv;

	const struct kszphy_type *type;

	int ret;



	if (!priv)

		return 0;



	type = priv->type;



	if (type->has_broadcast_disable)

		kszphy_broadcast_disable(phydev);



	if (type->has_nand_tree_disable)

		kszphy_nand_tree_disable(phydev);



	if (priv->rmii_ref_clk_sel) {

		ret = kszphy_rmii_clk_sel(phydev, priv->rmii_ref_clk_sel_val);

		if (ret) {
@@ -295,9 +284,28 @@ static int kszphy_config_init(struct phy_device *phydev) 
	}



	if (priv->led_mode >= 0)

		kszphy_setup_led(phydev, type->led_mode_reg, priv->led_mode);

		kszphy_setup_led(phydev, priv->type->led_mode_reg, priv->led_mode);



	return 0;

}



static int kszphy_config_init(struct phy_device *phydev)

{

	struct kszphy_priv *priv = phydev->priv;

	const struct kszphy_type *type;



	if (!priv)

		return 0;



	type = priv->type;



	if (type->has_broadcast_disable)

		kszphy_broadcast_disable(phydev);



	if (type->has_nand_tree_disable)

		kszphy_nand_tree_disable(phydev);



	return kszphy_config_reset(phydev);

}



static int ksz8041_config_init(struct phy_device *phydev)
@@ -700,8 +708,14 @@ static int kszphy_suspend(struct phy_device *phydev) 


static int kszphy_resume(struct phy_device *phydev)

{

	int ret;



	genphy_resume(phydev);



	ret = kszphy_config_reset(phydev);

	if (ret)

		return ret;



	/* Enable PHY Interrupts */

	if (phy_interrupt_is_valid(phydev)) {

		phydev->interrupts = PHY_INTERRUPT_ENABLED;

CRA Git | Maintained and supported by SUSTech CRA and CCSE