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

Merge branch 'code-optimizations-and-bugfixes-for-HNS3-driver' 



Huazhong Tan says:

====================
code optimizations & bugfixes for HNS3 driver

This patchset includes bugfixes and code optimizations for
the HNS3 ethernet controller driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 834f9b05 18655128

drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ enum HCLGE_MBX_OPCODE { 
	HCLGE_MBX_SET_MACVLAN,		/* (VF -> PF) set unicast filter */

	HCLGE_MBX_API_NEGOTIATE,	/* (VF -> PF) negotiate API version */

	HCLGE_MBX_GET_QINFO,		/* (VF -> PF) get queue config */

	HCLGE_MBX_GET_QDEPTH,		/* (VF -> PF) get queue depth */

	HCLGE_MBX_GET_TCINFO,		/* (VF -> PF) get TC config */

	HCLGE_MBX_GET_RETA,		/* (VF -> PF) get RETA */

	HCLGE_MBX_GET_RSS_KEY,		/* (VF -> PF) get RSS key */

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+7 −3
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ struct hnae3_queue { 
	struct hnae3_handle *handle;

	int tqp_index;	/* index in a handle */

	u32 buf_size;	/* size for hnae_desc->addr, preset by AE */

	u16 desc_num;	/* total number of desc */

	u16 tx_desc_num;/* total number of tx desc */

	u16 rx_desc_num;/* total number of rx desc */

};



/*hnae3 loop mode*/
@@ -505,7 +506,8 @@ struct hnae3_knic_private_info { 
	u16 rss_size;		   /* Allocated RSS queues */

	u16 req_rss_size;

	u16 rx_buf_len;

	u16 num_desc;

	u16 num_tx_desc;

	u16 num_rx_desc;



	u8 num_tc;		   /* Total number of enabled TCs */

	u8 prio_tc[HNAE3_MAX_USER_PRIO];  /* TC indexed by prio */
@@ -537,7 +539,9 @@ struct hnae3_roce_private_info { 
struct hnae3_unic_private_info {

	struct net_device *netdev;

	u16 rx_buf_len;

	u16 num_desc;

	u16 num_tx_desc;

	u16 num_rx_desc;



	u16 num_tqps;	/* total number of tqps in this handle */

	struct hnae3_queue **tqp;  /* array base of all TQPs of this instance */

};

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+133 −131
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#include "hnae3.h"

#include "hns3_enet.h"



#define hns3_set_field(origin, shift, val)	((origin) |= ((val) << (shift)))



static void hns3_clear_all_ring(struct hnae3_handle *h);

static void hns3_force_clear_all_rx_ring(struct hnae3_handle *h);

static void hns3_remove_hw_addr(struct net_device *netdev);
@@ -378,6 +380,29 @@ out_start_err: 
	return ret;

}



static void hns3_config_xps(struct hns3_nic_priv *priv)

{

	int i;



	for (i = 0; i < priv->vector_num; i++) {

		struct hns3_enet_tqp_vector *tqp_vector = &priv->tqp_vector[i];

		struct hns3_enet_ring *ring = tqp_vector->tx_group.ring;



		while (ring) {

			int ret;



			ret = netif_set_xps_queue(priv->netdev,

						  &tqp_vector->affinity_mask,

						  ring->tqp->tqp_index);

			if (ret)

				netdev_warn(priv->netdev,

					    "set xps queue failed: %d", ret);



			ring = ring->next;

		}

	}

}



static int hns3_nic_net_open(struct net_device *netdev)

{

	struct hns3_nic_priv *priv = netdev_priv(netdev);
@@ -410,6 +435,7 @@ static int hns3_nic_net_open(struct net_device *netdev) 
	if (h->ae_algo->ops->set_timer_task)

		h->ae_algo->ops->set_timer_task(priv->ae_handle, true);



	hns3_config_xps(priv);

	return 0;

}
@@ -595,7 +621,7 @@ static int hns3_set_tso(struct sk_buff *skb, u32 *paylen, 
		return 0;



	ret = skb_cow_head(skb, 0);

	if (ret)

	if (unlikely(ret))

		return ret;



	l3.hdr = skb_network_header(skb);
@@ -634,7 +660,7 @@ static int hns3_set_tso(struct sk_buff *skb, u32 *paylen, 


	/* normal or tunnel packet*/

	l4_offset = l4.hdr - skb->data;

	hdr_len = (l4.tcp->doff * 4) + l4_offset;

	hdr_len = (l4.tcp->doff << 2) + l4_offset;



	/* remove payload length from inner pseudo checksum when tso*/

	l4_paylen = skb->len - l4_offset;
@@ -643,8 +669,7 @@ static int hns3_set_tso(struct sk_buff *skb, u32 *paylen, 


	/* find the txbd field values */

	*paylen = skb->len - hdr_len;

	hnae3_set_bit(*type_cs_vlan_tso,

		      HNS3_TXD_TSO_B, 1);

	hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_TSO_B, 1);



	/* get MSS for TSO */

	*mss = skb_shinfo(skb)->gso_size;
@@ -723,21 +748,19 @@ static void hns3_set_l2l3l4_len(struct sk_buff *skb, u8 ol4_proto, 


	/* compute L2 header size for normal packet, defined in 2 Bytes */

	l2_len = l3.hdr - skb->data;

	hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L2LEN_M,

			HNS3_TXD_L2LEN_S, l2_len >> 1);

	hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L2LEN_S, l2_len >> 1);



	/* tunnel packet*/

	if (skb->encapsulation) {

		/* compute OL2 header size, defined in 2 Bytes */

		ol2_len = l2_len;

		hnae3_set_field(*ol_type_vlan_len_msec,

				HNS3_TXD_L2LEN_M,

		hns3_set_field(*ol_type_vlan_len_msec,

			       HNS3_TXD_L2LEN_S, ol2_len >> 1);



		/* compute OL3 header size, defined in 4 Bytes */

		ol3_len = l4.hdr - l3.hdr;

		hnae3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_L3LEN_M,

				HNS3_TXD_L3LEN_S, ol3_len >> 2);

		hns3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_L3LEN_S,

			       ol3_len >> 2);



		/* MAC in UDP, MAC in GRE (0x6558)*/

		if ((ol4_proto == IPPROTO_UDP) || (ol4_proto == IPPROTO_GRE)) {
@@ -746,17 +769,16 @@ static void hns3_set_l2l3l4_len(struct sk_buff *skb, u8 ol4_proto, 


			/* compute OL4 header size, defined in 4 Bytes. */

			ol4_len = l2_hdr - l4.hdr;

			hnae3_set_field(*ol_type_vlan_len_msec,

					HNS3_TXD_L4LEN_M, HNS3_TXD_L4LEN_S,

					ol4_len >> 2);

			hns3_set_field(*ol_type_vlan_len_msec,

				       HNS3_TXD_L4LEN_S, ol4_len >> 2);



			/* switch IP header ptr from outer to inner header */

			l3.hdr = skb_inner_network_header(skb);



			/* compute inner l2 header size, defined in 2 Bytes. */

			l2_len = l3.hdr - l2_hdr;

			hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L2LEN_M,

					HNS3_TXD_L2LEN_S, l2_len >> 1);

			hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L2LEN_S,

				       l2_len >> 1);

		} else {

			/* skb packet types not supported by hardware,

			 * txbd len fild doesn't be filled.
@@ -772,23 +794,20 @@ static void hns3_set_l2l3l4_len(struct sk_buff *skb, u8 ol4_proto, 


	/* compute inner(/normal) L3 header size, defined in 4 Bytes */

	l3_len = l4.hdr - l3.hdr;

	hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3LEN_M,

			HNS3_TXD_L3LEN_S, l3_len >> 2);

	hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3LEN_S, l3_len >> 2);



	/* compute inner(/normal) L4 header size, defined in 4 Bytes */

	switch (l4_proto) {

	case IPPROTO_TCP:

		hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_M,

				HNS3_TXD_L4LEN_S, l4.tcp->doff);

		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_S,

			       l4.tcp->doff);

		break;

	case IPPROTO_SCTP:

		hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_M,

				HNS3_TXD_L4LEN_S,

		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_S,

			       (sizeof(struct sctphdr) >> 2));

		break;

	case IPPROTO_UDP:

		hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_M,

				HNS3_TXD_L4LEN_S,

		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_S,

			       (sizeof(struct udphdr) >> 2));

		break;

	default:
