pull request: wireless 2013-10-09
Subsystems (4)
Dave,
Please pull this batch of fixes intended for 3.12...
Most of the bits are for iwlwifi -- Johannes says:
"I have a fix for WoWLAN/D3, a PCIe device fix, we're removing a warning, there's a fix for RF-kill while scanning (which goes together with a mac80211 fix) and last but not least we have many new PCI IDs."
Also for iwlwifi is a patch from Johannes to correct some merge damage that crept into the tree before the last merge window.
On top of that, Felix Fietkau sends an ath9k patch to avoid a Tx scheduling hang when changing channels to do a scan.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 9684d7b0dab3cf3a897edd85dca501d413888d56:
Merge branch 'sfc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc (2013-10-08 21:56:09 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to b26082b9945a9aca85d51be37824f852617c7129:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-10-09 11:19:05 -0400)
----------------------------------------------------------------
Alexander Bondar (1):
iwlwifi: mvm: Disable uAPSD for D3 image
Emmanuel Grumbach (4):
iwlwifi: pcie: don't reset the TX queue counter
iwlwifi: don't WARN on host commands sent when firmware is dead
iwlwifi: pcie: add SKUs for 6000, 6005 and 6235 series
iwlwifi: mvm: call ieee80211_scan_completed when needed
Felix Fietkau (1):
ath9k: fix tx queue scheduling after channel changes
Johannes Berg (1):
iwlwifi: pcie: fix merge damage
John W. Linville (2):
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
Matti Gottlieb (1):
iwlwifi: pcie: add new SKUs for 7000 & 3160 NIC series
drivers/net/wireless/ath/ath9k/main.c | 23 ++++++++--------- drivers/net/wireless/iwlwifi/iwl-6000.c | 6 +++++ drivers/net/wireless/iwlwifi/iwl-config.h | 1 + drivers/net/wireless/iwlwifi/iwl-trans.h | 6 +++-- drivers/net/wireless/iwlwifi/mvm/power.c | 5 +++- drivers/net/wireless/iwlwifi/mvm/scan.c | 12 ++++++++- drivers/net/wireless/iwlwifi/pcie/drv.c | 42 +++++++++++++++++++++++++++++++ drivers/net/wireless/iwlwifi/pcie/trans.c | 8 +++--- drivers/net/wireless/iwlwifi/pcie/tx.c | 2 ++ 9 files changed, 85 insertions(+), 20 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +11 -12
@@ -208,6 +208,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)struct ath_hw *ah = sc->sc_ah;struct ath_common *common =ath9k_hw_common (ah);unsigned long flags; +int i;if (ath_startrecv (sc) !=0 ) {ath_err (common,"Unable to restart recv logic\n" );
@@ -235,6 +236,15 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) } work:ath_restart_work (sc); + +for (i =0 ; i <ATH9K_NUM_TX_QUEUES ; i++) { +if (!ATH_TXQ_SETUP (sc, i)) +continue ; + +spin_lock_bh (&sc->tx.txq[i].axq_lock); +ath_txq_schedule (sc, &sc->tx.txq[i]); +spin_unlock_bh (&sc->tx.txq[i].axq_lock); + } }ieee80211_wake_queues (sc->hw);
@@ -539,21 +549,10 @@ chip_reset:static int ath_reset (struct ath_softc *sc) { -int i, r; +int r;ath9k_ps_wakeup (sc); - r =ath_reset_internal (sc,NULL ); - -for (i =0 ; i <ATH9K_NUM_TX_QUEUES ; i++) { -if (!ATH_TXQ_SETUP (sc, i)) -continue ; - -spin_lock_bh (&sc->tx.txq[i].axq_lock); -ath_txq_schedule (sc, &sc->tx.txq[i]); -spin_unlock_bh (&sc->tx.txq[i].axq_lock); - } -ath9k_ps_restore (sc);return r;
drivers/net/wireless/iwlwifi/iwl-6000.c +6 -0
@@ -240,6 +240,12 @@ const struct iwl_cfg iwl6035_2agn_cfg = { .ht_params = &iwl6000_ht_params, }; +const struct iwl_cfg iwl6035_2agn_sff_cfg = { + .name ="Intel(R) Centrino(R) Ultimate-N 6235 AGN" , +IWL_DEVICE_6035 , + .ht_params = &iwl6000_ht_params, +}; +const struct iwl_cfg iwl1030_bgn_cfg = { .name ="Intel(R) Centrino(R) Wireless-N 1030 BGN" ,IWL_DEVICE_6030 ,
drivers/net/wireless/iwlwifi/iwl-config.h +1 -0
@@ -280,6 +280,7 @@ extern const struct iwl_cfg iwl2000_2bgn_cfg;extern const struct iwl_cfg iwl2000_2bgn_d_cfg;extern const struct iwl_cfg iwl2030_2bgn_cfg;extern const struct iwl_cfg iwl6035_2agn_cfg; +extern const struct iwl_cfg iwl6035_2agn_sff_cfg;extern const struct iwl_cfg iwl105_bgn_cfg;extern const struct iwl_cfg iwl105_bgn_d_cfg;extern const struct iwl_cfg iwl135_bgn_cfg;
drivers/net/wireless/iwlwifi/iwl-trans.h +4 -2
@@ -601,8 +601,10 @@ static inline int iwl_trans_send_cmd(struct iwl_trans *trans, {int ret; -WARN_ONCE (trans->state !=IWL_TRANS_FW_ALIVE , -"%s bad state = %d" , __func__, trans->state); +if (trans->state !=IWL_TRANS_FW_ALIVE ) { +IWL_ERR (trans,"%s bad state = %d" , __func__, trans->state); +return -EIO ; + }if (!(cmd->flags &CMD_ASYNC ))lock_map_acquire_read (&trans->sync_cmd_lockdep_map);
drivers/net/wireless/iwlwifi/mvm/power.c +4 -1
@@ -273,7 +273,10 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm,if (!mvmvif->queue_params[ac].uapsd)continue ; - cmd->flags |=cpu_to_le16 (POWER_FLAGS_ADVANCE_PM_ENA_MSK ); +if (mvm->cur_ucode !=IWL_UCODE_WOWLAN ) + cmd->flags |= +cpu_to_le16 (POWER_FLAGS_ADVANCE_PM_ENA_MSK ); + cmd->uapsd_ac_flags |=BIT (ac);/* QNDP TID - the highest TID with no admission control */
drivers/net/wireless/iwlwifi/mvm/scan.c +11 -1
@@ -394,6 +394,11 @@ static bool iwl_mvm_scan_abort_notif(struct iwl_notif_wait_data *notif_wait,return false; } +/* +* If scan cannot be aborted, it means that we had a +* SCAN_COMPLETE_NOTIFICATION in the pipe and it called +* ieee80211_scan_completed already. +*/ IWL_DEBUG_SCAN (mvm,"Scan cannot be aborted, exit now: %d\n" , *resp);return true;
@@ -417,14 +422,19 @@ void iwl_mvm_cancel_scan(struct iwl_mvm *mvm) SCAN_COMPLETE_NOTIFICATION };int ret; +if (mvm->scan_status ==IWL_MVM_SCAN_NONE ) +return ; +iwl_init_notification_wait (&mvm->notif_wait, &wait_scan_abort, scan_abort_notif,ARRAY_SIZE (scan_abort_notif), iwl_mvm_scan_abort_notif,NULL ); - ret =iwl_mvm_send_cmd_pdu (mvm,SCAN_ABORT_CMD ,CMD_SYNC ,0 ,NULL ); + ret =iwl_mvm_send_cmd_pdu (mvm,SCAN_ABORT_CMD , +CMD_SYNC |CMD_SEND_IN_RFKILL ,0 ,NULL );if (ret) {IWL_ERR (mvm,"Couldn't send SCAN_ABORT_CMD: %d\n" , ret); +/* mac80211's state will be cleaned in the fw_restart flow */ goto out_remove_notif; }
drivers/net/wireless/iwlwifi/pcie/drv.c +42 -0
129 lines not on this page · raw message
drivers/net/wireless/iwlwifi/pcie/trans.c +4 -4
@@ -1401,6 +1401,10 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,spin_lock_init (&trans_pcie->reg_lock);init_waitqueue_head (&trans_pcie->ucode_write_waitq); + err =pci_enable_device (pdev); +if (err) + goto out_no_pci; +if (!cfg->base_params->pcie_l1_allowed) {/* * W/A - seems to solve weird behavior. We need to remove this
@@ -1412,10 +1416,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, PCIE_LINK_STATE_CLKPM); } - err =pci_enable_device (pdev); -if (err) - goto out_no_pci; -pci_set_master (pdev); err =pci_set_dma_mask (pdev,DMA_BIT_MASK (36 ));
drivers/net/wireless/iwlwifi/pcie/tx.c +2 -0
@@ -1102,6 +1102,8 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,* non-AGG queue. */ iwl_clear_bits_prph (trans,SCD_AGGR_SEL ,BIT (txq_id)); + + ssn = trans_pcie->txq[txq_id].q.read_ptr; }/* Place first TFD at index corresponding to start sequence number.
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
David Miller
maintainerFrom: "John W. Linville" <[email protected]>
Date: Wed, 9 Oct 2013 11:28:41 -0400
Quoted 8 lines
Please pull this batch of fixes intended for 3.12...
Most of the bits are for iwlwifi -- Johannes says:
"I have a fix for WoWLAN/D3, a PCIe device fix, we're removing a warning, there's a fix for RF-kill while scanning (which goes together with a mac80211 fix) and last but not least we have many new PCI IDs."
Quoted 7 lines
Also for iwlwifi is a patch from Johannes to correct some merge damage that crept into the tree before the last merge window.
On top of that, Felix Fietkau sends an ath9k patch to avoid a Tx scheduling hang when changing channels to do a scan.
Please let me know if there are problems!
Pulled, thanks a lot John.