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

Commit 5d7b045b authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-for-davem-2015-01-20' of... 

Merge tag 'wireless-drivers-for-davem-2015-01-20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



ath9k:

* fix an IRQ storm caused by commit 872b5d81

iwlwifi:

* A fix for scan that fixes a firmware assertion

* A fix that improves roaming behavior. Same fix has been tested for
  a while in iwldvm. This is a bit of a work around, but the real fix
  should be in mac80211 and will come later.

* A fix for BARs that avoids a WARNING.

* one fix for rfkill while scheduled scan is running.
  Linus's system hit this issue. WiFi would be unavailable
  after this has happpened because of bad state in cfg80211.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9143e398 e3f31175

drivers/net/wireless/ath/ath9k/main.c

+3 −4
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan) 


	__ath_cancel_work(sc);



	disable_irq(sc->irq);

	tasklet_disable(&sc->intr_tq);

	tasklet_disable(&sc->bcon_tasklet);

	spin_lock_bh(&sc->sc_pcu_lock);
@@ -331,6 +332,7 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan) 
		r = -EIO;



out:

	enable_irq(sc->irq);

	spin_unlock_bh(&sc->sc_pcu_lock);

	tasklet_enable(&sc->bcon_tasklet);

	tasklet_enable(&sc->intr_tq);
@@ -512,9 +514,6 @@ irqreturn_t ath_isr(int irq, void *dev) 
	if (!ah || test_bit(ATH_OP_INVALID, &common->op_flags))

		return IRQ_NONE;



	if (!AR_SREV_9100(ah) && test_bit(ATH_OP_HW_RESET, &common->op_flags))

		return IRQ_NONE;



	/* shared irq, not for us */

	if (!ath9k_hw_intrpend(ah))

		return IRQ_NONE;
@@ -529,7 +528,7 @@ irqreturn_t ath_isr(int irq, void *dev) 
	ath9k_debug_sync_cause(sc, sync_cause);

	status &= ah->imask;	/* discard unasked-for bits */



	if (AR_SREV_9100(ah) && test_bit(ATH_OP_HW_RESET, &common->op_flags))

	if (test_bit(ATH_OP_HW_RESET, &common->op_flags))

		return IRQ_HANDLED;



	/*

drivers/net/wireless/iwlwifi/iwl-fw-file.h

+2 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ enum iwl_ucode_tlv_flag { 
 * @IWL_UCODE_TLV_API_BASIC_DWELL: use only basic dwell time in scan command,

 *	regardless of the band or the number of the probes. FW will calculate

 *	the actual dwell time.

 * @IWL_UCODE_TLV_API_SINGLE_SCAN_EBS: EBS is supported for single scans too.

 */

enum iwl_ucode_tlv_api {

	IWL_UCODE_TLV_API_WOWLAN_CONFIG_TID	= BIT(0),
@@ -257,6 +258,7 @@ enum iwl_ucode_tlv_api { 
	IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF	= BIT(7),

	IWL_UCODE_TLV_API_FRAGMENTED_SCAN	= BIT(8),

	IWL_UCODE_TLV_API_BASIC_DWELL		= BIT(13),

	IWL_UCODE_TLV_API_SINGLE_SCAN_EBS	= BIT(16),

};



/**

drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h

+5 −2
Original line number Diff line number Diff line
@@ -653,8 +653,11 @@ enum iwl_scan_channel_flags { 
};



/* iwl_scan_channel_opt - CHANNEL_OPTIMIZATION_API_S

 * @flags: enum iwl_scan_channel_flgs

 * @non_ebs_ratio: how many regular scan iteration before EBS

 * @flags: enum iwl_scan_channel_flags

 * @non_ebs_ratio: defines the ratio of number of scan iterations where EBS is

 *	involved.

 *	1 - EBS is disabled.

 *	2 - every second scan will be full scan(and so on).

 */

struct iwl_scan_channel_opt {

	__le16 flags;

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

+9 −11
Original line number Diff line number Diff line
@@ -3343,19 +3343,17 @@ static void iwl_mvm_mac_flush(struct ieee80211_hw *hw, 
		msk |= mvmsta->tfd_queue_msk;

	}