@@ -834,32 +853,28 @@ static int hns3_set_l3l4_type_csum(struct sk_buff *skb, u8 ol4_proto, 
		/* define outer network header type.*/

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

			if (skb_is_gso(skb))

				hnae3_set_field(*ol_type_vlan_len_msec,

						HNS3_TXD_OL3T_M,

				hns3_set_field(*ol_type_vlan_len_msec,

					       HNS3_TXD_OL3T_S,

					       HNS3_OL3T_IPV4_CSUM);

			else

				hnae3_set_field(*ol_type_vlan_len_msec,

						HNS3_TXD_OL3T_M,

				hns3_set_field(*ol_type_vlan_len_msec,

					       HNS3_TXD_OL3T_S,

					       HNS3_OL3T_IPV4_NO_CSUM);



		} else if (skb->protocol == htons(ETH_P_IPV6)) {

			hnae3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_OL3T_M,

					HNS3_TXD_OL3T_S, HNS3_OL3T_IPV6);

			hns3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_OL3T_S,

				       HNS3_OL3T_IPV6);

		}



		/* define tunnel type(OL4).*/

		switch (l4_proto) {

		case IPPROTO_UDP:

			hnae3_set_field(*ol_type_vlan_len_msec,

					HNS3_TXD_TUNTYPE_M,

			hns3_set_field(*ol_type_vlan_len_msec,

				       HNS3_TXD_TUNTYPE_S,

				       HNS3_TUN_MAC_IN_UDP);

			break;

		case IPPROTO_GRE:

			hnae3_set_field(*ol_type_vlan_len_msec,

					HNS3_TXD_TUNTYPE_M,

			hns3_set_field(*ol_type_vlan_len_msec,

				       HNS3_TXD_TUNTYPE_S,

				       HNS3_TUN_NVGRE);

			break;
@@ -882,42 +897,36 @@ static int hns3_set_l3l4_type_csum(struct sk_buff *skb, u8 ol4_proto, 
	}



	if (l3.v4->version == 4) {

		hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3T_M,

				HNS3_TXD_L3T_S, HNS3_L3T_IPV4);

		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3T_S,

			       HNS3_L3T_IPV4);



		/* the stack computes the IP header already, the only time we

		 * need the hardware to recompute it is in the case of TSO.

		 */

		if (skb_is_gso(skb))

			hnae3_set_bit(*type_cs_vlan_tso, HNS3_TXD_L3CS_B, 1);

			hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3CS_B, 1);

	} else if (l3.v6->version == 6) {

		hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3T_M,

				HNS3_TXD_L3T_S, HNS3_L3T_IPV6);

		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3T_S,

			       HNS3_L3T_IPV6);

	}



	switch (l4_proto) {

	case IPPROTO_TCP:

		hnae3_set_bit(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1);

		hnae3_set_field(*type_cs_vlan_tso,

				HNS3_TXD_L4T_M,

				HNS3_TXD_L4T_S,

		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1);

		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4T_S,

			       HNS3_L4T_TCP);

		break;

	case IPPROTO_UDP:

		if (hns3_tunnel_csum_bug(skb))

			break;



		hnae3_set_bit(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1);

		hnae3_set_field(*type_cs_vlan_tso,

				HNS3_TXD_L4T_M,

				HNS3_TXD_L4T_S,

		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1);

		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4T_S,

			       HNS3_L4T_UDP);

		break;

	case IPPROTO_SCTP:

		hnae3_set_bit(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1);

		hnae3_set_field(*type_cs_vlan_tso,

				HNS3_TXD_L4T_M,

				HNS3_TXD_L4T_S,

		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1);

		hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4T_S,

			       HNS3_L4T_SCTP);

		break;

	default:
