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

Commit cee5add4 authored by Daode Huang's avatar Daode Huang Committed by Doug Ledford
Browse files

net: hns: add fini_process for v2 napi process 



This patch adds fini_process for v2, it handles the packets recevied
by the hardware in the napi porcess. With this patch, the hardware irq
numbers will drop 50% per sec.

Signed-off-by: default avatarDaode Huang <huangdaode@hisilicon.com>
Reviewed-by: default avatarYisen Zhuang <yisen.zhuang@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 6771cbf9

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

+38 −7
Original line number Diff line number Diff line
@@ -823,6 +823,8 @@ static void hns_nic_rx_fini_pro(struct hns_nic_ring_data *ring_data) 
	struct hnae_ring *ring = ring_data->ring;

	int num = 0;



	ring_data->ring->q->handle->dev->ops->toggle_ring_irq(ring, 0);



	/* for hardware bug fixed */

	num = readl_relaxed(ring->io_base + RCB_REG_FBDNUM);
@@ -834,6 +836,20 @@ static void hns_nic_rx_fini_pro(struct hns_nic_ring_data *ring_data) 
	}

}



static void hns_nic_rx_fini_pro_v2(struct hns_nic_ring_data *ring_data)

{

	struct hnae_ring *ring = ring_data->ring;

	int num = 0;



	num = readl_relaxed(ring->io_base + RCB_REG_FBDNUM);



	if (num == 0)

		ring_data->ring->q->handle->dev->ops->toggle_ring_irq(

			ring, 0);

	else

		napi_schedule(&ring_data->napi);

}



static inline void hns_nic_reclaim_one_desc(struct hnae_ring *ring,

					    int *bytes, int *pkts)

{
@@ -935,7 +951,11 @@ static int hns_nic_tx_poll_one(struct hns_nic_ring_data *ring_data, 
static void hns_nic_tx_fini_pro(struct hns_nic_ring_data *ring_data)

{

	struct hnae_ring *ring = ring_data->ring;

	int head = readl_relaxed(ring->io_base + RCB_REG_HEAD);

	int head;



	ring_data->ring->q->handle->dev->ops->toggle_ring_irq(ring, 0);



	head = readl_relaxed(ring->io_base + RCB_REG_HEAD);



	if (head != ring->next_to_clean) {

		ring_data->ring->q->handle->dev->ops->toggle_ring_irq(
@@ -945,6 +965,18 @@ static void hns_nic_tx_fini_pro(struct hns_nic_ring_data *ring_data) 
	}

}



static void hns_nic_tx_fini_pro_v2(struct hns_nic_ring_data *ring_data)

{

	struct hnae_ring *ring = ring_data->ring;

	int head = readl_relaxed(ring->io_base + RCB_REG_HEAD);



	if (head == ring->next_to_clean)

		ring_data->ring->q->handle->dev->ops->toggle_ring_irq(

			ring, 0);

	else

		napi_schedule(&ring_data->napi);

}



static void hns_nic_tx_clr_all_bufs(struct hns_nic_ring_data *ring_data)

{

	struct hnae_ring *ring = ring_data->ring;
@@ -976,9 +1008,6 @@ static int hns_nic_common_poll(struct napi_struct *napi, int budget) 


	if (clean_complete >= 0 && clean_complete < budget) {

		napi_complete(napi);

		ring_data->ring->q->handle->dev->ops->toggle_ring_irq(

			ring_data->ring, 0);

		if (ring_data->fini_process)

		ring_data->fini_process(ring_data);

		return 0;

	}
@@ -1755,7 +1784,8 @@ static int hns_nic_init_ring_data(struct hns_nic_priv *priv) 
		rd->queue_index = i;

		rd->ring = &h->qs[i]->tx_ring;

		rd->poll_one = hns_nic_tx_poll_one;

		rd->fini_process = is_ver1 ? hns_nic_tx_fini_pro : NULL;

		rd->fini_process = is_ver1 ? hns_nic_tx_fini_pro :

			hns_nic_tx_fini_pro_v2;



		netif_napi_add(priv->netdev, &rd->napi,

			       hns_nic_common_poll, NIC_TX_CLEAN_MAX_NUM);
@@ -1767,7 +1797,8 @@ static int hns_nic_init_ring_data(struct hns_nic_priv *priv) 
		rd->ring = &h->qs[i - h->q_num]->rx_ring;

		rd->poll_one = hns_nic_rx_poll_one;

		rd->ex_process = hns_nic_rx_up_pro;

		rd->fini_process = is_ver1 ? hns_nic_rx_fini_pro : NULL;

		rd->fini_process = is_ver1 ? hns_nic_rx_fini_pro :

			hns_nic_rx_fini_pro_v2;



		netif_napi_add(priv->netdev, &rd->napi,

			       hns_nic_common_poll, NIC_RX_CLEAN_MAX_NUM);