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

Commit a844e7d1 authored by Quan Nguyen's avatar Quan Nguyen Committed by David S. Miller
Browse files

drivers: net: xgene: Workaround for HW errata 10GE_4 



This patch adds workaround for HW errata 10GE_4:
"XGENET_ICM_ECM_DROP_COUNT_REG_0 reg not clear on read".

Signed-off-by: default avatarQuan Nguyen <qnguyen@apm.com>
Signed-off-by: default avatarIyappan Subramanian <isubramanian@apm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca6d550c

drivers/net/ethernet/apm/xgene/xgene_enet_hw.c

+2 −0
Original line number Diff line number Diff line
@@ -626,6 +626,8 @@ static void xgene_gmac_get_drop_cnt(struct xgene_enet_pdata *pdata, 
	xgene_enet_rd_mcx_csr(pdata, ICM_ECM_DROP_COUNT_REG0_ADDR, &count);

	*rx = ICM_DROP_COUNT(count);

	*tx = ECM_DROP_COUNT(count);

	/* Errata: 10GE_4 - Fix ICM_ECM_DROP_COUNT not clear-on-read */

	xgene_enet_rd_mcx_csr(pdata, ECM_CONFIG0_REG_0_ADDR, &count);

}



static void xgene_enet_config_ring_if_assoc(struct xgene_enet_pdata *pdata)

drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c

+5 −0
Original line number Diff line number Diff line
@@ -106,6 +106,11 @@ static void xgene_sgmac_get_drop_cnt(struct xgene_enet_pdata *pdata, 
	count = xgene_enet_rd_mcx_csr(pdata, addr);

	*rx = ICM_DROP_COUNT(count);

	*tx = ECM_DROP_COUNT(count);

	/* Errata: 10GE_4 - ICM_ECM_DROP_COUNT not clear-on-read */

	addr = (pdata->enet_id != XGENE_ENET1) ?

		XG_MCX_ECM_CONFIG0_REG_0_ADDR :

		ECM_CONFIG0_REG_0_ADDR + pdata->port_id * OFFSET_4;

	xgene_enet_rd_mcx_csr(pdata, addr);

}



static void xgene_enet_config_ring_if_assoc(struct xgene_enet_pdata *p)

drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c

+2 −0
Original line number Diff line number Diff line
@@ -188,6 +188,8 @@ static void xgene_xgmac_get_drop_cnt(struct xgene_enet_pdata *pdata, 
	xgene_enet_rd_axg_csr(pdata, XGENET_ICM_ECM_DROP_COUNT_REG0, &count);

	*rx = ICM_DROP_COUNT(count);

	*tx = ECM_DROP_COUNT(count);

	/* Errata: 10GE_4 - ICM_ECM_DROP_COUNT not clear-on-read */

	xgene_enet_rd_axg_csr(pdata, XGENET_ECM_CONFIG0_REG_0, &count);

}



static void xgene_enet_config_ring_if_assoc(struct xgene_enet_pdata *pdata)