@@ -940,11 +949,8 @@ static int hns3_set_l3l4_type_csum(struct sk_buff *skb, u8 ol4_proto, 
static void hns3_set_txbd_baseinfo(u16 *bdtp_fe_sc_vld_ra_ri, int frag_end)

{

	/* Config bd buffer end */

	hnae3_set_field(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_BDTYPE_M,

			HNS3_TXD_BDTYPE_S, 0);

	hnae3_set_bit(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_FE_B, !!frag_end);

	hnae3_set_bit(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_VLD_B, 1);

	hnae3_set_field(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_SC_M, HNS3_TXD_SC_S, 0);

	hns3_set_field(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_FE_B, !!frag_end);

	hns3_set_field(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_VLD_B, 1);

}



static int hns3_fill_desc_vtags(struct sk_buff *skb,
@@ -977,10 +983,10 @@ static int hns3_fill_desc_vtags(struct sk_buff *skb, 
		 * and use inner_vtag in one tag case.

		 */

		if (skb->protocol == htons(ETH_P_8021Q)) {

			hnae3_set_bit(*out_vlan_flag, HNS3_TXD_OVLAN_B, 1);

			hns3_set_field(*out_vlan_flag, HNS3_TXD_OVLAN_B, 1);

			*out_vtag = vlan_tag;

		} else {

			hnae3_set_bit(*inner_vlan_flag, HNS3_TXD_VLAN_B, 1);

			hns3_set_field(*inner_vlan_flag, HNS3_TXD_VLAN_B, 1);

			*inner_vtag = vlan_tag;

		}

	} else if (skb->protocol == htons(ETH_P_8021Q)) {
@@ -988,7 +994,7 @@ static int hns3_fill_desc_vtags(struct sk_buff *skb, 
		int rc;



		rc = skb_cow_head(skb, 0);

		if (rc < 0)

		if (unlikely(rc < 0))

			return rc;

		vhdr = (struct vlan_ethhdr *)skb->data;

		vhdr->h_vlan_TCI |= cpu_to_be16((skb->priority & 0x7)
@@ -1005,27 +1011,22 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv, 
	struct hns3_desc_cb *desc_cb = &ring->desc_cb[ring->next_to_use];

	struct hns3_desc *desc = &ring->desc[ring->next_to_use];

	struct device *dev = ring_to_dev(ring);

	u32 ol_type_vlan_len_msec = 0;

	u16 bdtp_fe_sc_vld_ra_ri = 0;

	struct skb_frag_struct *frag;

	unsigned int frag_buf_num;

	int k, sizeoflast;

	dma_addr_t dma;



	if (type == DESC_TYPE_SKB) {

		struct sk_buff *skb = (struct sk_buff *)priv;

		u32 ol_type_vlan_len_msec = 0;

		u32 type_cs_vlan_tso = 0;

	struct sk_buff *skb;

		u32 paylen = skb->len;

		u16 inner_vtag = 0;

		u16 out_vtag = 0;

	unsigned int k;

	int sizeoflast;

	u32 paylen = 0;

	dma_addr_t dma;

		u16 mss = 0;

	u8 ol4_proto;

	u8 il4_proto;

		int ret;



	if (type == DESC_TYPE_SKB) {

		skb = (struct sk_buff *)priv;

		paylen = skb->len;



		ret = hns3_fill_desc_vtags(skb, ring, &type_cs_vlan_tso,

					   &ol_type_vlan_len_msec,

					   &inner_vtag, &out_vtag);
@@ -1033,10 +1034,12 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv, 
			return ret;



		if (skb->ip_summed == CHECKSUM_PARTIAL) {

			u8 ol4_proto, il4_proto;



			skb_reset_mac_len(skb);



			ret = hns3_get_l4_protocol(skb, &ol4_proto, &il4_proto);

			if (ret)

			if (unlikely(ret))

				return ret;

			hns3_set_l2l3l4_len(skb, ol4_proto, il4_proto,

					    &type_cs_vlan_tso,
@@ -1044,12 +1047,12 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv, 
			ret = hns3_set_l3l4_type_csum(skb, ol4_proto, il4_proto,

						      &type_cs_vlan_tso,

						      &ol_type_vlan_len_msec);

			if (ret)

			if (unlikely(ret))

				return ret;



			ret = hns3_set_tso(skb, &paylen, &mss,

					   &type_cs_vlan_tso);

			if (ret)

			if (unlikely(ret))

				return ret;

		}
@@ -1069,15 +1072,15 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv, 
		dma = skb_frag_dma_map(dev, frag, 0, size, DMA_TO_DEVICE);

	}



	if (dma_mapping_error(ring->dev, dma)) {

	if (unlikely(dma_mapping_error(ring->dev, dma))) {

		ring->stats.sw_err_cnt++;

		return -ENOMEM;

	}



	desc_cb->length = size;



	frag_buf_num = (size + HNS3_MAX_BD_SIZE - 1) / HNS3_MAX_BD_SIZE;

	sizeoflast = size % HNS3_MAX_BD_SIZE;

	frag_buf_num = (size + HNS3_MAX_BD_SIZE - 1) >> HNS3_MAX_BD_SIZE_OFFSET;

	sizeoflast = size & HNS3_TX_LAST_SIZE_M;

	sizeoflast = sizeoflast ? sizeoflast : HNS3_MAX_BD_SIZE;



	/* When frag size is bigger than hardware limit, split this frag */
@@ -1121,22 +1124,23 @@ static int hns3_nic_maybe_stop_tso(struct sk_buff **out_skb, int *bnum, 
	int i;



	size = skb_headlen(skb);

	buf_num = (size + HNS3_MAX_BD_SIZE - 1) / HNS3_MAX_BD_SIZE;

	buf_num = (size + HNS3_MAX_BD_SIZE - 1) >> HNS3_MAX_BD_SIZE_OFFSET;



	frag_num = skb_shinfo(skb)->nr_frags;

	for (i = 0; i < frag_num; i++) {

		frag = &skb_shinfo(skb)->frags[i];

		size = skb_frag_size(frag);

		bdnum_for_frag =

			(size + HNS3_MAX_BD_SIZE - 1) / HNS3_MAX_BD_SIZE;

		if (bdnum_for_frag > HNS3_MAX_BD_PER_FRAG)

		bdnum_for_frag = (size + HNS3_MAX_BD_SIZE - 1) >>

				 HNS3_MAX_BD_SIZE_OFFSET;

		if (unlikely(bdnum_for_frag > HNS3_MAX_BD_PER_FRAG))

			return -ENOMEM;



		buf_num += bdnum_for_frag;

	}



	if (unlikely(buf_num > HNS3_MAX_BD_PER_FRAG)) {

		buf_num = (skb->len + HNS3_MAX_BD_SIZE - 1) / HNS3_MAX_BD_SIZE;

		buf_num = (skb->len + HNS3_MAX_BD_SIZE - 1) >>

			  HNS3_MAX_BD_SIZE_OFFSET;

		if (ring_space(ring) < buf_num)

			return -EBUSY;

		/* manual split the send packet */
@@ -1257,9 +1261,9 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev) 


	next_to_use_head = ring->next_to_use;



	ret = priv->ops.fill_desc(ring, skb, size, seg_num == 1 ? 1 : 0,

	ret = hns3_fill_desc(ring, skb, size, seg_num == 1 ? 1 : 0,

			     DESC_TYPE_SKB);

	if (ret)

	if (unlikely(ret))

		goto head_fill_err;



	next_to_use_frag = ring->next_to_use;
@@ -1268,11 +1272,11 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev) 
		frag = &skb_shinfo(skb)->frags[i - 1];

		size = skb_frag_size(frag);



		ret = priv->ops.fill_desc(ring, frag, size,

		ret = hns3_fill_desc(ring, frag, size,

				     seg_num - 1 == i ? 1 : 0,

				     DESC_TYPE_PAGE);



		if (ret)

		if (unlikely(ret))

			goto frag_fill_err;

	}
@@ -2314,13 +2318,12 @@ static void hns3_rx_checksum(struct hns3_enet_ring *ring, struct sk_buff *skb, 
	}



	/* check if hardware has done checksum */

	if (!hnae3_get_bit(bd_base_info, HNS3_RXD_L3L4P_B))

	if (!(bd_base_info & BIT(HNS3_RXD_L3L4P_B)))

		return;



	if (unlikely(hnae3_get_bit(l234info, HNS3_RXD_L3E_B) ||

		     hnae3_get_bit(l234info, HNS3_RXD_L4E_B) ||

		     hnae3_get_bit(l234info, HNS3_RXD_OL3E_B) ||

		     hnae3_get_bit(l234info, HNS3_RXD_OL4E_B))) {

	if (unlikely(l234info & (BIT(HNS3_RXD_L3E_B) | BIT(HNS3_RXD_L4E_B) ||

				 BIT(HNS3_RXD_OL3E_B) ||

				 BIT(HNS3_RXD_OL4E_B)))) {

		u64_stats_update_begin(&ring->syncp);

		ring->stats.l3l4_csum_err++;

		u64_stats_update_end(&ring->syncp);
@@ -2328,11 +2331,6 @@ static void hns3_rx_checksum(struct hns3_enet_ring *ring, struct sk_buff *skb, 
		return;

	}



	l3_type = hnae3_get_field(l234info, HNS3_RXD_L3ID_M,

				  HNS3_RXD_L3ID_S);

	l4_type = hnae3_get_field(l234info, HNS3_RXD_L4ID_M,

				  HNS3_RXD_L4ID_S);



	ol4_type = hnae3_get_field(l234info, HNS3_RXD_OL4ID_M,

				   HNS3_RXD_OL4ID_S);

	switch (ol4_type) {
@@ -2341,6 +2339,11 @@ static void hns3_rx_checksum(struct hns3_enet_ring *ring, struct sk_buff *skb, 
		skb->csum_level = 1;

		/* fall through */

	case HNS3_OL4_TYPE_NO_TUN:

		l3_type = hnae3_get_field(l234info, HNS3_RXD_L3ID_M,

					  HNS3_RXD_L3ID_S);

		l4_type = hnae3_get_field(l234info, HNS3_RXD_L4ID_M,

					  HNS3_RXD_L4ID_S);



		/* Can checksum ipv4 or ipv6 + UDP/TCP/SCTP packets */

		if ((l3_type == HNS3_L3_TYPE_IPV4 ||

		     l3_type == HNS3_L3_TYPE_IPV6) &&
@@ -2465,11 +2468,11 @@ static int hns3_add_frag(struct hns3_enet_ring *ring, struct hns3_desc *desc, 
		bd_base_info = le32_to_cpu(desc->rx.bd_base_info);

	}



	while (!hnae3_get_bit(bd_base_info, HNS3_RXD_FE_B)) {

	while (!(bd_base_info & BIT(HNS3_RXD_FE_B))) {

		desc = &ring->desc[ring->next_to_clean];

		desc_cb = &ring->desc_cb[ring->next_to_clean];

		bd_base_info = le32_to_cpu(desc->rx.bd_base_info);

		if (!hnae3_get_bit(bd_base_info, HNS3_RXD_VLD_B))

		if (!(bd_base_info & BIT(HNS3_RXD_VLD_B)))

			return -ENXIO;



		if (unlikely(ring->frag_num >= MAX_SKB_FRAGS)) {
@@ -2583,7 +2586,7 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring, 
	bd_base_info = le32_to_cpu(desc->rx.bd_base_info);



	/* Check valid BD */

	if (unlikely(!hnae3_get_bit(bd_base_info, HNS3_RXD_VLD_B)))

	if (unlikely(!(bd_base_info & BIT(HNS3_RXD_VLD_B))))

		return -ENXIO;



	if (!skb)
@@ -2646,7 +2649,7 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring, 
					       vlan_tag);

	}



	if (unlikely(!hnae3_get_bit(bd_base_info, HNS3_RXD_VLD_B))) {

	if (unlikely(!(bd_base_info & BIT(HNS3_RXD_VLD_B)))) {

		u64_stats_update_begin(&ring->syncp);

		ring->stats.non_vld_descs++;

		u64_stats_update_end(&ring->syncp);
@@ -2656,8 +2659,12 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring, 
	}



	if (unlikely((!desc->rx.pkt_len) ||

		     hnae3_get_bit(l234info, HNS3_RXD_TRUNCAT_B))) {

		     (l234info & (BIT(HNS3_RXD_TRUNCAT_B) |

				  BIT(HNS3_RXD_L2E_B))))) {

		u64_stats_update_begin(&ring->syncp);

		if (l234info & BIT(HNS3_RXD_L2E_B))

			ring->stats.l2_err++;

		else

			ring->stats.err_pkt_len++;

		u64_stats_update_end(&ring->syncp);
@@ -2665,14 +2672,6 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring, 
		return -EFAULT;

	}



	if (unlikely(hnae3_get_bit(l234info, HNS3_RXD_L2E_B))) {

		u64_stats_update_begin(&ring->syncp);

		ring->stats.l2_err++;

		u64_stats_update_end(&ring->syncp);



		dev_kfree_skb_any(skb);

		return -EFAULT;

	}



	l2_frame_type = hnae3_get_field(l234info, HNS3_RXD_DMAC_M,

					HNS3_RXD_DMAC_S);
@@ -3232,19 +3231,21 @@ static int hns3_ring_get_cfg(struct hnae3_queue *q, struct hns3_nic_priv *priv, 
{

	struct hns3_nic_ring_data *ring_data = priv->ring_data;

	int queue_num = priv->ae_handle->kinfo.num_tqps;

	int desc_num = priv->ae_handle->kinfo.num_desc;

	struct pci_dev *pdev = priv->ae_handle->pdev;

	struct hns3_enet_ring *ring;

	int desc_num;



	ring = devm_kzalloc(&pdev->dev, sizeof(*ring), GFP_KERNEL);

	if (!ring)

		return -ENOMEM;



	if (ring_type == HNAE3_RING_TYPE_TX) {

		desc_num = priv->ae_handle->kinfo.num_tx_desc;

		ring_data[q->tqp_index].ring = ring;

		ring_data[q->tqp_index].queue_index = q->tqp_index;

		ring->io_base = (u8 __iomem *)q->io_base + HNS3_TX_REG_OFFSET;

	} else {

		desc_num = priv->ae_handle->kinfo.num_rx_desc;

		ring_data[q->tqp_index + queue_num].ring = ring;

		ring_data[q->tqp_index + queue_num].queue_index = q->tqp_index;

		ring->io_base = q->io_base;
@@ -3557,7 +3558,6 @@ static void hns3_nic_set_priv_ops(struct net_device *netdev) 
{

	struct hns3_nic_priv *priv = netdev_priv(netdev);



	priv->ops.fill_desc = hns3_fill_desc;

	if ((netdev->features & NETIF_F_TSO) ||

	    (netdev->features & NETIF_F_TSO6))

		priv->ops.maybe_stop_tx = hns3_nic_maybe_stop_tso;
@@ -3656,7 +3656,7 @@ static int hns3_client_init(struct hnae3_handle *handle) 
	ret = hns3_client_start(handle);

	if (ret) {

		dev_err(priv->dev, "hns3_client_start fail! ret=%d\n", ret);

			goto out_reg_netdev_fail;

			goto out_client_start;

	}



	hns3_dcbnl_setup(handle);
@@ -3670,6 +3670,8 @@ static int hns3_client_init(struct hnae3_handle *handle) 


	return ret;



out_client_start:

	unregister_netdev(netdev);

out_reg_netdev_fail:

	hns3_uninit_phy(netdev);

out_init_phy:

drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

+4 −4
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ enum hns3_nic_state { 
#define HNS3_RING_NAME_LEN			16

#define HNS3_BUFFER_SIZE_2048			2048

#define HNS3_RING_MAX_PENDING			32768

#define HNS3_RING_MIN_PENDING			8

#define HNS3_RING_MIN_PENDING			24

#define HNS3_RING_BD_MULTIPLE			8

/* max frame size of mac */

#define HNS3_MAC_MAX_FRAME			9728
@@ -184,6 +184,8 @@ enum hns3_nic_state { 
#define HNS3_TXD_MSS_S				0

#define HNS3_TXD_MSS_M				(0x3fff << HNS3_TXD_MSS_S)



#define HNS3_TX_LAST_SIZE_M                    0xffff



#define HNS3_VECTOR_TX_IRQ			BIT_ULL(0)

#define HNS3_VECTOR_RX_IRQ			BIT_ULL(1)
@@ -191,6 +193,7 @@ enum hns3_nic_state { 
#define HNS3_VECTOR_INITED			1



#define HNS3_MAX_BD_SIZE			65535

#define HNS3_MAX_BD_SIZE_OFFSET		16

#define HNS3_MAX_BD_PER_FRAG			8

#define HNS3_MAX_BD_PER_PKT			MAX_SKB_FRAGS
@@ -441,11 +444,8 @@ struct hns3_nic_ring_data { 
};



struct hns3_nic_ops {

	int (*fill_desc)(struct hns3_enet_ring *ring, void *priv,

			 int size, int frag_end, enum hns_desc_type type);

	int (*maybe_stop_tx)(struct sk_buff **out_skb,

			     int *bnum, struct hns3_enet_ring *ring);

	void (*get_rxd_bnum)(u32 bnum_flag, int *out_bnum);

};



enum hns3_flow_level_range {

drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

+29 −25
Original line number Diff line number Diff line
@@ -748,15 +748,19 @@ static int hns3_get_rxnfc(struct net_device *netdev, 
}



static int hns3_change_all_ring_bd_num(struct hns3_nic_priv *priv,

				       u32 new_desc_num)

				       u32 tx_desc_num, u32 rx_desc_num)

{

	struct hnae3_handle *h = priv->ae_handle;

	int i;



	h->kinfo.num_desc = new_desc_num;

	h->kinfo.num_tx_desc = tx_desc_num;

	h->kinfo.num_rx_desc = rx_desc_num;



	for (i = 0; i < h->kinfo.num_tqps * 2; i++)

		priv->ring_data[i].ring->desc_num = new_desc_num;

	for (i = 0; i < h->kinfo.num_tqps; i++) {

		priv->ring_data[i].ring->desc_num = tx_desc_num;

		priv->ring_data[i + h->kinfo.num_tqps].ring->desc_num =

			rx_desc_num;

	}



	return hns3_init_all_ring(priv);

}
@@ -767,7 +771,9 @@ static int hns3_set_ringparam(struct net_device *ndev, 
	struct hns3_nic_priv *priv = netdev_priv(ndev);

	struct hnae3_handle *h = priv->ae_handle;

	bool if_running = netif_running(ndev);

	u32 old_desc_num, new_desc_num;

	u32 old_tx_desc_num, new_tx_desc_num;

	u32 old_rx_desc_num, new_rx_desc_num;

	int queue_num = h->kinfo.num_tqps;

	int ret;



	if (hns3_nic_resetting(ndev))
@@ -776,32 +782,28 @@ static int hns3_set_ringparam(struct net_device *ndev, 
	if (param->rx_mini_pending || param->rx_jumbo_pending)

		return -EINVAL;



	if (param->tx_pending != param->rx_pending) {

		netdev_err(ndev,

			   "Descriptors of tx and rx must be equal");

		return -EINVAL;

	}



	if (param->tx_pending > HNS3_RING_MAX_PENDING ||

	    param->tx_pending < HNS3_RING_MIN_PENDING) {

		netdev_err(ndev,

			   "Descriptors requested (Tx/Rx: %d) out of range [%d-%d]\n",

			   param->tx_pending, HNS3_RING_MIN_PENDING,

			   HNS3_RING_MAX_PENDING);

	    param->tx_pending < HNS3_RING_MIN_PENDING ||

	    param->rx_pending > HNS3_RING_MAX_PENDING ||

	    param->rx_pending < HNS3_RING_MIN_PENDING) {

		netdev_err(ndev, "Queue depth out of range [%d-%d]\n",

			   HNS3_RING_MIN_PENDING, HNS3_RING_MAX_PENDING);

		return -EINVAL;

	}



	new_desc_num = param->tx_pending;



	/* Hardware requires that its descriptors must be multiple of eight */

	new_desc_num = ALIGN(new_desc_num, HNS3_RING_BD_MULTIPLE);

	old_desc_num = h->kinfo.num_desc;

	if (old_desc_num == new_desc_num)

	new_tx_desc_num = ALIGN(param->tx_pending, HNS3_RING_BD_MULTIPLE);

	new_rx_desc_num = ALIGN(param->rx_pending, HNS3_RING_BD_MULTIPLE);

	old_tx_desc_num = priv->ring_data[0].ring->desc_num;

	old_rx_desc_num = priv->ring_data[queue_num].ring->desc_num;

	if (old_tx_desc_num == new_tx_desc_num &&

	    old_rx_desc_num == new_rx_desc_num)

		return 0;



	netdev_info(ndev,

		    "Changing descriptor count from %d to %d.\n",

		    old_desc_num, new_desc_num);

		    "Changing Tx/Rx ring depth from %d/%d to %d/%d\n",

		    old_tx_desc_num, old_rx_desc_num,

		    new_tx_desc_num, new_rx_desc_num);



	if (if_running)

		ndev->netdev_ops->ndo_stop(ndev);
@@ -810,9 +812,11 @@ static int hns3_set_ringparam(struct net_device *ndev, 
	if (ret)

		return ret;



	ret = hns3_change_all_ring_bd_num(priv, new_desc_num);

	ret = hns3_change_all_ring_bd_num(priv, new_tx_desc_num,

					  new_rx_desc_num);

	if (ret) {

		ret = hns3_change_all_ring_bd_num(priv, old_desc_num);

		ret = hns3_change_all_ring_bd_num(priv, old_tx_desc_num,

						  old_rx_desc_num);

		if (ret) {

			netdev_err(ndev,

				   "Revert to old bd num fail, ret=%d.\n", ret);

CRA Git | Maintained and supported by SUSTech CRA and CCSE