net: stmmac: Add driver support for common safety IRQ

Add support to listen HW safety IRQ like ECC(error
correction code), DPP(data path parity), FSM(finite state
machine) fault in common IRQ line.

Signed-off-by: Suraj Jaiswal <quic_jsuraj@quicinc.com>
Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index 07fe852001a07b7182808cb8c733254e0a90e1e3..a6fefe675ef1520566ccdcafaac705f0ee159e42 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -371,6 +371,7 @@ enum request_irq_err {
        REQ_IRQ_ERR_ALL,
        REQ_IRQ_ERR_TX,
        REQ_IRQ_ERR_RX,
+       REQ_IRQ_ERR_SFTY,
        REQ_IRQ_ERR_SFTY_UE,
        REQ_IRQ_ERR_SFTY_CE,
        REQ_IRQ_ERR_LPI,

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index f155e4841c62bc707b13c70462837b7c810f8142..dddcaa9220cc386a3eca5cfc5e09aa7e84bbeb7b 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -31,6 +31,7 @@ struct stmmac_resources {
        int wol_irq;
        int lpi_irq;
        int irq;
+       int sfty_irq;
        int sfty_ce_irq;
        int sfty_ue_irq;
        int rx_irq[MTL_MAX_RX_QUEUES];
@@ -298,6 +299,7 @@ struct stmmac_priv {
        void __iomem *ptpaddr;
        void __iomem *estaddr;
        unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
+       int sfty_irq;
        int sfty_ce_irq;
        int sfty_ue_irq;
        int rx_irq[MTL_MAX_RX_QUEUES];
@@ -306,6 +308,7 @@ struct stmmac_priv {
        char int_name_mac[IFNAMSIZ + 9];
        char int_name_wol[IFNAMSIZ + 9];
        char int_name_lpi[IFNAMSIZ + 9];
+       char int_name_sfty[IFNAMSIZ + 10];
        char int_name_sfty_ce[IFNAMSIZ + 10];
        char int_name_sfty_ue[IFNAMSIZ + 10];
        char int_name_rx_irq[MTL_MAX_TX_QUEUES][IFNAMSIZ + 14];

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 5236956cc7e40fd82bdd24eda3a467238410b150..9159d93ceb036c0ec78835b74a7d9560e1b982ac 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3597,6 +3597,10 @@ static void stmmac_free_irq(struct net_device *dev,
                if (priv->wol_irq > 0 && priv->wol_irq != dev->irq)
                        free_irq(priv->wol_irq, dev);
                fallthrough;
+       case REQ_IRQ_ERR_SFTY:
+               if (priv->sfty_irq > 0 && priv->sfty_irq != dev->irq)
+                       free_irq(priv->sfty_irq, dev);
+               fallthrough;
        case REQ_IRQ_ERR_WOL:
                free_irq(dev->irq, dev);
                fallthrough;
@@ -3667,6 +3671,23 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
                }
        }
 
+       /* Request the common Safety Feature Correctible/Uncorrectible
+        * Error line in case of another line is used
+        */
+       if (priv->sfty_irq > 0 && priv->sfty_irq != dev->irq) {
+               int_name = priv->int_name_sfty;
+               sprintf(int_name, "%s:%s", dev->name, "safety");
+               ret = request_irq(priv->sfty_irq, stmmac_safety_interrupt,
+                                 0, int_name, dev);
+               if (unlikely(ret < 0)) {
+                       netdev_err(priv->dev,
+                                  "%s: alloc sfty MSI %d (error: %d)\n",
+                                  __func__, priv->sfty_irq, ret);
+                       irq_err = REQ_IRQ_ERR_SFTY;
+                       goto irq_error;
+               }
+       }
+
        /* Request the Safety Feature Correctible Error line in
         * case of another line is used
         */
@@ -3804,6 +3825,21 @@ static int stmmac_request_irq_single(struct net_device *dev)
                }
        }
 
+       /* Request the common Safety Feature Correctible/Uncorrectible
+        * Error line in case of another line is used
+        */
+       if (priv->sfty_irq > 0 && priv->sfty_irq != dev->irq) {
+               ret = request_irq(priv->sfty_irq, stmmac_safety_interrupt,
+                                 IRQF_SHARED, dev->name, dev);
+               if (unlikely(ret < 0)) {
+                       netdev_err(priv->dev,
+                                  "%s: ERROR: allocating the sfty IRQ %d (%d)\n",
+                                  __func__, priv->sfty_irq, ret);
+                       irq_err = REQ_IRQ_ERR_SFTY;
+                       goto irq_error;
+               }
+       }
+
        return 0;
 
 irq_error:
@@ -6063,8 +6099,8 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id)
        if (test_bit(STMMAC_DOWN, &priv->state))
                return IRQ_HANDLED;
 
-       /* Check if a fatal error happened */
-       if (stmmac_safety_feat_interrupt(priv))
+       /* Check ASP error if it isn't delivered via an individual IRQ */
+       if (priv->sfty_irq <= 0 && stmmac_safety_feat_interrupt(priv))
                return IRQ_HANDLED;
 
        /* To handle Common interrupts */
@@ -7513,6 +7549,7 @@ int stmmac_dvr_probe(struct device *device,
        priv->dev->irq = res->irq;
        priv->wol_irq = res->wol_irq;
        priv->lpi_irq = res->lpi_irq;
+       priv->sfty_irq = res->sfty_irq;
        priv->sfty_ce_irq = res->sfty_ce_irq;
        priv->sfty_ue_irq = res->sfty_ue_irq;
        for (i = 0; i < MTL_MAX_RX_QUEUES; i++)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 70eadc83ca6823d61639adde1364fc0cbf11d153..54797edc9b38edc0bc23a6ca1f2b614b9958a70b 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -743,6 +743,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
                dev_info(&pdev->dev, "IRQ eth_lpi not found\n");
        }
 
+       stmmac_res->sfty_irq =
+               platform_get_irq_byname_optional(pdev, "sfty");
+       if (stmmac_res->sfty_irq < 0) {
+               if (stmmac_res->sfty_irq == -EPROBE_DEFER)
+                       return -EPROBE_DEFER;
+               dev_info(&pdev->dev, "IRQ sfty not found\n");
+       }
+
        stmmac_res->addr = devm_platform_ioremap_resource(pdev, 0);
 
        return PTR_ERR_OR_ZERO(stmmac_res->addr);