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

Merge branch 'hns3-next' 



Salil Mehta says:

====================
Cleanups, minor additions & fixes for HNS3 driver

This patch-set contains cleans-ups, minor changes and fixes to the HNS3 driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d2f1e81a e4fd7502

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

+9 −7
Original line number Diff line number Diff line
@@ -84,10 +84,11 @@ struct hnae3_queue { 


/*hnae3 loop mode*/

enum hnae3_loop {

	HNAE3_MAC_INTER_LOOP_MAC,

	HNAE3_MAC_INTER_LOOP_SERDES,

	HNAE3_MAC_INTER_LOOP_PHY,

	HNAE3_MAC_LOOP_NONE,

	HNAE3_LOOP_APP,

	HNAE3_LOOP_SERIAL_SERDES,

	HNAE3_LOOP_PARALLEL_SERDES,

	HNAE3_LOOP_PHY,

	HNAE3_LOOP_NONE,

};



enum hnae3_client_type {
@@ -402,7 +403,7 @@ struct hnae3_ae_ops { 
	void (*get_channels)(struct hnae3_handle *handle,

			     struct ethtool_channels *ch);

	void (*get_tqps_and_rss_info)(struct hnae3_handle *h,

				      u16 *free_tqps, u16 *max_rss_size);

				      u16 *alloc_tqps, u16 *max_rss_size);

	int (*set_channels)(struct hnae3_handle *handle, u32 new_tqps_num);

	void (*get_flowctrl_adv)(struct hnae3_handle *handle,

				 u32 *flowctrl_adv);
@@ -478,10 +479,11 @@ struct hnae3_unic_private_info { 
	struct hnae3_queue **tqp;  /* array base of all TQPs of this instance */

};



#define HNAE3_SUPPORT_MAC_LOOPBACK    BIT(0)

#define HNAE3_SUPPORT_APP_LOOPBACK    BIT(0)

#define HNAE3_SUPPORT_PHY_LOOPBACK    BIT(1)

#define HNAE3_SUPPORT_SERDES_LOOPBACK BIT(2)

#define HNAE3_SUPPORT_SERDES_SERIAL_LOOPBACK	BIT(2)

#define HNAE3_SUPPORT_VF	      BIT(3)

#define HNAE3_SUPPORT_SERDES_PARALLEL_LOOPBACK	BIT(4)



struct hnae3_handle {

	struct hnae3_client *client;

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

+49 −52
Original line number Diff line number Diff line
@@ -225,8 +225,6 @@ void hns3_set_vector_coalesce_tx_gl(struct hns3_enet_tqp_vector *tqp_vector, 
static void hns3_vector_gl_rl_init(struct hns3_enet_tqp_vector *tqp_vector,

				   struct hns3_nic_priv *priv)

{

	struct hnae3_handle *h = priv->ae_handle;



	/* initialize the configuration for interrupt coalescing.

	 * 1. GL (Interrupt Gap Limiter)

	 * 2. RL (Interrupt Rate Limiter)
@@ -239,9 +237,6 @@ static void hns3_vector_gl_rl_init(struct hns3_enet_tqp_vector *tqp_vector, 
	tqp_vector->tx_group.coal.int_gl = HNS3_INT_GL_50K;

	tqp_vector->rx_group.coal.int_gl = HNS3_INT_GL_50K;



	/* Default: disable RL */

	h->kinfo.int_rl_setting = 0;



	tqp_vector->int_adapt_down = HNS3_INT_ADAPT_DOWN_START;

	tqp_vector->rx_group.coal.flow_level = HNS3_FLOW_LOW;

	tqp_vector->tx_group.coal.flow_level = HNS3_FLOW_LOW;
@@ -307,12 +302,12 @@ static int hns3_nic_set_real_num_queue(struct net_device *netdev) 


static u16 hns3_get_max_available_channels(struct hnae3_handle *h)

{

	u16 free_tqps, max_rss_size, max_tqps;

	u16 alloc_tqps, max_rss_size, rss_size;



	h->ae_algo->ops->get_tqps_and_rss_info(h, &free_tqps, &max_rss_size);

	max_tqps = h->kinfo.num_tc * max_rss_size;

	h->ae_algo->ops->get_tqps_and_rss_info(h, &alloc_tqps, &max_rss_size);

	rss_size = alloc_tqps / h->kinfo.num_tc;



	return min_t(u16, max_tqps, (free_tqps + h->kinfo.num_tqps));

	return min_t(u16, rss_size, max_rss_size);

}



static int hns3_nic_net_up(struct net_device *netdev)
@@ -1491,12 +1486,10 @@ static int hns3_nic_change_mtu(struct net_device *netdev, int new_mtu) 
	}



	ret = h->ae_algo->ops->set_mtu(h, new_mtu);

	if (ret) {

	if (ret)

		netdev_err(netdev, "failed to change MTU in hardware %d\n",

			   ret);

		return ret;

	}



	else

		netdev->mtu = new_mtu;



	/* if the netdev was running earlier, bring it up again */
@@ -1740,7 +1733,7 @@ static void hns3_set_default_feature(struct net_device *netdev) 
		NETIF_F_RXCSUM | NETIF_F_SG | NETIF_F_GSO |

		NETIF_F_GRO | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_GSO_GRE |

		NETIF_F_GSO_GRE_CSUM | NETIF_F_GSO_UDP_TUNNEL |

		NETIF_F_GSO_UDP_TUNNEL_CSUM;

		NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_SCTP_CRC;



	netdev->hw_enc_features |= NETIF_F_TSO_MANGLEID;
@@ -1752,21 +1745,21 @@ static void hns3_set_default_feature(struct net_device *netdev) 
		NETIF_F_RXCSUM | NETIF_F_SG | NETIF_F_GSO |

		NETIF_F_GRO | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_GSO_GRE |

		NETIF_F_GSO_GRE_CSUM | NETIF_F_GSO_UDP_TUNNEL |

		NETIF_F_GSO_UDP_TUNNEL_CSUM;

		NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_SCTP_CRC;



	netdev->vlan_features |=

		NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |

		NETIF_F_SG | NETIF_F_GSO | NETIF_F_GRO |

		NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_GSO_GRE |

		NETIF_F_GSO_GRE_CSUM | NETIF_F_GSO_UDP_TUNNEL |

		NETIF_F_GSO_UDP_TUNNEL_CSUM;

		NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_SCTP_CRC;



	netdev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |

		NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |

		NETIF_F_RXCSUM | NETIF_F_SG | NETIF_F_GSO |

		NETIF_F_GRO | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_GSO_GRE |

		NETIF_F_GSO_GRE_CSUM | NETIF_F_GSO_UDP_TUNNEL |

		NETIF_F_GSO_UDP_TUNNEL_CSUM;

		NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_SCTP_CRC;



	if (pdev->revision != 0x20)

		netdev->hw_features |= NETIF_F_HW_VLAN_CTAG_FILTER;
@@ -3166,12 +3159,14 @@ static void hns3_nic_set_priv_ops(struct net_device *netdev) 
static int hns3_client_init(struct hnae3_handle *handle)

{

	struct pci_dev *pdev = handle->pdev;

	u16 alloc_tqps, max_rss_size;

	struct hns3_nic_priv *priv;

	struct net_device *netdev;

	int ret;



	netdev = alloc_etherdev_mq(sizeof(struct hns3_nic_priv),

				   hns3_get_max_available_channels(handle));

	handle->ae_algo->ops->get_tqps_and_rss_info(handle, &alloc_tqps,

						    &max_rss_size);

	netdev = alloc_etherdev_mq(sizeof(struct hns3_nic_priv), alloc_tqps);

	if (!netdev)

		return -ENOMEM;
@@ -3490,6 +3485,31 @@ int hns3_nic_reset_all_ring(struct hnae3_handle *h) 
	return 0;

}



static void hns3_store_coal(struct hns3_nic_priv *priv)

{

	/* ethtool only support setting and querying one coal

	 * configuation for now, so save the vector 0' coal

	 * configuation here in order to restore it.

	 */

	memcpy(&priv->tx_coal, &priv->tqp_vector[0].tx_group.coal,

	       sizeof(struct hns3_enet_coalesce));

	memcpy(&priv->rx_coal, &priv->tqp_vector[0].rx_group.coal,

	       sizeof(struct hns3_enet_coalesce));

}



static void hns3_restore_coal(struct hns3_nic_priv *priv)

{

	u16 vector_num = priv->vector_num;

	int i;



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

		memcpy(&priv->tqp_vector[i].tx_group.coal, &priv->tx_coal,

		       sizeof(struct hns3_enet_coalesce));

		memcpy(&priv->tqp_vector[i].rx_group.coal, &priv->rx_coal,

		       sizeof(struct hns3_enet_coalesce));

	}

}



static int hns3_reset_notify_down_enet(struct hnae3_handle *handle)

{

	struct hnae3_knic_private_info *kinfo = &handle->kinfo;
@@ -3536,6 +3556,8 @@ static int hns3_reset_notify_init_enet(struct hnae3_handle *handle) 
	/* Carrier off reporting is important to ethtool even BEFORE open */

	netif_carrier_off(netdev);



	hns3_restore_coal(priv);



	ret = hns3_nic_init_vector_data(priv);

	if (ret)

		return ret;
@@ -3563,6 +3585,8 @@ static int hns3_reset_notify_uninit_enet(struct hnae3_handle *handle) 
		return ret;

	}



	hns3_store_coal(priv);



	ret = hns3_uninit_all_ring(priv);

	if (ret)

		netdev_err(netdev, "uninit ring error\n");
@@ -3597,24 +3621,7 @@ static int hns3_reset_notify(struct hnae3_handle *handle, 
	return ret;

}



static void hns3_restore_coal(struct hns3_nic_priv *priv,

			      struct hns3_enet_coalesce *tx,

			      struct hns3_enet_coalesce *rx)

{

	u16 vector_num = priv->vector_num;

	int i;



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

		memcpy(&priv->tqp_vector[i].tx_group.coal, tx,

		       sizeof(struct hns3_enet_coalesce));

		memcpy(&priv->tqp_vector[i].rx_group.coal, rx,

		       sizeof(struct hns3_enet_coalesce));

	}

}



static int hns3_modify_tqp_num(struct net_device *netdev, u16 new_tqp_num,

			       struct hns3_enet_coalesce *tx,

			       struct hns3_enet_coalesce *rx)

static int hns3_modify_tqp_num(struct net_device *netdev, u16 new_tqp_num)

{

	struct hns3_nic_priv *priv = netdev_priv(netdev);

	struct hnae3_handle *h = hns3_get_handle(netdev);
@@ -3632,7 +3639,7 @@ static int hns3_modify_tqp_num(struct net_device *netdev, u16 new_tqp_num, 
	if (ret)

		goto err_alloc_vector;



	hns3_restore_coal(priv, tx, rx);

	hns3_restore_coal(priv);



	ret = hns3_nic_init_vector_data(priv);

	if (ret)
@@ -3664,7 +3671,6 @@ int hns3_set_channels(struct net_device *netdev, 
	struct hns3_nic_priv *priv = netdev_priv(netdev);

	struct hnae3_handle *h = hns3_get_handle(netdev);

	struct hnae3_knic_private_info *kinfo = &h->kinfo;

	struct hns3_enet_coalesce tx_coal, rx_coal;

	bool if_running = netif_running(netdev);

	u32 new_tqp_num = ch->combined_count;

	u16 org_tqp_num;
@@ -3696,15 +3702,7 @@ int hns3_set_channels(struct net_device *netdev, 
		goto open_netdev;

	}



	/* Changing the tqp num may also change the vector num,

	 * ethtool only support setting and querying one coal

	 * configuation for now, so save the vector 0' coal

	 * configuation here in order to restore it.

	 */

	memcpy(&tx_coal, &priv->tqp_vector[0].tx_group.coal,

	       sizeof(struct hns3_enet_coalesce));

	memcpy(&rx_coal, &priv->tqp_vector[0].rx_group.coal,

	       sizeof(struct hns3_enet_coalesce));

	hns3_store_coal(priv);



	hns3_nic_dealloc_vector_data(priv);
@@ -3712,10 +3710,9 @@ int hns3_set_channels(struct net_device *netdev, 
	hns3_put_ring_config(priv);



	org_tqp_num = h->kinfo.num_tqps;

	ret = hns3_modify_tqp_num(netdev, new_tqp_num, &tx_coal, &rx_coal);

	ret = hns3_modify_tqp_num(netdev, new_tqp_num);

	if (ret) {

		ret = hns3_modify_tqp_num(netdev, org_tqp_num,

					  &tx_coal, &rx_coal);

		ret = hns3_modify_tqp_num(netdev, org_tqp_num);

		if (ret) {

			/* If revert to old tqp failed, fatal error occurred */

			dev_err(&netdev->dev,

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

+2 −0
Original line number Diff line number Diff line
@@ -543,6 +543,8 @@ struct hns3_nic_priv { 
	/* Vxlan/Geneve information */

	struct hns3_udp_tunnel udp_tnl[HNS3_UDP_TNL_MAX];

	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];

	struct hns3_enet_coalesce tx_coal;

	struct hns3_enet_coalesce rx_coal;

};



union l3_hdr_info {

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

+15 −9
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static const struct hns3_stats hns3_rxq_stats[] = { 


#define HNS3_TQP_STATS_COUNT (HNS3_TXQ_STATS_COUNT + HNS3_RXQ_STATS_COUNT)



#define HNS3_SELF_TEST_TYPE_NUM		2

#define HNS3_SELF_TEST_TPYE_NUM         3

#define HNS3_NIC_LB_TEST_PKT_NUM	1

#define HNS3_NIC_LB_TEST_RING_ID	0

#define HNS3_NIC_LB_TEST_PACKET_SIZE	128
@@ -78,8 +78,9 @@ static int hns3_lp_setup(struct net_device *ndev, enum hnae3_loop loop, bool en) 
		return -EOPNOTSUPP;



	switch (loop) {

	case HNAE3_MAC_INTER_LOOP_SERDES:

	case HNAE3_MAC_INTER_LOOP_MAC:

	case HNAE3_LOOP_SERIAL_SERDES:

	case HNAE3_LOOP_PARALLEL_SERDES:

	case HNAE3_LOOP_APP:

		ret = h->ae_algo->ops->set_loopback(h, loop, en);

		break;

	default:
@@ -286,13 +287,18 @@ static void hns3_self_test(struct net_device *ndev, 
	if (eth_test->flags != ETH_TEST_FL_OFFLINE)

		return;



	st_param[HNAE3_MAC_INTER_LOOP_MAC][0] = HNAE3_MAC_INTER_LOOP_MAC;

	st_param[HNAE3_MAC_INTER_LOOP_MAC][1] =

			h->flags & HNAE3_SUPPORT_MAC_LOOPBACK;

	st_param[HNAE3_LOOP_APP][0] = HNAE3_LOOP_APP;

	st_param[HNAE3_LOOP_APP][1] =

			h->flags & HNAE3_SUPPORT_APP_LOOPBACK;



	st_param[HNAE3_MAC_INTER_LOOP_SERDES][0] = HNAE3_MAC_INTER_LOOP_SERDES;

	st_param[HNAE3_MAC_INTER_LOOP_SERDES][1] =

			h->flags & HNAE3_SUPPORT_SERDES_LOOPBACK;

	st_param[HNAE3_LOOP_SERIAL_SERDES][0] = HNAE3_LOOP_SERIAL_SERDES;

	st_param[HNAE3_LOOP_SERIAL_SERDES][1] =

			h->flags & HNAE3_SUPPORT_SERDES_SERIAL_LOOPBACK;



	st_param[HNAE3_LOOP_PARALLEL_SERDES][0] =

			HNAE3_LOOP_PARALLEL_SERDES;

	st_param[HNAE3_LOOP_PARALLEL_SERDES][1] =

			h->flags & HNAE3_SUPPORT_SERDES_PARALLEL_LOOPBACK;



	if (if_running)

		ndev->netdev_ops->ndo_stop(ndev);

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h

+1 −0
Original line number Diff line number Diff line
@@ -778,6 +778,7 @@ struct hclge_reset_cmd { 
};



#define HCLGE_CMD_SERDES_SERIAL_INNER_LOOP_B	BIT(0)

#define HCLGE_CMD_SERDES_PARALLEL_INNER_LOOP_B	BIT(2)

#define HCLGE_CMD_SERDES_DONE_B			BIT(0)

#define HCLGE_CMD_SERDES_SUCCESS_B		BIT(1)

struct hclge_serdes_lb_cmd {

CRA Git | Maintained and supported by SUSTech CRA and CCSE