Revert "net: stmmac: Enable Per DMA Channel interrupt"

Revert "net: stmmac: Use interrupt mode INTM=1 for per channel irq"
This reverts commit 36af9f25ddfd311da82628f194c794786467cb12.
Revert "net: stmmac: Add support for TX/RX channel interrupt"
This reverts commit 9072e03d32088137a435ddf3aa95fd6e038d69d8.
Revert "net: stmmac: Make MSI interrupt routine generic"
This reverts commit 477bd4beb93bf9ace9bda71f1437b191befa9cf4.
Revert "dt-bindings: net: snps,dwmac: per channel irq"
This reverts commit 67d47c8ada0f8795bfcdb85cc8f2ad3ce556674b.

Device tree bindings need to be reviewed.

Link: https://lore.kernel.org/all/2df9fe3e-7971-4aa2-89a9-0e085b3b00d7@linaro.org/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
index e72dded824f4654546124bfd40cc7b6760dee43c..5c2769dc689af7b9d0fcd5b773886ee84e46daa3 100644 (file)
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
@@ -103,27 +103,17 @@ properties:
 
   interrupts:
     minItems: 1
-    maxItems: 19
+    items:
+      - description: Combined signal for various interrupt events
+      - description: The interrupt to manage the remote wake-up packet detection
+      - description: The interrupt that occurs when Rx exits the LPI state
 
   interrupt-names:
     minItems: 1
-    maxItems: 19
     items:
