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

Commit 01d11cd1 authored by Sara Sharon's avatar Sara Sharon Committed by Emmanuel Grumbach
Browse files

iwlwifi: pcie: clear trans reference on queue stop 



Currently when stop flow is performed, there might be transport TX RTPM
references that are not freed in case we unmap a queue that still has
packets not reclaimed. Fix that.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 1200b680

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

+36 −23
Original line number Diff line number Diff line
@@ -596,6 +596,28 @@ static void iwl_pcie_free_tso_page(struct sk_buff *skb) 
	}

}



static void iwl_pcie_clear_cmd_in_flight(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);



	lockdep_assert_held(&trans_pcie->reg_lock);



	if (trans_pcie->ref_cmd_in_flight) {

		trans_pcie->ref_cmd_in_flight = false;

		IWL_DEBUG_RPM(trans, "clear ref_cmd_in_flight - unref\n");

		iwl_trans_pcie_unref(trans);

	}



	if (!trans->cfg->base_params->apmg_wake_up_wa)

		return;

	if (WARN_ON(!trans_pcie->cmd_hold_nic_awake))

		return;



	trans_pcie->cmd_hold_nic_awake = false;

	__iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,

				   CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);

}



/*

 * iwl_pcie_txq_unmap -  Unmap any remaining DMA mappings and free skb's

 */
@@ -620,6 +642,20 @@ static void iwl_pcie_txq_unmap(struct iwl_trans *trans, int txq_id) 
		}

		iwl_pcie_txq_free_tfd(trans, txq);

		q->read_ptr = iwl_queue_inc_wrap(q->read_ptr);



		if (q->read_ptr == q->write_ptr) {

			unsigned long flags;



			spin_lock_irqsave(&trans_pcie->reg_lock, flags);

			if (txq_id != trans_pcie->cmd_queue) {

				IWL_DEBUG_RPM(trans, "Q %d - last tx freed\n",

					      q->id);

				iwl_trans_pcie_unref(trans);

			} else {

				iwl_pcie_clear_cmd_in_flight(trans);

			}

			spin_unlock_irqrestore(&trans_pcie->reg_lock, flags);

		}

	}

	txq->active = false;
@@ -1148,29 +1184,6 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans, 
	return 0;

}



static int iwl_pcie_clear_cmd_in_flight(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);



	lockdep_assert_held(&trans_pcie->reg_lock);



	if (trans_pcie->ref_cmd_in_flight) {

		trans_pcie->ref_cmd_in_flight = false;

		IWL_DEBUG_RPM(trans, "clear ref_cmd_in_flight - unref\n");

		iwl_trans_pcie_unref(trans);

	}



	if (trans->cfg->base_params->apmg_wake_up_wa) {

		if (WARN_ON(!trans_pcie->cmd_hold_nic_awake))

			return 0;



		trans_pcie->cmd_hold_nic_awake = false;

		__iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,

					   CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);

	}

	return 0;

}



/*

 * iwl_pcie_cmdq_reclaim - Reclaim TX command queue entries already Tx'd

 *