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

Commit 33b56af1 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: pcie: add missing calls to synchronize_irq() 



In a few places, we were disabling interrupts but didn't
make sure that the interrupt handler has finished running.
Add calls to synchronize_irq() to ensure we finish handling
the interrupts before we free resources or other things that
could lead to a crash if the interrupt were to be handled
later.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 1103323c

drivers/net/wireless/iwlwifi/pcie/trans.c

+7 −0
Original line number Diff line number Diff line
@@ -1178,6 +1178,8 @@ void iwl_trans_pcie_rf_kill(struct iwl_trans *trans, bool state) 


static void iwl_trans_pcie_d3_suspend(struct iwl_trans *trans, bool test)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);



	iwl_disable_interrupts(trans);



	/*
@@ -1189,6 +1191,8 @@ static void iwl_trans_pcie_d3_suspend(struct iwl_trans *trans, bool test) 


	iwl_pcie_disable_ict(trans);



	synchronize_irq(trans_pcie->pci_dev->irq);



	iwl_clear_bit(trans, CSR_GP_CNTRL,

		      CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);

	iwl_clear_bit(trans, CSR_GP_CNTRL,
@@ -1326,7 +1330,10 @@ static void iwl_trans_pcie_op_mode_leave(struct iwl_trans *trans) 
	spin_unlock(&trans_pcie->irq_lock);



	iwl_pcie_disable_ict(trans);



	mutex_unlock(&trans_pcie->mutex);



	synchronize_irq(trans_pcie->pci_dev->irq);

}



static void iwl_trans_pcie_write8(struct iwl_trans *trans, u32 ofs, u8 val)