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

Commit e604d912 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-for-kalle-2015-10-25' of... 

Merge tag 'iwlwifi-for-kalle-2015-10-25' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

* some fixes for suspend/resume with unified FW images;
* a fix for a false-positive lockdep report;
* a fix for multi-queue that caused an unnecessary 1 second latency;
* a fix for an ACPI parsing bug that caused a misleading error message;
parents 67f0160f 5a143db8

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

+38 −11
Original line number Diff line number Diff line
@@ -1087,6 +1087,15 @@ iwl_mvm_netdetect_config(struct iwl_mvm *mvm, 
		ret = iwl_mvm_switch_to_d3(mvm);

		if (ret)

			return ret;

	} else {

		/* In theory, we wouldn't have to stop a running sched

		 * scan in order to start another one (for

		 * net-detect).  But in practice this doesn't seem to

		 * work properly, so stop any running sched_scan now.

		 */

		ret = iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_SCHED, true);

		if (ret)

			return ret;

	}



	/* rfkill release can be either for wowlan or netdetect */
@@ -1254,7 +1263,10 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw, 
 out:

	if (ret < 0) {

		iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);

		if (mvm->restart_fw > 0) {

			mvm->restart_fw--;

			ieee80211_restart_hw(mvm->hw);

		}

		iwl_mvm_free_nd(mvm);

	}

 out_noreset:
@@ -2088,6 +2100,16 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test) 
	iwl_mvm_update_changed_regdom(mvm);



	if (mvm->net_detect) {

		/* If this is a non-unified image, we restart the FW,

		 * so no need to stop the netdetect scan.  If that

		 * fails, continue and try to get the wake-up reasons,

		 * but trigger a HW restart by keeping a failure code

		 * in ret.

		 */

		if (unified_image)

			ret = iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_NETDETECT,

						false);



		iwl_mvm_query_netdetect_reasons(mvm, vif);

		/* has unlocked the mutex, so skip that */

		goto out;
@@ -2271,7 +2293,8 @@ static void iwl_mvm_d3_test_disconn_work_iter(void *_data, u8 *mac, 
static int iwl_mvm_d3_test_release(struct inode *inode, struct file *file)

{

	struct iwl_mvm *mvm = inode->i_private;

	int remaining_time = 10;

	bool unified_image = fw_has_capa(&mvm->fw->ucode_capa,

					 IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG);



	mvm->d3_test_active = false;
@@ -2282,6 +2305,9 @@ static int iwl_mvm_d3_test_release(struct inode *inode, struct file *file) 
	mvm->trans->system_pm_mode = IWL_PLAT_PM_MODE_DISABLED;



	iwl_abort_notification_waits(&mvm->notif_wait);

	if (!unified_image) {

		int remaining_time = 10;



		ieee80211_restart_hw(mvm->hw);



		/* wait for restart and disconnect all interfaces */
@@ -2292,7 +2318,8 @@ static int iwl_mvm_d3_test_release(struct inode *inode, struct file *file) 
		}



		if (remaining_time == 0)

		IWL_ERR(mvm, "Timed out waiting for HW restart to finish!\n");

			IWL_ERR(mvm, "Timed out waiting for HW restart!\n");

	}



	ieee80211_iterate_active_interfaces_atomic(

		mvm->hw, IEEE80211_IFACE_ITER_NORMAL,

drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -1529,8 +1529,8 @@ static ssize_t iwl_dbgfs_mem_read(struct file *file, char __user *user_buf, 
		.data = { &cmd, },

		.len = { sizeof(cmd) },

	};

	size_t delta, len;

	ssize_t ret;

	size_t delta;

	ssize_t ret, len;



	hcmd.id = iwl_cmd_id(*ppos >> 24 ? UMAC_RD_WR : LMAC_RD_WR,

			     DEBUG_GROUP, 0);

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+1 −2
Original line number Diff line number Diff line
@@ -4121,7 +4121,6 @@ void iwl_mvm_sync_rx_queues_internal(struct iwl_mvm *mvm, 
				     struct iwl_mvm_internal_rxq_notif *notif,

				     u32 size)

{

	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(notif_waitq);

	u32 qmask = BIT(mvm->trans->num_rx_queues) - 1;

	int ret;
@@ -4143,7 +4142,7 @@ void iwl_mvm_sync_rx_queues_internal(struct iwl_mvm *mvm, 
	}



	if (notif->sync)

		ret = wait_event_timeout(notif_waitq,

		ret = wait_event_timeout(mvm->rx_sync_waitq,

					 atomic_read(&mvm->queue_sync_counter) == 0,

					 HZ);

	WARN_ON_ONCE(!ret);

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+1 −0
Original line number Diff line number Diff line
@@ -937,6 +937,7 @@ struct iwl_mvm { 
	/* sync d0i3_tx queue and IWL_MVM_STATUS_IN_D0I3 status flag */

	spinlock_t d0i3_tx_lock;

	wait_queue_head_t d0i3_exit_waitq;

	wait_queue_head_t rx_sync_waitq;



	/* BT-Coex */

	struct iwl_bt_coex_profile_notif last_bt_notif;

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

+1 −0
Original line number Diff line number Diff line
@@ -619,6 +619,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
	spin_lock_init(&mvm->refs_lock);

	skb_queue_head_init(&mvm->d0i3_tx);

	init_waitqueue_head(&mvm->d0i3_exit_waitq);

	init_waitqueue_head(&mvm->rx_sync_waitq);



	atomic_set(&mvm->queue_sync_counter, 0);