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

Commit 54154618 authored by Eliad Peller's avatar Eliad Peller Committed by Emmanuel Grumbach
Browse files

iwlwifi: pcie: re-enable interrupts on resume 



On resume, all the interrupts are masked (CSR_INT_MASK is 0),
and ict is disabled.

Re-configure them both.

Signed-off-by: default avatarEliad Peller <eliadx.peller@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 15286e26

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

+2 −0
Original line number Diff line number Diff line
@@ -641,6 +641,8 @@ struct iwl_trans { 


	enum iwl_d0i3_mode d0i3_mode;



	bool wowlan_d0i3;



	/* pointer to trans specific struct */

	/*Ensure that this pointer will always be aligned to sizeof pointer */

	char trans_specific[0] __aligned(sizeof(void *));

drivers/net/wireless/iwlwifi/mvm/d3.c

+2 −1
Original line number Diff line number Diff line
@@ -1170,7 +1170,8 @@ int iwl_mvm_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) 
	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);



	iwl_trans_suspend(mvm->trans);

	if (wowlan->any) {

	mvm->trans->wowlan_d0i3 = wowlan->any;

	if (mvm->trans->wowlan_d0i3) {

		/* 'any' trigger means d0i3 usage */

		if (mvm->trans->d0i3_mode == IWL_D0I3_MODE_ON_SUSPEND) {

			int ret = iwl_mvm_enter_d0i3_sync(mvm);

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

+14 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

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

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -629,7 +629,18 @@ static int iwl_pci_resume(struct device *device) 
	if (!trans->op_mode)

		return 0;



	/*

	 * On suspend, ict is disabled, and the interrupt mask

	 * gets cleared. Reconfigure them both in case of d0i3

	 * image. Otherwise, only enable rfkill interrupt (in

	 * order to keep track of the rfkill status)

	 */

	if (trans->wowlan_d0i3) {

		iwl_pcie_reset_ict(trans);

		iwl_enable_interrupts(trans);

	} else {

		iwl_enable_rfkill_int(trans);

	}



	hw_rfkill = iwl_is_rfkill_set(trans);

	iwl_trans_pcie_rf_kill(trans, hw_rfkill);