Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

stmmac: DMA threshold mode or SF mode can be different among multiple device instance

- In tx_hard_error_bump_tc interrupt, tc should be bumped only when current
device instance is in DMA threshold mode. Check per device xstats.threshold
other than global tc.

- Set per device xstats.threshold to SF_DMA_MODE when current device
instance is set to SF mode.

v2-changes:
- fix ident style

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Sonic Zhang and committed by
David S. Miller
b2dec116 3051fa61

+3 -2
+3 -2
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
··· 1288 1288 * that needs to not insert csum in the TDES. 1289 1289 */ 1290 1290 priv->hw->dma->dma_mode(priv->ioaddr, SF_DMA_MODE, SF_DMA_MODE); 1291 - tc = SF_DMA_MODE; 1291 + priv->xstats.threshold = SF_DMA_MODE; 1292 1292 } else 1293 1293 priv->hw->dma->dma_mode(priv->ioaddr, tc, SF_DMA_MODE); 1294 1294 } ··· 1452 1452 } 1453 1453 if (unlikely(status & tx_hard_error_bump_tc)) { 1454 1454 /* Try to bump up the dma threshold on this failure */ 1455 - if (unlikely(tc != SF_DMA_MODE) && (tc <= 256)) { 1455 + if (unlikely(priv->xstats.threshold != SF_DMA_MODE) && 1456 + (tc <= 256)) { 1456 1457 tc += 64; 1457 1458 if (priv->plat->force_thresh_dma_mode) 1458 1459 priv->hw->dma->dma_mode(priv->ioaddr, tc, tc);