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: Justin Chen <justin.chen@broadcom.com>
Acked-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
index 100c69f3307a3556bfa7d912a80004d83048cc56..a806dadc419659b57418eb52e6fdd5da0e883b61 100644 (file)
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
@@ -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)

diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.h b/drivers/net/ethernet/broadcom/asp2/bcmasp.h
index 127a5340625e42642de25bd304e098d12ba004f1..f93cb3da44b0cbe2119eccabeac5ce47c8aa14b1 100644 (file)
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp.h
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.h
@@ -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;

diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
index 25b03d32d791ca662e69ad161c004102ec24e879..dd06b68b33ed617a8de969078b02ce59591b585c 100644 (file)
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
@@ -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) {