From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
To: linux-wireless@vger.kernel.org
Cc: Eliad Peller <eliad@wizery.com>,
Eliad Peller <eliadx.peller@intel.com>,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Subject: [PATCH 08/31] iwlwifi: mvm: take IWL_MVM_REF_UCODE_DOWN before restarting hw
Date: Thu, 2 Apr 2015 09:40:56 +0300 [thread overview]
Message-ID: <1427956879-11725-8-git-send-email-emmanuel.grumbach@intel.com> (raw)
In-Reply-To: <1427956656.8122.2.camel@egrumbacBox>
From: Eliad Peller <eliad@wizery.com>
we unref IWL_MVM_REF_UCODE_DOWN on iwl_mvm_restart_complete().
Usually, the restart is initiated by iwl_mvm_nic_restart(),
which takes the reference before restarting the hw.
However, in D3 flow we might call ieee80211_restart_hw()
directly (in case of suspend error and on d3_test-resume),
which without taking the ref first. fix it.
Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/mvm/d3.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/iwlwifi/mvm/d3.c
index 5f8afa5..e730ea2 100644
--- a/drivers/net/wireless/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/iwlwifi/mvm/d3.c
@@ -1131,6 +1131,7 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw,
iwl_trans_d3_suspend(mvm->trans, test);
out:
if (ret < 0) {
+ iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);
ieee80211_restart_hw(mvm->hw);
iwl_mvm_free_nd(mvm);
}
@@ -2016,6 +2017,7 @@ static int iwl_mvm_d3_test_release(struct inode *inode, struct file *file)
__iwl_mvm_resume(mvm, true);
rtnl_unlock();
iwl_abort_notification_waits(&mvm->notif_wait);
+ iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);
ieee80211_restart_hw(mvm->hw);
/* wait for restart and disconnect all interfaces */
--
1.9.1
next prev parent reply other threads:[~2015-04-02 6:41 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-02 6:37 pull request: iwlwifi-next 2015-04-02 Grumbach, Emmanuel
2015-04-02 6:40 ` [PATCH 01/31] iwlwifi: mvm: continue (with error) CSA on GO time event failure Emmanuel Grumbach
2015-04-02 6:40 ` [PATCH 02/31] iwlwifi: mvm: assign new TLV bit for multi-source LAR Emmanuel Grumbach
2015-04-02 6:40 ` [PATCH 03/31] iwlwifi: pcie: add rx packet sequence number to dbg print Emmanuel Grumbach
2015-04-02 6:40 ` [PATCH 04/31] iwlwifi: mvm: properly flush the queues for buffering transport Emmanuel Grumbach
2015-04-02 6:40 ` [PATCH 05/31] iwlwifi: mvm: add iccm data to 8000 b-step data dump Emmanuel Grumbach
2015-04-02 6:40 ` [PATCH 06/31] iwlwifi: mvm: remove time-event start/end failure warning Emmanuel Grumbach
2015-04-02 6:40 ` [PATCH 07/31] iwlwifi: mvm: don't wait for firmware verification Emmanuel Grumbach
2015-04-02 6:40 ` Emmanuel Grumbach [this message]
2015-04-02 6:40 ` [PATCH 09/31] iwlwifi: mvm: remove d0i3 ref correctly during AP start Emmanuel Grumbach
2015-04-02 6:40 ` [PATCH 10/31] iwlwifi: mvm: inform mac80211 about umac scans that was aborted by restart Emmanuel Grumbach
2015-04-02 6:40 ` [PATCH 11/31] iwlwifi: pcie: initialize trans_pcie->ref_count on configure() Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 12/31] iwlwifi: mvm: add delay to scheduled scan Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 13/31] iwlwifi: mvm: use debugfs_create_bool() for enable_scan_iteration_notif Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 14/31] iwlwifi: drop support for early versions of 8000 Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 15/31] iwlwifi: mvm: allow to configure the timeout for the Tx queues Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 16/31] iwlwifi: mvm: fix debug print in the RSA ownership workaround Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 17/31] iwlwifi: 8000: change PNVM in case it doesn't match to the HW step Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 18/31] iwlwifi: mvm: Clean up UMAC scan UIDs in the reset and drv_stop flows Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 19/31] iwlwifi: mvm: rs: fix comment indentation Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 20/31] iwlwifi: check the size of the trigger struct from the firmware file Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 21/31] iwlwifi: mvm: rs: refactor rs_update_rate_tbl Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 22/31] iwlwifi: mvm: add debugfs entry with the number of net-detect scans Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 23/31] iwlwifi: mvm: always reconfigure last MCC on init Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 24/31] iwlwifi: mvm: Fix wrongfully flushing frames in the roc/off channel queue Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 25/31] iwlwifi: mvm: remove unused arguments Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 26/31] iwlwifi: mvm: add trigger for firmware dump upon MLME failures Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 27/31] iwlwifi: mvm: don't return uninitialized value in get_survey() Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 28/31] iwlwifi: fix spelling errors Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 29/31] iwlwifi: mvm: do string formatting in debug triggers Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 30/31] iwlwifi: mvm: add trigger for time events Emmanuel Grumbach
2015-04-02 6:41 ` [PATCH 31/31] iwlwifi: mvm: capture connection loss as part of MLME trigger Emmanuel Grumbach
2015-04-07 17:06 ` pull request: iwlwifi-next 2015-04-02 Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427956879-11725-8-git-send-email-emmanuel.grumbach@intel.com \
--to=emmanuel.grumbach@intel.com \
--cc=eliad@wizery.com \
--cc=eliadx.peller@intel.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).