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

Commit 8ade6285 authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: move D3_CFG_COMPLETE handling into DVM 



The MVM firmware doesn't communicate this way, it instead
assumes D3 configuration is complete after a specific host
command (which must be last) has been sent. Handling this
bit thus belongs into the firmware API code, i.e. DVM.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent dfcb4c3a

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+8 −0
Original line number Diff line number Diff line
@@ -426,6 +426,10 @@ static int iwlagn_mac_suspend(struct ieee80211_hw *hw, 
	if (ret)

		goto error;



	/* let the ucode operate on its own */

	iwl_write32(priv->trans, CSR_UCODE_DRV_GP1_SET,

		    CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);



	iwl_trans_d3_suspend(priv->trans);



	goto out;
@@ -509,6 +513,10 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw) 
		goto out_unlock;

	}



	/* uCode is no longer operating by itself */

	iwl_write32(priv->trans, CSR_UCODE_DRV_GP1_CLR,

		    CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);



	base = priv->device_pointers.error_event_table;

	if (!iwlagn_hw_valid_rtc_data_addr(base)) {

		IWL_WARN(priv, "Invalid error table during resume!\n");

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

+0 −7
Original line number Diff line number Diff line
@@ -580,10 +580,6 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans) 


static void iwl_trans_pcie_d3_suspend(struct iwl_trans *trans)

{

	/* let the ucode operate on its own */

	iwl_write32(trans, CSR_UCODE_DRV_GP1_SET,

		    CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);



	iwl_disable_interrupts(trans);

	iwl_pcie_disable_ict(trans);
@@ -643,9 +639,6 @@ static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans, 
		return ret;

	}



	iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR,

		    CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);



	*status = IWL_D3_STATUS_ALIVE;

	return 0;

}