	if (drop) {

	msk &= ~BIT(vif->hw_queue[IEEE80211_AC_VO]);



	if (iwl_mvm_flush_tx_path(mvm, msk, true))

		IWL_ERR(mvm, "flush request fail\n");

	mutex_unlock(&mvm->mutex);

	} else {

		mutex_unlock(&mvm->mutex);



	/* this can take a while, and we may need/want other operations

	 * to succeed while doing this, so do it without the mutex held

	 */

	iwl_trans_wait_tx_queue_empty(mvm->trans, msk);

}

}



const struct ieee80211_ops iwl_mvm_hw_ops = {

	.tx = iwl_mvm_mac_tx,

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

+41 −12
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ 


#define IWL_PLCP_QUIET_THRESH 1

#define IWL_ACTIVE_QUIET_TIME 10

#define IWL_DENSE_EBS_SCAN_RATIO 5

#define IWL_SPARSE_EBS_SCAN_RATIO 1



struct iwl_mvm_scan_params {

	u32 max_out_time;
@@ -1105,6 +1107,12 @@ int iwl_mvm_scan_offload_stop(struct iwl_mvm *mvm, bool notify) 
		return iwl_umac_scan_stop(mvm, IWL_UMAC_SCAN_UID_SCHED_SCAN,

					  notify);



	if (mvm->scan_status == IWL_MVM_SCAN_NONE)

		return 0;



	if (iwl_mvm_is_radio_killed(mvm))

		goto out;



	if (mvm->scan_status != IWL_MVM_SCAN_SCHED &&

	    (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN) ||

	     mvm->scan_status != IWL_MVM_SCAN_OS)) {
@@ -1141,6 +1149,7 @@ int iwl_mvm_scan_offload_stop(struct iwl_mvm *mvm, bool notify) 
	if (mvm->scan_status == IWL_MVM_SCAN_OS)

		iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);



out:

	mvm->scan_status = IWL_MVM_SCAN_NONE;



	if (notify) {
@@ -1297,18 +1306,6 @@ iwl_mvm_build_generic_unified_scan_cmd(struct iwl_mvm *mvm, 
	cmd->scan_prio = cpu_to_le32(IWL_SCAN_PRIORITY_HIGH);

	cmd->iter_num = cpu_to_le32(1);



	if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_EBS_SUPPORT &&

	    mvm->last_ebs_successful) {

		cmd->channel_opt[0].flags =

			cpu_to_le16(IWL_SCAN_CHANNEL_FLAG_EBS |

				    IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE |

				    IWL_SCAN_CHANNEL_FLAG_CACHE_ADD);

		cmd->channel_opt[1].flags =

			cpu_to_le16(IWL_SCAN_CHANNEL_FLAG_EBS |

				    IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE |

				    IWL_SCAN_CHANNEL_FLAG_CACHE_ADD);

	}



	if (iwl_mvm_rrm_scan_needed(mvm))

		cmd->scan_flags |=

			cpu_to_le32(IWL_MVM_LMAC_SCAN_FLAGS_RRM_ENABLED);
@@ -1383,6 +1380,22 @@ int iwl_mvm_unified_scan_lmac(struct iwl_mvm *mvm, 
	cmd->schedule[1].iterations = 0;

	cmd->schedule[1].full_scan_mul = 0;



	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_SINGLE_SCAN_EBS &&

	    mvm->last_ebs_successful) {

		cmd->channel_opt[0].flags =

			cpu_to_le16(IWL_SCAN_CHANNEL_FLAG_EBS |

				    IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE |

				    IWL_SCAN_CHANNEL_FLAG_CACHE_ADD);

		cmd->channel_opt[0].non_ebs_ratio =

			cpu_to_le16(IWL_DENSE_EBS_SCAN_RATIO);

		cmd->channel_opt[1].flags =

			cpu_to_le16(IWL_SCAN_CHANNEL_FLAG_EBS |

				    IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE |

				    IWL_SCAN_CHANNEL_FLAG_CACHE_ADD);

		cmd->channel_opt[1].non_ebs_ratio =

			cpu_to_le16(IWL_SPARSE_EBS_SCAN_RATIO);

	}



	for (i = 1; i <= req->req.n_ssids; i++)

		ssid_bitmap |= BIT(i);
@@ -1483,6 +1496,22 @@ int iwl_mvm_unified_sched_scan_lmac(struct iwl_mvm *mvm, 
	cmd->schedule[1].iterations = 0xff;

	cmd->schedule[1].full_scan_mul = IWL_FULL_SCAN_MULTIPLIER;



	if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_EBS_SUPPORT &&

	    mvm->last_ebs_successful) {

		cmd->channel_opt[0].flags =

			cpu_to_le16(IWL_SCAN_CHANNEL_FLAG_EBS |

				    IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE |

				    IWL_SCAN_CHANNEL_FLAG_CACHE_ADD);

		cmd->channel_opt[0].non_ebs_ratio =

			cpu_to_le16(IWL_DENSE_EBS_SCAN_RATIO);

		cmd->channel_opt[1].flags =

			cpu_to_le16(IWL_SCAN_CHANNEL_FLAG_EBS |

				    IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE |

				    IWL_SCAN_CHANNEL_FLAG_CACHE_ADD);

		cmd->channel_opt[1].non_ebs_ratio =

			cpu_to_le16(IWL_SPARSE_EBS_SCAN_RATIO);

	}



	iwl_mvm_lmac_scan_cfg_channels(mvm, req->channels, req->n_channels,

				       ssid_bitmap, cmd);