From: Heiner Kallweit <hkallwe...@gmail.com> Sent: 2018年12月16日 0:20
> Now that the PHY isn't stopped any longer by phylib in case of a MDIO error,
> we can remove this workaround.
>
> Signed-off-by: Heiner Kallweit <hkallwe...@gmail.com>
The old workaround can be removed NOW, thanks.
Acked-by: Fugang Duan <fugang.d...@nxp.com>
> ---
> drivers/net/ethernet/freescale/fec.h | 1 -
> drivers/net/ethernet/freescale/fec_main.c | 12 ------------
> 2 files changed, 13 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/fec.h
> b/drivers/net/ethernet/freescale/fec.h
> index bf80855dd..f79e57f73 100644
> --- a/drivers/net/ethernet/freescale/fec.h
> +++ b/drivers/net/ethernet/freescale/fec.h
> @@ -531,7 +531,6 @@ struct fec_enet_private {
>
> /* Phylib and MDIO interface */
> struct mii_bus *mii_bus;
> - int mii_timeout;
> uint phy_speed;
> phy_interface_t phy_interface;
> struct device_node *phy_node;
> diff --git a/drivers/net/ethernet/freescale/fec_main.c
> b/drivers/net/ethernet/freescale/fec_main.c
> index 6db69ba30..ae0f88bce 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -1714,12 +1714,6 @@ static void fec_enet_adjust_link(struct net_device
> *ndev)
> struct phy_device *phy_dev = ndev->phydev;
> int status_change = 0;
>
> - /* Prevent a state halted on mii error */
> - if (fep->mii_timeout && phy_dev->state == PHY_HALTED) {
> - phy_dev->state = PHY_RESUMING;
> - return;
> - }
> -
> /*
> * If the netdev is down, or is going down, we're not interested
> * in link state events, so just mark our idea of the link as down @@
> -1779,7 +1773,6 @@ static int fec_enet_mdio_read(struct mii_bus *bus, int
> mii_id, int regnum)
> if (ret < 0)
> return ret;
>
> - fep->mii_timeout = 0;
> reinit_completion(&fep->mdio_done);
>
> /* start a read op */
> @@ -1791,7 +1784,6 @@ static int fec_enet_mdio_read(struct mii_bus *bus,
> int mii_id, int regnum)
> time_left = wait_for_completion_timeout(&fep->mdio_done,
> usecs_to_jiffies(FEC_MII_TIMEOUT));
> if (time_left == 0) {
> - fep->mii_timeout = 1;
> netdev_err(fep->netdev, "MDIO read timeout\n");
> ret = -ETIMEDOUT;
> goto out;
> @@ -1820,7 +1812,6 @@ static int fec_enet_mdio_write(struct mii_bus *bus,
> int mii_id, int regnum,
> else
> ret = 0;
>
> - fep->mii_timeout = 0;
> reinit_completion(&fep->mdio_done);
>
> /* start a write op */
> @@ -1833,7 +1824,6 @@ static int fec_enet_mdio_write(struct mii_bus *bus,
> int mii_id, int regnum,
> time_left = wait_for_completion_timeout(&fep->mdio_done,
> usecs_to_jiffies(FEC_MII_TIMEOUT));
> if (time_left == 0) {
> - fep->mii_timeout = 1;
> netdev_err(fep->netdev, "MDIO write timeout\n");
> ret = -ETIMEDOUT;
> }
> @@ -2001,8 +1991,6 @@ static int fec_enet_mii_init(struct platform_device
> *pdev)
> return -ENOENT;
> }
>
> - fep->mii_timeout = 0;
> -
> /*
> * Set MII speed to 2.5 MHz (= clk_get_rate() / 2 * phy_speed)
> *
> --
> 2.20.0
>
