Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28f36653 authored by Doug Berger's avatar Doug Berger Committed by Greg Kroah-Hartman
Browse files

net: bcmgenet: reset 40nm EPHY on energy detect 



[ Upstream commit 25382b991d252aed961cd434176240f9de6bb15f ]

The EPHY integrated into the 40nm Set-Top Box devices can falsely
detect energy when connected to a disabled peer interface. When the
peer interface is enabled the EPHY will detect and report the link
as active, but on occasion may get into a state where it is not
able to exchange data with the connected GENET MAC. This issue has
not been observed when the link parameters are auto-negotiated;
however, it has been observed with a manually configured link.

It has been empirically determined that issuing a soft reset to the
EPHY when energy is detected prevents it from getting into this bad
state.

Fixes: 1c1008c7 ("net: bcmgenet: add main driver file")
Signed-off-by: default avatarDoug Berger <opendmb@gmail.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f4b5e4f1

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

+7 −2
Original line number Diff line number Diff line
@@ -1914,6 +1914,8 @@ static void bcmgenet_link_intr_enable(struct bcmgenet_priv *priv) 
	 */

	if (priv->internal_phy) {

		int0_enable |= UMAC_IRQ_LINK_EVENT;

		if (GENET_IS_V1(priv) || GENET_IS_V2(priv) || GENET_IS_V3(priv))

			int0_enable |= UMAC_IRQ_PHY_DET_R;

	} else if (priv->ext_phy) {

		int0_enable |= UMAC_IRQ_LINK_EVENT;

	} else if (priv->phy_interface == PHY_INTERFACE_MODE_MOCA) {
@@ -2531,6 +2533,10 @@ static void bcmgenet_irq_task(struct work_struct *work) 
		bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC);

	}



	if (status & UMAC_IRQ_PHY_DET_R &&

	    priv->dev->phydev->autoneg != AUTONEG_ENABLE)

		phy_init_hw(priv->dev->phydev);



	/* Link UP/DOWN event */

	if (status & UMAC_IRQ_LINK_EVENT)

		phy_mac_interrupt(priv->phydev,
@@ -2627,8 +2633,7 @@ static irqreturn_t bcmgenet_isr0(int irq, void *dev_id) 
	}



	/* all other interested interrupts handled in bottom half */

	status &= (UMAC_IRQ_LINK_EVENT |

		   UMAC_IRQ_MPD_R);

	status &= (UMAC_IRQ_LINK_EVENT | UMAC_IRQ_MPD_R | UMAC_IRQ_PHY_DET_R);

	if (status) {

		/* Save irq status for bottom-half processing. */

		spin_lock_irqsave(&priv->lock, flags);