Commit cc7f105e authored by Justin Chen's avatar Justin Chen Committed by David S. Miller
Browse files

net: bcmasp: Add support for PHY interrupts 



Hook up the phy interrupts for internal phys to reduce mdio traffic
and improve responsiveness of link changes.

Signed-off-by: default avatarJustin Chen <justin.chen@broadcom.com>
Acked-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4688f4f4

drivers/net/ethernet/broadcom/asp2/bcmasp.c

+17 −0
Original line number Diff line number Diff line
@@ -31,6 +31,20 @@ static void _intr2_mask_set(struct bcmasp_priv *priv, u32 mask) 
	priv->irq_mask |= mask;

}



void bcmasp_enable_phy_irq(struct bcmasp_intf *intf, int en)

{

	struct bcmasp_priv *priv = intf->parent;



	/* Only supported with internal phys */

	if (!intf->internal_phy)

		return;



	if (en)

		_intr2_mask_clear(priv, ASP_INTR2_PHY_EVENT(intf->channel));

	else

		_intr2_mask_set(priv, ASP_INTR2_PHY_EVENT(intf->channel));

}



void bcmasp_enable_tx_irq(struct bcmasp_intf *intf, int en)

{

	struct bcmasp_priv *priv = intf->parent;
@@ -79,6 +93,9 @@ static void bcmasp_intr2_handling(struct bcmasp_intf *intf, u32 status) 
			__napi_schedule_irqoff(&intf->tx_napi);

		}

	}



	if (status & ASP_INTR2_PHY_EVENT(intf->channel))

		phy_mac_interrupt(intf->ndev->phydev);

}



static irqreturn_t bcmasp_isr(int irq, void *data)

drivers/net/ethernet/broadcom/asp2/bcmasp.h

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#define ASP_INTR2_TX_DESC(intr)			BIT((intr) + 14)

#define ASP_INTR2_UMC0_WAKE			BIT(22)

#define ASP_INTR2_UMC1_WAKE			BIT(28)

#define ASP_INTR2_PHY_EVENT(intr)		((intr) ? BIT(30) | BIT(31) : \

						BIT(24) | BIT(25))



#define ASP_WAKEUP_INTR2_OFFSET			0x1200

#define  ASP_WAKEUP_INTR2_STATUS		0x0
@@ -556,6 +558,8 @@ void bcmasp_enable_tx_irq(struct bcmasp_intf *intf, int en); 


void bcmasp_enable_rx_irq(struct bcmasp_intf *intf, int en);



void bcmasp_enable_phy_irq(struct bcmasp_intf *intf, int en);



void bcmasp_flush_rx_port(struct bcmasp_intf *intf);



extern const struct ethtool_ops bcmasp_ethtool_ops;

drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c

+5 −0
Original line number Diff line number Diff line
@@ -382,6 +382,7 @@ static void bcmasp_netif_start(struct net_device *dev) 


	bcmasp_enable_rx_irq(intf, 1);

	bcmasp_enable_tx_irq(intf, 1);

	bcmasp_enable_phy_irq(intf, 1);



	phy_start(dev->phydev);

}
@@ -890,6 +891,7 @@ static void bcmasp_netif_deinit(struct net_device *dev) 
	/* Disable interrupts */

	bcmasp_enable_tx_irq(intf, 0);

	bcmasp_enable_rx_irq(intf, 0);

	bcmasp_enable_phy_irq(intf, 0);



	netif_napi_del(&intf->tx_napi);

	netif_napi_del(&intf->rx_napi);
@@ -1028,6 +1030,9 @@ static int bcmasp_netif_init(struct net_device *dev, bool phy_connect) 
			goto err_phy_disable;

		}



		if (intf->internal_phy)

			dev->phydev->irq = PHY_MAC_INTERRUPT;



		/* Indicate that the MAC is responsible for PHY PM */

		phydev->mac_managed_pm = true;

	} else if (!intf->wolopts) {