-      oneOf:
-        - description: Combined signal for various interrupt events
-          const: macirq
-        - description: The interrupt to manage the remote wake-up packet detection
-          const: eth_wake_irq
-        - description: The interrupt that occurs when Rx exits the LPI state
-          const: eth_lpi
-        - description: DMA Tx per-channel interrupt
-          pattern: '^dma_tx[0-7]?$'
-        - description: DMA Rx per-channel interrupt
-          pattern: '^dma_rx[0-7]?$'
-
-    allOf:
-      - contains:
-          const: macirq
+      - const: macirq
+      - enum: [eth_wake_irq, eth_lpi]
+      - const: eth_lpi
 
   clocks:
     minItems: 1

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
index f0ec69af96c94dc259b4ec97b5e01527cf2b55d6..60283543ffc8882cc2be257ac8eec8b3d3a9337a 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
@@ -952,7 +952,7 @@ static int stmmac_config_single_msi(struct pci_dev *pdev,
 
        res->irq = pci_irq_vector(pdev, 0);
        res->wol_irq = res->irq;
-       plat->flags &= ~STMMAC_FLAG_MULTI_IRQ_EN;
+       plat->flags &= ~STMMAC_FLAG_MULTI_MSI_EN;
        dev_info(&pdev->dev, "%s: Single IRQ enablement successful\n",
                 __func__);
 
@@ -1004,7 +1004,7 @@ static int stmmac_config_multi_msi(struct pci_dev *pdev,
        if (plat->msi_sfty_ue_vec < STMMAC_MSI_VEC_MAX)
                res->sfty_ue_irq = pci_irq_vector(pdev, plat->msi_sfty_ue_vec);
 
-       plat->flags |= STMMAC_FLAG_MULTI_IRQ_EN;
+       plat->flags |= STMMAC_FLAG_MULTI_MSI_EN;
        dev_info(&pdev->dev, "%s: multi MSI enablement successful\n", __func__);
 
        return 0;

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
index cf43fb3c6cc5990cf79675e567694093f1c4a493..ba2ce776bd4df02da12f131b530f3a2cda3d7b92 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -427,9 +427,6 @@ static int socfpga_dwmac_probe(struct platform_device *pdev)
        plat_dat->bsp_priv = dwmac;
        plat_dat->fix_mac_speed = socfpga_dwmac_fix_mac_speed;
 
-       if (stmmac_res.rx_irq[0] > 0 && stmmac_res.tx_irq[0] > 0)
-               plat_dat->flags |= STMMAC_FLAG_MULTI_IRQ_EN;
-
        ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
        if (ret)
                return ret;

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
index 5f649106ffcd2875924da362d168ae7a45e5ff60..84d3a8551b03225ff114e03cba0e4e6c1a0d616d 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
@@ -175,7 +175,7 @@ static void dwmac4_dma_init(void __iomem *ioaddr,
 
        value = readl(ioaddr + DMA_BUS_MODE);
 
-       if (dma_cfg->multi_irq_en) {
+       if (dma_cfg->multi_msi_en) {
                value &= ~DMA_BUS_MODE_INTM_MASK;
                value |= (DMA_BUS_MODE_INTM_MODE1 << DMA_BUS_MODE_INTM_SHIFT);
        }

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
index 04bf731cb7ea8faed8b6f0b7b5212525f19650d3..207ff1799f2c712fe1e10033fa4d2b32dbd197c6 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
@@ -346,9 +346,6 @@
 /* DMA Registers */
 #define XGMAC_DMA_MODE                 0x00003000
 #define XGMAC_SWR                      BIT(0)
-#define XGMAC_DMA_MODE_INTM_MASK       GENMASK(13, 12)
-#define XGMAC_DMA_MODE_INTM_SHIFT      12
-#define XGMAC_DMA_MODE_INTM_MODE1      0x1
 #define XGMAC_DMA_SYSBUS_MODE          0x00003004
 #define XGMAC_WR_OSR_LMT               GENMASK(29, 24)
 #define XGMAC_WR_OSR_LMT_SHIFT         24

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c
index dcb9f094415d4038da6eaf0bf6f137beb4a9b96e..3cde695fec91bd7592e23e725517f0cccee08a42 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c
@@ -31,13 +31,6 @@ static void dwxgmac2_dma_init(void __iomem *ioaddr,
                value |= XGMAC_EAME;
 
        writel(value, ioaddr + XGMAC_DMA_SYSBUS_MODE);
-
-       if (dma_cfg->multi_irq_en) {
-               value = readl(ioaddr + XGMAC_DMA_MODE);
-               value &= ~XGMAC_DMA_MODE_INTM_MASK;
-               value |= (XGMAC_DMA_MODE_INTM_MODE1 << XGMAC_DMA_MODE_INTM_SHIFT);
-               writel(value, ioaddr + XGMAC_DMA_MODE);
-       }
 }
 
 static void dwxgmac2_dma_init_chan(struct stmmac_priv *priv,
@@ -372,18 +365,19 @@ static int dwxgmac2_dma_interrupt(struct stmmac_priv *priv,
        }
 
        /* TX/RX NORMAL interrupts */
-       if (likely(intr_status & XGMAC_RI)) {
-               u64_stats_update_begin(&rxq_stats->syncp);
-               rxq_stats->rx_normal_irq_n++;
-               u64_stats_update_end(&rxq_stats->syncp);
-               ret |= handle_rx;
-       }
-
-       if (likely(intr_status & (XGMAC_TI | XGMAC_TBU))) {
-               u64_stats_update_begin(&txq_stats->syncp);
-               txq_stats->tx_normal_irq_n++;
-               u64_stats_update_end(&txq_stats->syncp);
-               ret |= handle_tx;
+       if (likely(intr_status & XGMAC_NIS)) {
+               if (likely(intr_status & XGMAC_RI)) {
+                       u64_stats_update_begin(&rxq_stats->syncp);
+                       rxq_stats->rx_normal_irq_n++;
+                       u64_stats_update_end(&rxq_stats->syncp);
+                       ret |= handle_rx;
+               }
+               if (likely(intr_status & (XGMAC_TI | XGMAC_TBU))) {
+                       u64_stats_update_begin(&txq_stats->syncp);
+                       txq_stats->tx_normal_irq_n++;
+                       u64_stats_update_end(&txq_stats->syncp);
+                       ret |= handle_tx;
+               }
        }
 
        /* Clear interrupts */

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 57873b879b336b0a912174f561e4429ebe194895..47de466e432c0545aba22d9dc2801d2fd733c7b5 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -129,8 +129,8 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id);
 /* For MSI interrupts handling */
 static irqreturn_t stmmac_mac_interrupt(int irq, void *dev_id);
 static irqreturn_t stmmac_safety_interrupt(int irq, void *dev_id);
-static irqreturn_t stmmac_dma_tx_interrupt(int irq, void *data);
-static irqreturn_t stmmac_dma_rx_interrupt(int irq, void *data);
+static irqreturn_t stmmac_msi_intr_tx(int irq, void *data);
+static irqreturn_t stmmac_msi_intr_rx(int irq, void *data);
 static void stmmac_reset_rx_queue(struct stmmac_priv *priv, u32 queue);
 static void stmmac_reset_tx_queue(struct stmmac_priv *priv, u32 queue);
 static void stmmac_reset_queues_param(struct stmmac_priv *priv);
@@ -3602,7 +3602,7 @@ static void stmmac_free_irq(struct net_device *dev,
        }
 }
 
-static int stmmac_request_irq_multi(struct net_device *dev)
+static int stmmac_request_irq_multi_msi(struct net_device *dev)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
        enum request_irq_err irq_err;
@@ -3697,7 +3697,7 @@ static int stmmac_request_irq_multi(struct net_device *dev)
                }
        }
 
-       /* Request Rx irq */
+       /* Request Rx MSI irq */
        for (i = 0; i < priv->plat->rx_queues_to_use; i++) {
                if (i >= MTL_MAX_RX_QUEUES)
                        break;
@@ -3707,11 +3707,11 @@ static int stmmac_request_irq_multi(struct net_device *dev)
                int_name = priv->int_name_rx_irq[i];
                sprintf(int_name, "%s:%s-%d", dev->name, "rx", i);
                ret = request_irq(priv->rx_irq[i],
-                                 stmmac_dma_rx_interrupt,
+                                 stmmac_msi_intr_rx,
                                  0, int_name, &priv->dma_conf.rx_queue[i]);
                if (unlikely(ret < 0)) {
                        netdev_err(priv->dev,
-                                  "%s: alloc rx-%d  dma rx_irq %d (error: %d)\n",
+                                  "%s: alloc rx-%d  MSI %d (error: %d)\n",
                                   __func__, i, priv->rx_irq[i], ret);
                        irq_err = REQ_IRQ_ERR_RX;
                        irq_idx = i;
@@ -3722,7 +3722,7 @@ static int stmmac_request_irq_multi(struct net_device *dev)
                irq_set_affinity_hint(priv->rx_irq[i], &cpu_mask);
        }
 
-       /* Request Tx irq */
+       /* Request Tx MSI irq */
        for (i = 0; i < priv->plat->tx_queues_to_use; i++) {
                if (i >= MTL_MAX_TX_QUEUES)
                        break;
@@ -3732,11 +3732,11 @@ static int stmmac_request_irq_multi(struct net_device *dev)
                int_name = priv->int_name_tx_irq[i];
                sprintf(int_name, "%s:%s-%d", dev->name, "tx", i);
                ret = request_irq(priv->tx_irq[i],
-                                 stmmac_dma_tx_interrupt,
+                                 stmmac_msi_intr_tx,
                                  0, int_name, &priv->dma_conf.tx_queue[i]);
                if (unlikely(ret < 0)) {
                        netdev_err(priv->dev,
-                                  "%s: alloc tx-%d  dma tx_irq %d (error: %d)\n",
+                                  "%s: alloc tx-%d  MSI %d (error: %d)\n",
                                   __func__, i, priv->tx_irq[i], ret);
                        irq_err = REQ_IRQ_ERR_TX;
                        irq_idx = i;
@@ -3811,8 +3811,8 @@ static int stmmac_request_irq(struct net_device *dev)
        int ret;
 
        /* Request the IRQ lines */
-       if (priv->plat->flags & STMMAC_FLAG_MULTI_IRQ_EN)
-               ret = stmmac_request_irq_multi(dev);
+       if (priv->plat->flags & STMMAC_FLAG_MULTI_MSI_EN)
+               ret = stmmac_request_irq_multi_msi(dev);
        else
                ret = stmmac_request_irq_single(dev);
 
@@ -6075,7 +6075,7 @@ static irqreturn_t stmmac_safety_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static irqreturn_t stmmac_dma_tx_interrupt(int irq, void *data)
+static irqreturn_t stmmac_msi_intr_tx(int irq, void *data)
 {
        struct stmmac_tx_queue *tx_q = (struct stmmac_tx_queue *)data;
        struct stmmac_dma_conf *dma_conf;
@@ -6107,7 +6107,7 @@ static irqreturn_t stmmac_dma_tx_interrupt(int irq, void *data)
        return IRQ_HANDLED;
 }
 
-static irqreturn_t stmmac_dma_rx_interrupt(int irq, void *data)
+static irqreturn_t stmmac_msi_intr_rx(int irq, void *data)
 {
        struct stmmac_rx_queue *rx_q = (struct stmmac_rx_queue *)data;
        struct stmmac_dma_conf *dma_conf;
@@ -7456,8 +7456,8 @@ int stmmac_dvr_probe(struct device *device,
        priv->plat = plat_dat;
        priv->ioaddr = res->addr;
        priv->dev->base_addr = (unsigned long)res->addr;
-       priv->plat->dma_cfg->multi_irq_en =
-               (priv->plat->flags & STMMAC_FLAG_MULTI_IRQ_EN);
+       priv->plat->dma_cfg->multi_msi_en =
+               (priv->plat->flags & STMMAC_FLAG_MULTI_MSI_EN);
 
        priv->dev->irq = res->irq;
        priv->wol_irq = res->wol_irq;

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index ae6859153e98d575e8fcaaef21605c48261c441c..70eadc83ca6823d61639adde1364fc0cbf11d153 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -710,10 +710,6 @@ EXPORT_SYMBOL_GPL(devm_stmmac_probe_config_dt);
 int stmmac_get_platform_resources(struct platform_device *pdev,
                                  struct stmmac_resources *stmmac_res)
 {
-       char irq_name[9];
-       int i;
-       int irq;
-
        memset(stmmac_res, 0, sizeof(*stmmac_res));
 
        /* Get IRQ information early to have an ability to ask for deferred
@@ -747,30 +743,6 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
                dev_info(&pdev->dev, "IRQ eth_lpi not found\n");
        }
 
-       /* For RX Channel */
-       for (i = 0; i < MTL_MAX_RX_QUEUES; i++) {
-               snprintf(irq_name, sizeof(irq_name), "dma_rx%i", i);
-               irq = platform_get_irq_byname_optional(pdev, irq_name);
-               if (irq == -EPROBE_DEFER)
-                       return irq;
-               else if (irq < 0)
-                       break;
-
-               stmmac_res->rx_irq[i] = irq;
-       }
-
-       /* For TX Channel */
-       for (i = 0; i < MTL_MAX_TX_QUEUES; i++) {
-               snprintf(irq_name, sizeof(irq_name), "dma_tx%i", i);
-               irq = platform_get_irq_byname_optional(pdev, irq_name);
-               if (irq == -EPROBE_DEFER)
-                       return irq;
-               else if (irq < 0)
-                       break;
-
-               stmmac_res->tx_irq[i] = irq;
-       }
-
        stmmac_res->addr = devm_platform_ioremap_resource(pdev, 0);
 
        return PTR_ERR_OR_ZERO(stmmac_res->addr);

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index b950e6f9761de274bf7572cb16f7a80f5764ca04..dee5ad6e48c5a064c70613948ce1a6f602350cf1 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -98,7 +98,7 @@ struct stmmac_dma_cfg {
        int mixed_burst;
        bool aal;
        bool eame;
-       bool multi_irq_en;
+       bool multi_msi_en;
        bool dche;
 };
 
@@ -215,7 +215,7 @@ struct dwmac4_addrs {
 #define STMMAC_FLAG_TSO_EN                     BIT(4)
 #define STMMAC_FLAG_SERDES_UP_AFTER_PHY_LINKUP BIT(5)
 #define STMMAC_FLAG_VLAN_FAIL_Q_EN             BIT(6)
-#define STMMAC_FLAG_MULTI_IRQ_EN               BIT(7)
+#define STMMAC_FLAG_MULTI_MSI_EN               BIT(7)
 #define STMMAC_FLAG_EXT_SNAPSHOT_EN            BIT(8)
 #define STMMAC_FLAG_INT_SNAPSHOT_EN            BIT(9)
 #define STMMAC_FLAG_RX_CLK_RUNS_IN_LPI         BIT(10)