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

Commit 37850e37 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: bcmgenet: Fix early link interrupt enabling 



Link interrupts are enabled in init_umac(), which is too early for us to
process them since we do not yet have a valid PHY device pointer. On
BCM7425 chips for instance, we will crash calling phy_mac_interrupt()
because phydev is NULL.

Fix this by moving the link interrupts enabling in
bcmgenet_netif_start(), under a specific function:
bcmgenet_link_intr_enable() and while at it, update the comments
surrounding the code.

Fixes: 6cc8e6d4 ("net: bcmgenet: Delay PHY initialization to bcmgenet_open()")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent afc050dd

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

+23 −9
Original line number Original line Diff line number Diff line
@@ -1683,6 +1683,24 @@ static void bcmgenet_intr_disable(struct bcmgenet_priv *priv) 
	bcmgenet_intrl2_1_writel(priv, 0, INTRL2_CPU_MASK_CLEAR);

	bcmgenet_intrl2_1_writel(priv, 0, INTRL2_CPU_MASK_CLEAR);

}

}





static void bcmgenet_link_intr_enable(struct bcmgenet_priv *priv)

{

	u32 int0_enable = 0;



	/* Monitor cable plug/unplugged event for internal PHY, external PHY

	 * and MoCA PHY

	 */

	if (priv->internal_phy) {

		int0_enable |= UMAC_IRQ_LINK_EVENT;

	} else if (priv->ext_phy) {

		int0_enable |= UMAC_IRQ_LINK_EVENT;

	} else if (priv->phy_interface == PHY_INTERFACE_MODE_MOCA) {

		if (priv->hw_params->flags & GENET_HAS_MOCA_LINK_DET)

			int0_enable |= UMAC_IRQ_LINK_EVENT;

	}

	bcmgenet_intrl2_0_writel(priv, int0_enable, INTRL2_CPU_MASK_CLEAR);

}



static int init_umac(struct bcmgenet_priv *priv)

static int init_umac(struct bcmgenet_priv *priv)

{

{

	struct device *kdev = &priv->pdev->dev;

	struct device *kdev = &priv->pdev->dev;
@@ -1723,15 +1741,8 @@ static int init_umac(struct bcmgenet_priv *priv) 
	/* Enable Tx default queue 16 interrupts */

	/* Enable Tx default queue 16 interrupts */

	int0_enable |= UMAC_IRQ_TXDMA_DONE;

	int0_enable |= UMAC_IRQ_TXDMA_DONE;





	/* Monitor cable plug/unplugged event for internal PHY */

	/* Configure backpressure vectors for MoCA */

	if (priv->internal_phy) {

	if (priv->phy_interface == PHY_INTERFACE_MODE_MOCA) {

		int0_enable |= UMAC_IRQ_LINK_EVENT;

	} else if (priv->ext_phy) {

		int0_enable |= UMAC_IRQ_LINK_EVENT;

	} else if (priv->phy_interface == PHY_INTERFACE_MODE_MOCA) {

		if (priv->hw_params->flags & GENET_HAS_MOCA_LINK_DET)

			int0_enable |= UMAC_IRQ_LINK_EVENT;



		reg = bcmgenet_bp_mc_get(priv);

		reg = bcmgenet_bp_mc_get(priv);

		reg |= BIT(priv->hw_params->bp_in_en_shift);

		reg |= BIT(priv->hw_params->bp_in_en_shift);
@@ -2645,6 +2656,9 @@ static void bcmgenet_netif_start(struct net_device *dev) 




	netif_tx_start_all_queues(dev);

	netif_tx_start_all_queues(dev);





	/* Monitor link interrupts now */

	bcmgenet_link_intr_enable(priv);



	phy_start(priv->phydev);

	phy_start(priv->phydev);

}

}