Unverified Commit 94b41cc2 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3215 net: hns: fix fake link up on xge port and fix wrong head when modify... 

!3215 net: hns: fix fake link up on xge port and fix wrong head when modify the tx feature when sending packets

Merge Pull Request from: @svishen 
 
This pr fix fake link up on xge port and fix wrong head when modify the tx feature when sending packets

(1)net: hns: fix wrong head when modify the tx feature when sending packets
When modify the tx feature, the hns driver will modify the maybe_stop_tx() and fill_desc() functions, if the modify happens during packet sending, will cause the hardware and software pointers do not match, and the port can not work anymore.
This patch deletes the maybe_stop_tx() and fill_desc() functions modification when setting tx feature, and use the skb_is_gro() to determine use tso functions or non-tso functions when packets sending.

(2)net: hns: fix fake link up on xge port
If a xge port just connect with an optical module and no fiber, it may have a fake link up because there may be interference on the hardware. This patch adds an anti-shake to avoid the problem. And the time of anti-shake is base on tests.

issue:
https://gitee.com/openeuler/kernel/issues/I7OSIE
https://gitee.com/openeuler/kernel/issues/I8K7Q8 
 
Link:https://gitee.com/openeuler/kernel/pulls/3215

 

Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 481c5185 736c28a6

drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c

+29 −0
Original line number Diff line number Diff line
@@ -66,6 +66,27 @@ static enum mac_mode hns_get_enet_interface(const struct hns_mac_cb *mac_cb) 
	}

}



static u32 hns_mac_link_anti_shake(struct mac_driver *mac_ctrl_drv)

{

#define HNS_MAC_LINK_WAIT_TIME 5

#define HNS_MAC_LINK_WAIT_CNT 40



	u32 link_status = 0;

	int i;



	if (!mac_ctrl_drv->get_link_status)

		return link_status;



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

		msleep(HNS_MAC_LINK_WAIT_TIME);

		mac_ctrl_drv->get_link_status(mac_ctrl_drv, &link_status);

		if (!link_status)

			break;

	}



	return link_status;

}



void hns_mac_get_link_status(struct hns_mac_cb *mac_cb, u32 *link_status)

{

	struct mac_driver *mac_ctrl_drv;
@@ -83,6 +104,14 @@ void hns_mac_get_link_status(struct hns_mac_cb *mac_cb, u32 *link_status) 
							       &sfp_prsnt);

		if (!ret)

			*link_status = *link_status && sfp_prsnt;



		/* for FIBER port, it may have a fake link up.

		 * when the link status changes from down to up, we need to do

		 * anti-shake. the anti-shake time is base on tests.

		 * only FIBER port need to do this.

		 */

		if (*link_status && !mac_cb->link)

			*link_status = hns_mac_link_anti_shake(mac_ctrl_drv);

	}



	mac_cb->link = *link_status;

drivers/net/ethernet/hisilicon/hns/hns_enet.c

+31 −22
Original line number Diff line number Diff line
@@ -144,7 +144,8 @@ MODULE_DEVICE_TABLE(acpi, hns_enet_acpi_match); 


static void fill_desc(struct hnae_ring *ring, void *priv,

		      int size, dma_addr_t dma, int frag_end,

		      int buf_num, enum hns_desc_type type, int mtu)

		      int buf_num, enum hns_desc_type type, int mtu,

		      bool is_gso)

{

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

	struct hnae_desc_cb *desc_cb = &ring->desc_cb[ring->next_to_use];
@@ -277,6 +278,15 @@ static int hns_nic_maybe_stop_tso( 
	return 0;

}



static int hns_nic_maybe_stop_tx_v2(struct sk_buff **out_skb, int *bnum,

				    struct hnae_ring *ring)

{

	if (skb_is_gso(*out_skb))

		return hns_nic_maybe_stop_tso(out_skb, bnum, ring);

	else

		return hns_nic_maybe_stop_tx(out_skb, bnum, ring);

}



static void fill_tso_desc(struct hnae_ring *ring, void *priv,

			  int size, dma_addr_t dma, int frag_end,

			  int buf_num, enum hns_desc_type type, int mtu)
@@ -302,6 +312,19 @@ static void fill_tso_desc(struct hnae_ring *ring, void *priv, 
				mtu);

}



