Commit 2b616666 authored by Mordechay Goodstein's avatar Mordechay Goodstein Committed by Luca Coelho
Browse files

iwlwifi: pcie: merge napi_poll_msix functions 



The only difference between iwl_pcie_napi_poll_msix_shared() and
iwl_pcie_napi_poll_msix() is when we have a shared queue and nothing
in the rx queue.  This case doesn't affect CPU performance, so we can
merge the two functions.

Signed-off-by: default avatarMordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210411124417.9d1b61ef53a5.I60b33d5379cf7c12f1de30fc3fd4cefc38220141@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 6da29d3b

drivers/net/wireless/intel/iwlwifi/pcie/rx.c

+10 −33
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2003-2014, 2018-2020 Intel Corporation

 * Copyright (C) 2003-2014, 2018-2021 Intel Corporation

 * Copyright (C) 2013-2015 Intel Mobile Communications GmbH

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */
@@ -1046,33 +1046,19 @@ static int iwl_pcie_napi_poll_msix(struct napi_struct *napi, int budget) 
	trans = trans_pcie->trans;



	ret = iwl_pcie_rx_handle(trans, rxq->id, budget);

	IWL_DEBUG_ISR(trans, "[%d] handled %d, budget %d\n", rxq->id, ret,

		      budget);



	if (ret < budget) {

		spin_lock(&trans_pcie->irq_lock);

		iwl_pcie_clear_irq(trans, rxq->id);

		spin_unlock(&trans_pcie->irq_lock);



		napi_complete_done(&rxq->napi, ret);

	}



	return ret;

}



static int iwl_pcie_napi_poll_msix_shared(struct napi_struct *napi, int budget)

{

	struct iwl_rxq *rxq = container_of(napi, struct iwl_rxq, napi);

	struct iwl_trans_pcie *trans_pcie;

	struct iwl_trans *trans;

	int ret;



	trans_pcie = container_of(napi->dev, struct iwl_trans_pcie, napi_dev);

	trans = trans_pcie->trans;

		int irq_line = rxq->id;



	ret = iwl_pcie_rx_handle(trans, rxq->id, budget);

		/* FIRST_RSS is shared with line 0 */

		if (trans_pcie->shared_vec_mask & IWL_SHARED_IRQ_FIRST_RSS &&

		    rxq->id == 1)

			irq_line = 0;



	if (ret < budget) {

		spin_lock(&trans_pcie->irq_lock);

		iwl_pcie_clear_irq(trans, 0);

		iwl_pcie_clear_irq(trans, irq_line);

		spin_unlock(&trans_pcie->irq_lock);



		napi_complete_done(&rxq->napi, ret);
@@ -1134,18 +1120,9 @@ static int _iwl_pcie_rx_init(struct iwl_trans *trans) 
		if (!rxq->napi.poll) {

			int (*poll)(struct napi_struct *, int) = iwl_pcie_napi_poll;



			if (trans_pcie->msix_enabled) {

			if (trans_pcie->msix_enabled)

				poll = iwl_pcie_napi_poll_msix;



				if (trans_pcie->shared_vec_mask & IWL_SHARED_IRQ_NON_RX &&

				    i == 0)

					poll = iwl_pcie_napi_poll_msix_shared;



				if (trans_pcie->shared_vec_mask & IWL_SHARED_IRQ_FIRST_RSS &&

				    i == 1)

					poll = iwl_pcie_napi_poll_msix_shared;

			}



			netif_napi_add(&trans_pcie->napi_dev, &rxq->napi,

				       poll, NAPI_POLL_WEIGHT);

			napi_enable(&rxq->napi);