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

Commit b5a4a3eb authored by Iyappan Subramanian's avatar Iyappan Subramanian Committed by David S. Miller
Browse files

drivers: net: xgene: fix: Disable coalescing on v1 hardware 



Since ethernet v1 hardware has a bug related to coalescing, disabling
this feature.

Signed-off-by: default avatarIyappan Subramanian <isubramanian@apm.com>
Signed-off-by: default avatarToan Le <toanle@apm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c8657d2

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

+0 −12
Original line number Diff line number Diff line
@@ -204,17 +204,6 @@ static u32 xgene_enet_ring_len(struct xgene_enet_desc_ring *ring) 
	return num_msgs;

}



static void xgene_enet_setup_coalescing(struct xgene_enet_desc_ring *ring)

{

	u32 data = 0x7777;



	xgene_enet_ring_wr32(ring, CSR_PBM_COAL, 0x8e);

	xgene_enet_ring_wr32(ring, CSR_PBM_CTICK1, data);

	xgene_enet_ring_wr32(ring, CSR_PBM_CTICK2, data << 16);

	xgene_enet_ring_wr32(ring, CSR_THRESHOLD0_SET1, 0x40);

	xgene_enet_ring_wr32(ring, CSR_THRESHOLD1_SET1, 0x80);

}



void xgene_enet_parse_error(struct xgene_enet_desc_ring *ring,

			    struct xgene_enet_pdata *pdata,

			    enum xgene_enet_err_code status)
@@ -929,5 +918,4 @@ struct xgene_ring_ops xgene_ring1_ops = { 
	.clear = xgene_enet_clear_ring,

	.wr_cmd = xgene_enet_wr_cmd,

	.len = xgene_enet_ring_len,

	.coalesce = xgene_enet_setup_coalescing,

};

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

+2 −1
Original line number Diff line number Diff line
@@ -1188,6 +1188,7 @@ static int xgene_enet_create_desc_rings(struct net_device *ndev) 
		tx_ring->dst_ring_num = xgene_enet_dst_ring_num(cp_ring);

	}



	if (pdata->ring_ops->coalesce)

		pdata->ring_ops->coalesce(pdata->tx_ring[0]);

	pdata->tx_qcnt_hi = pdata->tx_ring[0]->slots - 128;