Commit a2d3ebab authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'xgene-bug-fixes' 



Iyappan Subramanian says:

====================
drivers: net: xgene: Bug fixes and errata workarounds

This patch set addresses bug fixes and errata workarounds.
====================

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

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -896,6 +896,7 @@ F: arch/arm64/boot/dts/apm/ 
APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER

M:	Iyappan Subramanian <isubramanian@apm.com>

M:	Keyur Chudgar <kchudgar@apm.com>

M:	Quan Nguyen <qnguyen@apm.com>

S:	Supported

F:	drivers/net/ethernet/apm/xgene/

F:	drivers/net/phy/mdio-xgene.c

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

+2 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static void xgene_gmac_set_speed(struct xgene_enet_pdata *pdata) 
		break;

	}



	mc2 |= FULL_DUPLEX2 | PAD_CRC;

	mc2 |= FULL_DUPLEX2 | PAD_CRC | LENGTH_CHK;

	xgene_enet_wr_mcx_mac(pdata, MAC_CONFIG_2_ADDR, mc2);

	xgene_enet_wr_mcx_mac(pdata, INTERFACE_CONTROL_ADDR, intf_ctl);

	xgene_enet_wr_csr(pdata, RGMII_REG_0_ADDR, rgmii);
@@ -623,6 +623,7 @@ static void xgene_enet_cle_bypass(struct xgene_enet_pdata *pdata, 
	xgene_enet_rd_csr(pdata, CLE_BYPASS_REG0_0_ADDR, &cb);

	cb |= CFG_CLE_BYPASS_EN0;

	CFG_CLE_IP_PROTOCOL0_SET(&cb, 3);

	CFG_CLE_IP_HDR_LEN_SET(&cb, 0);

	xgene_enet_wr_csr(pdata, CLE_BYPASS_REG0_0_ADDR, cb);



	xgene_enet_rd_csr(pdata, CLE_BYPASS_REG1_0_ADDR, &cb);

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

+2 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ enum xgene_enet_rm { 
#define CFG_RXCLK_MUXSEL0_SET(dst, val)	xgene_set_bits(dst, val, 26, 3)



#define CFG_CLE_IP_PROTOCOL0_SET(dst, val)	xgene_set_bits(dst, val, 16, 2)

#define CFG_CLE_IP_HDR_LEN_SET(dst, val)	xgene_set_bits(dst, val, 8, 5)

#define CFG_CLE_DSTQID0_SET(dst, val)		xgene_set_bits(dst, val, 0, 12)

#define CFG_CLE_FPSEL0_SET(dst, val)		xgene_set_bits(dst, val, 16, 4)

#define CFG_CLE_NXTFPSEL0_SET(dst, val)		xgene_set_bits(dst, val, 20, 4)
@@ -215,6 +216,7 @@ enum xgene_enet_rm { 
#define ENET_GHD_MODE			BIT(26)

#define FULL_DUPLEX2			BIT(0)

#define PAD_CRC				BIT(2)

#define LENGTH_CHK			BIT(4)

#define SCAN_AUTO_INCR			BIT(5)

#define TBYT_ADDR			0x38

#define TPKT_ADDR			0x39

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

+46 −28
Original line number Diff line number Diff line
@@ -601,15 +601,25 @@ static netdev_tx_t xgene_enet_start_xmit(struct sk_buff *skb, 
	return NETDEV_TX_OK;

}



static void xgene_enet_skip_csum(struct sk_buff *skb)

static void xgene_enet_rx_csum(struct sk_buff *skb)

{

	struct net_device *ndev = skb->dev;

	struct iphdr *iph = ip_hdr(skb);



	if (!ip_is_fragment(iph) ||

	    (iph->protocol != IPPROTO_TCP && iph->protocol != IPPROTO_UDP)) {

	if (!(ndev->features & NETIF_F_RXCSUM))

		return;



	if (skb->protocol != htons(ETH_P_IP))

		return;



	if (ip_is_fragment(iph))

		return;



	if (iph->protocol != IPPROTO_TCP && iph->protocol != IPPROTO_UDP)

		return;



	skb->ip_summed = CHECKSUM_UNNECESSARY;

}

}



static void xgene_enet_free_pagepool(struct xgene_enet_desc_ring *buf_pool,

				     struct xgene_enet_raw_desc *raw_desc,
@@ -648,12 +658,24 @@ static void xgene_enet_free_pagepool(struct xgene_enet_desc_ring *buf_pool, 
	buf_pool->head = head;

}



/* Errata 10GE_8 and ENET_11 - allow packet with length <=64B */

static bool xgene_enet_errata_10GE_8(struct sk_buff *skb, u32 len, u8 status)

{

	if (status == INGRESS_PKT_LEN && len == ETHER_MIN_PACKET) {

		if (ntohs(eth_hdr(skb)->h_proto) < 46)

			return true;

	}



	return false;

}



static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring,

			       struct xgene_enet_raw_desc *raw_desc,

			       struct xgene_enet_raw_desc *exp_desc)

{

	struct xgene_enet_desc_ring *buf_pool, *page_pool;

	u32 datalen, frag_size, skb_index;

	struct xgene_enet_pdata *pdata;

	struct net_device *ndev;

	dma_addr_t dma_addr;

	struct sk_buff *skb;
@@ -666,6 +688,7 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring, 
	bool nv;



	ndev = rx_ring->ndev;

	pdata = netdev_priv(ndev);

	dev = ndev_to_dev(rx_ring->ndev);

	buf_pool = rx_ring->buf_pool;

	page_pool = rx_ring->page_pool;
@@ -676,30 +699,29 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring, 
	skb = buf_pool->rx_skb[skb_index];

	buf_pool->rx_skb[skb_index] = NULL;



	datalen = xgene_enet_get_data_len(le64_to_cpu(raw_desc->m1));

	skb_put(skb, datalen);

	prefetch(skb->data - NET_IP_ALIGN);

	skb->protocol = eth_type_trans(skb, ndev);



	/* checking for error */

	status = (GET_VAL(ELERR, le64_to_cpu(raw_desc->m0)) << LERR_LEN) ||

	status = (GET_VAL(ELERR, le64_to_cpu(raw_desc->m0)) << LERR_LEN) |

		  GET_VAL(LERR, le64_to_cpu(raw_desc->m0));

	if (unlikely(status > 2)) {

	if (unlikely(status)) {

		if (!xgene_enet_errata_10GE_8(skb, datalen, status)) {

			dev_kfree_skb_any(skb);

			xgene_enet_free_pagepool(page_pool, raw_desc, exp_desc);

		xgene_enet_parse_error(rx_ring, netdev_priv(rx_ring->ndev),

				       status);

		ret = -EIO;

			xgene_enet_parse_error(rx_ring, pdata, status);

			goto out;

		}



	/* strip off CRC as HW isn't doing this */

	datalen = xgene_enet_get_data_len(le64_to_cpu(raw_desc->m1));

	}



	nv = GET_VAL(NV, le64_to_cpu(raw_desc->m0));

	if (!nv)

	if (!nv) {

		/* strip off CRC as HW isn't doing this */

		datalen -= 4;



	skb_put(skb, datalen);

	prefetch(skb->data - NET_IP_ALIGN);



	if (!nv)

		goto skip_jumbo;

	}



	slots = page_pool->slots - 1;

	head = page_pool->head;
@@ -728,11 +750,7 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring, 


skip_jumbo:

	skb_checksum_none_assert(skb);

	skb->protocol = eth_type_trans(skb, ndev);

	if (likely((ndev->features & NETIF_F_IP_CSUM) &&

		   skb->protocol == htons(ETH_P_IP))) {

		xgene_enet_skip_csum(skb);

	}

	xgene_enet_rx_csum(skb);



	rx_ring->rx_packets++;

	rx_ring->rx_bytes += datalen;
@@ -2039,7 +2057,7 @@ static int xgene_enet_probe(struct platform_device *pdev) 
	xgene_enet_setup_ops(pdata);



	if (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII) {

		ndev->features |= NETIF_F_TSO;

		ndev->features |= NETIF_F_TSO | NETIF_F_RXCSUM;

		spin_lock_init(&pdata->mss_lock);

	}

	ndev->hw_features = ndev->features;

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

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include "../../../phy/mdio-xgene.h"



#define XGENE_DRV_VERSION	"v1.0"

#define ETHER_MIN_PACKET	64

#define XGENE_ENET_STD_MTU	1536

#define XGENE_ENET_MAX_MTU	9600

#define SKB_BUFFER_SIZE		(XGENE_ENET_STD_MTU - NET_IP_ALIGN)