Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa1f25eb authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: stmmac: Reset mmc counters on read"

parents 0cd8cc65 22720b71

drivers/net/ethernet/stmicro/stmmac/stmmac.h

+2 −0
Original line number Diff line number Diff line
@@ -180,6 +180,8 @@ extern struct stmmac_emb_smmu_cb_ctx stmmac_emb_smmu_ctx; 


#define MICREL_PHY_ID 0x00221620



#define MMC_CONFIG 0x24



int ethqos_handle_prv_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);

int ethqos_init_pps(struct stmmac_priv *priv);

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

+3 −0
Original line number Diff line number Diff line
@@ -544,6 +544,9 @@ static void stmmac_get_ethtool_stats(struct net_device *dev, 
	u32 tx_queues_count = priv->plat->tx_queues_to_use;

	int i, j = 0;



	/* enable reset on read for mmc counter */

	writel_relaxed(MMC_CONFIG, priv->mmcaddr);



	/* Update the DMA HW counters for dwmac10/100 */

	if (priv->hw->dma->dma_diagnostic_fr)

		priv->hw->dma->dma_diagnostic_fr(&dev->stats,