Commit fcb5dfe7 authored by Doug Berger's avatar Doug Berger Committed by David S. Miller
Browse files

net: bcmgenet: remove old link state values 



The PHY state machine has been fixed to only call the adjust_link
callback when the link state has changed. Therefore the old link
state variables are no longer needed to detect a change in link
state.

This commit effectively reverts
commit 5ad6e6c5 ("net: bcmgenet: improve bcmgenet_mii_setup()")

Signed-off-by: default avatarDoug Berger <opendmb@gmail.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 50e35668

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+0 −5
Original line number Diff line number Diff line
@@ -3408,11 +3408,6 @@ static void bcmgenet_netif_stop(struct net_device *dev) 
	 */

	cancel_work_sync(&priv->bcmgenet_irq_work);



	priv->old_link = -1;

	priv->old_speed = -1;

	priv->old_duplex = -1;

	priv->old_pause = -1;



	/* tx reclaim */

	bcmgenet_tx_reclaim_all(dev);

	bcmgenet_fini_dma(priv);

drivers/net/ethernet/broadcom/genet/bcmgenet.h

+0 −4
Original line number Diff line number Diff line
@@ -606,10 +606,6 @@ struct bcmgenet_priv { 
	bool clk_eee_enabled;



	/* PHY device variables */

	int old_link;

	int old_speed;

	int old_duplex;

	int old_pause;

	phy_interface_t phy_interface;

	int phy_addr;

	int ext_phy;

drivers/net/ethernet/broadcom/genet/bcmmii.c

+0 −36
Original line number Diff line number Diff line
@@ -33,34 +33,8 @@ void bcmgenet_mii_setup(struct net_device *dev) 
	struct bcmgenet_priv *priv = netdev_priv(dev);

	struct phy_device *phydev = dev->phydev;

	u32 reg, cmd_bits = 0;

	bool status_changed = false;



	if (priv->old_link != phydev->link) {

		status_changed = true;

		priv->old_link = phydev->link;

	}



	if (phydev->link) {

		/* check speed/duplex/pause changes */

		if (priv->old_speed != phydev->speed) {

			status_changed = true;

			priv->old_speed = phydev->speed;

		}



		if (priv->old_duplex != phydev->duplex) {

			status_changed = true;

			priv->old_duplex = phydev->duplex;

		}



		if (priv->old_pause != phydev->pause) {

			status_changed = true;

			priv->old_pause = phydev->pause;

		}



		/* done if nothing has changed */

		if (!status_changed)

			return;



		/* speed */

		if (phydev->speed == SPEED_1000)

			cmd_bits = CMD_SPEED_1000;
@@ -102,10 +76,6 @@ void bcmgenet_mii_setup(struct net_device *dev) 
			reg |= CMD_TX_EN | CMD_RX_EN;

		}

		bcmgenet_umac_writel(priv, reg, UMAC_CMD);

	} else {

		/* done if nothing has changed */

		if (!status_changed)

			return;

	}



	phy_print_status(phydev);
@@ -294,12 +264,6 @@ int bcmgenet_mii_probe(struct net_device *dev) 
	if (priv->internal_phy)

		phy_flags = priv->gphy_rev;



	/* Initialize link state variables that bcmgenet_mii_setup() uses */

	priv->old_link = -1;

	priv->old_speed = -1;

	priv->old_duplex = -1;

	priv->old_pause = -1;



	/* This is an ugly quirk but we have not been correctly interpreting

	 * the phy_interface values and we have done that across different

	 * drivers, so at least we are consistent in our mistakes.