From: Nazim Amirul commit 6ccf12ae111e ("net: stmmac: use interrupt mode INTM=1 for multi-MSI") introduced INTM=1 interrupt mode for platforms using MSI. Apply a similar approach to enable per-channel interrupts using shared peripheral interrupt (SPI), so that only per-channel TX and RX interrupts (TI/RI) are handled by the TX/RX ISR without invoking the common interrupt ISR. Signed-off-by: Nazim Amirul --- Changes in v2: - Rename macros to use XGMAC_ prefix to match dwxgmac2.h convention. - Drop DMA_MODE_INTM_SHIFT and use FIELD_PREP() instead. - Wire up multi_irq_en via STMMAC_FLAG_MULTI_IRQ_EN in stmmac_main.c so the feature is reachable by platform drivers. - Drop unused plat_stmmacenet_data fields (ext_snapshot_num, int_snapshot_en, ext_snapshot_en, multi_msi_en, multi_irq_en) which duplicate existing flags bits. - Remove misleading commit message paragraph about ISR decoupling (dwxgmac2_dma_interrupt() already handles TI/RI independently of NIS). --- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 ++ drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 9 +++++++++ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 ++ include/linux/stmmac.h | 2 ++ 4 files changed, 15 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h index 51943705a2b0..544541e0e2a5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h @@ -320,6 +320,8 @@ /* 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_MODE1 0x1 #define XGMAC_DMA_SYSBUS_MODE 0x00003004 #define XGMAC_WR_OSR_LMT GENMASK(29, 24) #define XGMAC_RD_OSR_LMT GENMASK(21, 16) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c index 03437f1cf3df..59fe488933d3 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c @@ -4,6 +4,7 @@ * stmmac XGMAC support. */ +#include #include #include "stmmac.h" #include "dwxgmac2.h" @@ -31,6 +32,14 @@ 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 |= FIELD_PREP(XGMAC_DMA_MODE_INTM_MASK, + XGMAC_DMA_MODE_INTM_MODE1); + writel(value, ioaddr + XGMAC_DMA_MODE); + } } static void dwxgmac2_dma_init_chan(struct stmmac_priv *priv, diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index ca68248dbc78..ac258641f5a1 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -7831,6 +7831,8 @@ static int __stmmac_dvr_probe(struct device *device, priv->dev->base_addr = (unsigned long)res->addr; priv->plat->dma_cfg->multi_msi_en = (priv->plat->flags & STMMAC_FLAG_MULTI_MSI_EN); + priv->plat->dma_cfg->multi_irq_en = + (priv->plat->flags & STMMAC_FLAG_MULTI_IRQ_EN); priv->dev->irq = res->irq; priv->wol_irq = res->wol_irq; diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 4430b967abde..2823ac3cb7a4 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -122,6 +122,7 @@ struct stmmac_dma_cfg { bool eame; /* multi_msi_en: stmmac core internal */ bool multi_msi_en; + bool multi_irq_en; /* atds: stmmac core internal */ bool atds; }; @@ -202,6 +203,7 @@ enum dwmac_core_type { #define STMMAC_FLAG_SERDES_UP_AFTER_PHY_LINKUP BIT(5) #define STMMAC_FLAG_VLAN_FAIL_Q_EN BIT(6) #define STMMAC_FLAG_MULTI_MSI_EN BIT(7) +#define STMMAC_FLAG_MULTI_IRQ_EN BIT(17) #define STMMAC_FLAG_EXT_SNAPSHOT_EN BIT(8) #define STMMAC_FLAG_INT_SNAPSHOT_EN BIT(9) #define STMMAC_FLAG_EEE_DISABLE BIT(10) -- 2.43.7