static void fill_desc_v2(struct hnae_ring *ring, void *priv,

			 int size, dma_addr_t dma, int frag_end,

			 int buf_num, enum hns_desc_type type, int mtu,

			 bool is_gso)

{

	if (is_gso)

		fill_tso_desc(ring, priv, size, dma, frag_end, buf_num, type,

			      mtu);

	else

		fill_v2_desc(ring, priv, size, dma, frag_end, buf_num, type,

			     mtu);

}



netdev_tx_t hns_nic_net_xmit_hw(struct net_device *ndev,

				struct sk_buff *skb,

				struct hns_nic_ring_data *ring_data)
@@ -315,6 +338,7 @@ netdev_tx_t hns_nic_net_xmit_hw(struct net_device *ndev, 
	int seg_num;

	dma_addr_t dma;

	int size, next_to_use;

	bool is_gso;

	int i;



	switch (priv->ops.maybe_stop_tx(&skb, &buf_num, ring)) {
@@ -341,8 +365,9 @@ netdev_tx_t hns_nic_net_xmit_hw(struct net_device *ndev, 
		ring->stats.sw_err_cnt++;

		goto out_err_tx_ok;

	}

	is_gso = skb_is_gso(skb);

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

			    buf_num, DESC_TYPE_SKB, ndev->mtu);

			    buf_num, DESC_TYPE_SKB, ndev->mtu, is_gso);



	/* fill the fragments */

	for (i = 1; i < seg_num; i++) {
@@ -356,7 +381,7 @@ netdev_tx_t hns_nic_net_xmit_hw(struct net_device *ndev, 
		}

		priv->ops.fill_desc(ring, skb_frag_page(frag), size, dma,

				    seg_num - 1 == i ? 1 : 0, buf_num,

				    DESC_TYPE_PAGE, ndev->mtu);

				    DESC_TYPE_PAGE, ndev->mtu, is_gso);

	}



	/*complete translate all packets*/
@@ -1778,15 +1803,6 @@ static int hns_nic_set_features(struct net_device *netdev, 
			netdev_info(netdev, "enet v1 do not support tso!\n");

		break;

	default:

		if (features & (NETIF_F_TSO | NETIF_F_TSO6)) {

			priv->ops.fill_desc = fill_tso_desc;

			priv->ops.maybe_stop_tx = hns_nic_maybe_stop_tso;

			/* The chip only support 7*4096 */

			netif_set_gso_max_size(netdev, 7 * 4096);

		} else {

			priv->ops.fill_desc = fill_v2_desc;

			priv->ops.maybe_stop_tx = hns_nic_maybe_stop_tx;

		}

		break;

	}

	netdev->features = features;
@@ -2163,16 +2179,9 @@ static void hns_nic_set_priv_ops(struct net_device *netdev) 
		priv->ops.maybe_stop_tx = hns_nic_maybe_stop_tx;

	} else {

		priv->ops.get_rxd_bnum = get_v2rx_desc_bnum;

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

		    (netdev->features & NETIF_F_TSO6)) {

			priv->ops.fill_desc = fill_tso_desc;

			priv->ops.maybe_stop_tx = hns_nic_maybe_stop_tso;

			/* This chip only support 7*4096 */

		priv->ops.fill_desc = fill_desc_v2;

		priv->ops.maybe_stop_tx = hns_nic_maybe_stop_tx_v2;

		netif_set_gso_max_size(netdev, 7 * 4096);

		} else {

			priv->ops.fill_desc = fill_v2_desc;

			priv->ops.maybe_stop_tx = hns_nic_maybe_stop_tx;

		}

		/* enable tso when init

		 * control tso on/off through TSE bit in bd

		 */

drivers/net/ethernet/hisilicon/hns/hns_enet.h

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ struct hns_nic_ring_data { 
struct hns_nic_ops {

	void (*fill_desc)(struct hnae_ring *ring, void *priv,

			  int size, dma_addr_t dma, int frag_end,

			  int buf_num, enum hns_desc_type type, int mtu);

			  int buf_num, enum hns_desc_type type, int mtu,

			  bool is_gso);

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

			     int *bnum, struct hnae_ring *ring);

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