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

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

Merge branch 'hns3-fixes' 



Salil Mehta says:

====================
Fixes, cleanups & minor additions to HNS3 driver

This patch-set present some fixes, cleanups to the HNS3 PF and VF driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0e0cc31f 32c7fbc8

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

+5 −7
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static bool hnae3_client_match(enum hnae3_client_type client_type, 
	return false;

}



static void hnae3_set_client_init_flag(struct hnae3_client *client,

void hnae3_set_client_init_flag(struct hnae3_client *client,

				struct hnae3_ae_dev *ae_dev, int inited)

{

	switch (client->type) {
@@ -46,6 +46,7 @@ static void hnae3_set_client_init_flag(struct hnae3_client *client, 
		break;

	}

}

EXPORT_SYMBOL(hnae3_set_client_init_flag);



static int hnae3_get_client_init_flag(struct hnae3_client *client,

				       struct hnae3_ae_dev *ae_dev)
@@ -86,14 +87,11 @@ static int hnae3_match_n_instantiate(struct hnae3_client *client, 
	/* now, (un-)instantiate client by calling lower layer */

	if (is_reg) {

		ret = ae_dev->ops->init_client_instance(client, ae_dev);

		if (ret) {

		if (ret)

			dev_err(&ae_dev->pdev->dev,

				"fail to instantiate client, ret = %d\n", ret);

			return ret;

		}



		hnae3_set_client_init_flag(client, ae_dev, 1);

		return 0;

		return ret;

	}



	if (hnae3_get_client_init_flag(client, ae_dev)) {

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

+5 −0
Original line number Diff line number Diff line
@@ -337,6 +337,8 @@ struct hnae3_ae_ops { 
	void (*get_mac_addr)(struct hnae3_handle *handle, u8 *p);

	int (*set_mac_addr)(struct hnae3_handle *handle, void *p,

			    bool is_first);

	int (*do_ioctl)(struct hnae3_handle *handle,

			struct ifreq *ifr, int cmd);

	int (*add_uc_addr)(struct hnae3_handle *handle,

			   const unsigned char *addr);

	int (*rm_uc_addr)(struct hnae3_handle *handle,
@@ -521,4 +523,7 @@ void hnae3_register_ae_algo(struct hnae3_ae_algo *ae_algo); 


void hnae3_unregister_client(struct hnae3_client *client);

int hnae3_register_client(struct hnae3_client *client);



void hnae3_set_client_init_flag(struct hnae3_client *client,

				struct hnae3_ae_dev *ae_dev, int inited);

#endif

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

+71 −12
Original line number Diff line number Diff line
@@ -66,6 +66,23 @@ static irqreturn_t hns3_irq_handle(int irq, void *vector) 
	return IRQ_HANDLED;

}



/* This callback function is used to set affinity changes to the irq affinity

 * masks when the irq_set_affinity_notifier function is used.

 */

static void hns3_nic_irq_affinity_notify(struct irq_affinity_notify *notify,

					 const cpumask_t *mask)

{

	struct hns3_enet_tqp_vector *tqp_vectors =

		container_of(notify, struct hns3_enet_tqp_vector,

			     affinity_notify);



	tqp_vectors->affinity_mask = *mask;

}



static void hns3_nic_irq_affinity_release(struct kref *ref)

{

}



static void hns3_nic_uninit_irq(struct hns3_nic_priv *priv)

{

	struct hns3_enet_tqp_vector *tqp_vectors;
@@ -77,6 +94,10 @@ static void hns3_nic_uninit_irq(struct hns3_nic_priv *priv) 
		if (tqp_vectors->irq_init_flag != HNS3_VECTOR_INITED)

			continue;



		/* clear the affinity notifier and affinity mask */

		irq_set_affinity_notifier(tqp_vectors->vector_irq, NULL);

		irq_set_affinity_hint(tqp_vectors->vector_irq, NULL);



		/* release the irq resource */

		free_irq(tqp_vectors->vector_irq, tqp_vectors);

		tqp_vectors->irq_init_flag = HNS3_VECTOR_NOT_INITED;
@@ -127,6 +148,15 @@ static int hns3_nic_init_irq(struct hns3_nic_priv *priv) 
			return ret;

		}



		tqp_vectors->affinity_notify.notify =

					hns3_nic_irq_affinity_notify;

		tqp_vectors->affinity_notify.release =

					hns3_nic_irq_affinity_release;

		irq_set_affinity_notifier(tqp_vectors->vector_irq,

					  &tqp_vectors->affinity_notify);

		irq_set_affinity_hint(tqp_vectors->vector_irq,

				      &tqp_vectors->affinity_mask);



		tqp_vectors->irq_init_flag = HNS3_VECTOR_INITED;

	}
@@ -1044,7 +1074,7 @@ static int hns3_nic_maybe_stop_tx(struct sk_buff **out_skb, int *bnum, 
	/* No. of segments (plus a header) */

	buf_num = skb_shinfo(skb)->nr_frags + 1;



	if (buf_num > ring_space(ring))

	if (unlikely(ring_space(ring) < buf_num))

		return -EBUSY;



	*bnum = buf_num;
@@ -1209,6 +1239,20 @@ static int hns3_nic_net_set_mac_address(struct net_device *netdev, void *p) 
	return 0;

}



static int hns3_nic_do_ioctl(struct net_device *netdev,

			     struct ifreq *ifr, int cmd)

{

	struct hnae3_handle *h = hns3_get_handle(netdev);



	if (!netif_running(netdev))

		return -EINVAL;



	if (!h->ae_algo->ops->do_ioctl)

		return -EOPNOTSUPP;



	return h->ae_algo->ops->do_ioctl(h, ifr, cmd);

}



static int hns3_nic_set_features(struct net_device *netdev,

				 netdev_features_t features)

{
@@ -1535,6 +1579,7 @@ static const struct net_device_ops hns3_nic_netdev_ops = { 
	.ndo_start_xmit		= hns3_nic_net_xmit,

	.ndo_tx_timeout		= hns3_nic_net_timeout,

	.ndo_set_mac_address	= hns3_nic_net_set_mac_address,

	.ndo_do_ioctl		= hns3_nic_do_ioctl,

	.ndo_change_mtu		= hns3_nic_change_mtu,

	.ndo_set_features	= hns3_nic_set_features,

	.ndo_get_stats64	= hns3_nic_get_stats64,
@@ -1925,7 +1970,7 @@ static int is_valid_clean_head(struct hns3_enet_ring *ring, int h) 
	return u > c ? (h > c && h <= u) : (h > c || h <= u);

}



bool hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget)

void hns3_clean_tx_ring(struct hns3_enet_ring *ring)

{

	struct net_device *netdev = ring->tqp->handle->kinfo.netdev;

	struct netdev_queue *dev_queue;
@@ -1936,7 +1981,7 @@ bool hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget) 
	rmb(); /* Make sure head is ready before touch any data */



	if (is_ring_empty(ring) || head == ring->next_to_clean)

		return true; /* no data to poll */

		return; /* no data to poll */



	if (unlikely(!is_valid_clean_head(ring, head))) {

		netdev_err(netdev, "wrong head (%d, %d-%d)\n", head,
@@ -1945,16 +1990,15 @@ bool hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget) 
		u64_stats_update_begin(&ring->syncp);

		ring->stats.io_err_cnt++;

		u64_stats_update_end(&ring->syncp);

		return true;

		return;

	}



	bytes = 0;

	pkts = 0;

	while (head != ring->next_to_clean && budget) {

	while (head != ring->next_to_clean) {

		hns3_nic_reclaim_one_desc(ring, &bytes, &pkts);

		/* Issue prefetch for next Tx descriptor */

		prefetch(&ring->desc_cb[ring->next_to_clean]);

		budget--;

	}



	ring->tqp_vector->tx_group.total_bytes += bytes;
@@ -1979,8 +2023,6 @@ bool hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget) 
			ring->stats.restart_queue++;

		}

	}



	return !!budget;

}



static int hns3_desc_unused(struct hns3_enet_ring *ring)
@@ -2514,10 +2556,8 @@ static int hns3_nic_common_poll(struct napi_struct *napi, int budget) 
	/* Since the actual Tx work is minimal, we can give the Tx a larger

	 * budget and be more aggressive about cleaning up the Tx descriptors.

	 */

	hns3_for_each_ring(ring, tqp_vector->tx_group) {

		if (!hns3_clean_tx_ring(ring, budget))

			clean_complete = false;

	}

	hns3_for_each_ring(ring, tqp_vector->tx_group)

		hns3_clean_tx_ring(ring);



	/* make sure rx ring budget not smaller than 1 */

	rx_budget = max(budget / tqp_vector->num_tqps, 1);
@@ -2640,6 +2680,23 @@ static void hns3_add_ring_to_group(struct hns3_enet_ring_group *group, 
	group->count++;

}



static void hns3_nic_set_cpumask(struct hns3_nic_priv *priv)

{

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

	struct hns3_enet_tqp_vector *tqp_vector;

	int num_vectors = priv->vector_num;

	int numa_node;

	int vector_i;



	numa_node = dev_to_node(&pdev->dev);



	for (vector_i = 0; vector_i < num_vectors; vector_i++) {

		tqp_vector = &priv->tqp_vector[vector_i];

		cpumask_set_cpu(cpumask_local_spread(vector_i, numa_node),

				&tqp_vector->affinity_mask);

	}

}



static int hns3_nic_init_vector_data(struct hns3_nic_priv *priv)

{

	struct hnae3_ring_chain_node vector_ring_chain;
@@ -2648,6 +2705,8 @@ static int hns3_nic_init_vector_data(struct hns3_nic_priv *priv) 
	int ret = 0;

	u16 i;



	hns3_nic_set_cpumask(priv);



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

		tqp_vector = &priv->tqp_vector[i];

		hns3_vector_gl_rl_init_hw(tqp_vector, priv);

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

+3 −1
Original line number Diff line number Diff line
@@ -491,7 +491,9 @@ struct hns3_enet_tqp_vector { 
	struct hns3_enet_ring_group rx_group;

	struct hns3_enet_ring_group tx_group;



	cpumask_t affinity_mask;

	u16 num_tqps;	/* total number of tqps in TQP vector */

	struct irq_affinity_notify affinity_notify;



	char name[HNAE3_INT_NAME_LEN];
@@ -615,7 +617,7 @@ void hns3_ethtool_set_ops(struct net_device *netdev); 
int hns3_set_channels(struct net_device *netdev,

		      struct ethtool_channels *ch);



bool hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget);

void hns3_clean_tx_ring(struct hns3_enet_ring *ring);

int hns3_init_all_ring(struct hns3_nic_priv *priv);

int hns3_uninit_all_ring(struct hns3_nic_priv *priv);

int hns3_nic_reset_all_ring(struct hnae3_handle *h);

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

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static void hns3_lb_clear_tx_ring(struct hns3_nic_priv *priv, u32 start_ringid, 
	for (i = start_ringid; i <= end_ringid; i++) {

		struct hns3_enet_ring *ring = priv->ring_data[i].ring;



		hns3_clean_tx_ring(ring, budget);

		hns3_clean_tx_ring(ring);

	}

}