Skip to content

Commit e54d628

Browse files
Furong XuPaolo Abeni
authored andcommitted
net: stmmac: xgmac: Disable FPE MMC interrupts
Commit aeb18dd ("net: stmmac: xgmac: Disable MMC interrupts by default") tries to disable MMC interrupts to avoid a storm of unhandled interrupts, but leaves the FPE(Frame Preemption) MMC interrupts enabled, FPE MMC interrupts can cause the same problem. Now we mask FPE TX and RX interrupts to disable all MMC interrupts. Fixes: aeb18dd ("net: stmmac: xgmac: Disable MMC interrupts by default") Reviewed-by: Larysa Zaremba <larysa.zaremba@intel.com> Signed-off-by: Furong Xu <0x1207@gmail.com> Reviewed-by: Serge Semin <fancer.lancer@gmail.com> Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com> Link: https://lore.kernel.org/r/20231125060126.2328690-1-0x1207@gmail.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent ad31c62 commit e54d628

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

drivers/net/ethernet/stmicro/stmmac/mmc_core.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,10 @@
177177
#define MMC_XGMAC_RX_DISCARD_OCT_GB 0x1b4
178178
#define MMC_XGMAC_RX_ALIGN_ERR_PKT 0x1bc
179179

180+
#define MMC_XGMAC_TX_FPE_INTR_MASK 0x204
180181
#define MMC_XGMAC_TX_FPE_FRAG 0x208
181182
#define MMC_XGMAC_TX_HOLD_REQ 0x20c
183+
#define MMC_XGMAC_RX_FPE_INTR_MASK 0x224
182184
#define MMC_XGMAC_RX_PKT_ASSEMBLY_ERR 0x228
183185
#define MMC_XGMAC_RX_PKT_SMD_ERR 0x22c
184186
#define MMC_XGMAC_RX_PKT_ASSEMBLY_OK 0x230
@@ -352,6 +354,8 @@ static void dwxgmac_mmc_intr_all_mask(void __iomem *mmcaddr)
352354
{
353355
writel(0x0, mmcaddr + MMC_RX_INTR_MASK);
354356
writel(0x0, mmcaddr + MMC_TX_INTR_MASK);
357+
writel(MMC_DEFAULT_MASK, mmcaddr + MMC_XGMAC_TX_FPE_INTR_MASK);
358+
writel(MMC_DEFAULT_MASK, mmcaddr + MMC_XGMAC_RX_FPE_INTR_MASK);
355359
writel(MMC_DEFAULT_MASK, mmcaddr + MMC_XGMAC_RX_IPC_INTR_MASK);
356360
}
357361

0 commit comments

Comments
 (0)