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

Commit b7aaeae4 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: pcie: let the Manageability Engine know when we leave 



When the driver is unload, the Manageability Engine should
know about that - send an event to inform it about this
event.

Reviewed-by: default avatarReuven Borok <reuven.borok@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent a0544272

drivers/net/wireless/iwlwifi/iwl-csr.h

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 
#define CSR_HW_IF_CONFIG_REG_BIT_NIC_READY	(0x00400000) /* PCI_OWN_SEM */

#define CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE (0x02000000) /* ME_OWN */

#define CSR_HW_IF_CONFIG_REG_PREPARE		  (0x08000000) /* WAKE_ME */

#define CSR_HW_IF_CONFIG_REG_ENABLE_PME		  (0x10000000)

#define CSR_HW_IF_CONFIG_REG_PERSIST_MODE	  (0x40000000) /* PERSISTENCE */



#define CSR_MBOX_SET_REG_OS_ALIVE		BIT(5)

drivers/net/wireless/iwlwifi/iwl-prph.h

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ 


#define APMG_PCIDEV_STT_VAL_PERSIST_DIS	(0x00000200)

#define APMG_PCIDEV_STT_VAL_L1_ACT_DIS	(0x00000800)

#define APMG_PCIDEV_STT_VAL_WAKE_ME	(0x00004000)



#define APMG_RTC_INT_STT_RFKILL		(0x10000000)

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

+18 −3
Original line number Diff line number Diff line
@@ -443,10 +443,25 @@ static int iwl_pcie_apm_stop_master(struct iwl_trans *trans) 
	return ret;

}



static void iwl_pcie_apm_stop(struct iwl_trans *trans)

static void iwl_pcie_apm_stop(struct iwl_trans *trans, bool op_mode_leave)

{

	IWL_DEBUG_INFO(trans, "Stop card, put in low power state\n");



	if (op_mode_leave) {

		if (!test_bit(STATUS_DEVICE_ENABLED, &trans->status))

			iwl_pcie_apm_init(trans);



		/* inform ME that we are leaving */

		if (trans->cfg->device_family == IWL_DEVICE_FAMILY_7000)

			iwl_set_bits_prph(trans, APMG_PCIDEV_STT_REG,

					  APMG_PCIDEV_STT_VAL_WAKE_ME);

		else if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)

			iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,

				    CSR_HW_IF_CONFIG_REG_PREPARE |

				    CSR_HW_IF_CONFIG_REG_ENABLE_PME);

		mdelay(5);

	}



	clear_bit(STATUS_DEVICE_ENABLED, &trans->status);



	/* Stop device's DMA activity */
@@ -1010,7 +1025,7 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans) 
		      CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);



	/* Stop the device, and put it in low power state */

	iwl_pcie_apm_stop(trans);

	iwl_pcie_apm_stop(trans, false);



	/* Upon stop, the APM issues an interrupt if HW RF kill is set.

	 * Clean again the interrupt here
@@ -1187,7 +1202,7 @@ static void iwl_trans_pcie_op_mode_leave(struct iwl_trans *trans) 
	iwl_disable_interrupts(trans);

	spin_unlock(&trans_pcie->irq_lock);



	iwl_pcie_apm_stop(trans);

	iwl_pcie_apm_stop(trans, true);



	spin_lock(&trans_pcie->irq_lock);

	iwl_disable_interrupts(trans);