From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
To: linux-wireless@vger.kernel.org
Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
<stable@vger.kernel.org>
Subject: [PATCH 05/10] iwlwifi: pcie: prepare the device before accessing it
Date: Sun, 12 Jul 2015 20:08:15 +0300 [thread overview]
Message-ID: <1436720900-18588-5-git-send-email-emmanuel.grumbach@intel.com> (raw)
In-Reply-To: <1436720814.17999.2.camel@intel.com>
For 8000 series, we need to access the device to know what
firmware to load. Before we do so, we need to prepare the
device otherwise we might not be able to access the
hardware.
Fixes: c278754a21e6 ("iwlwifi: mvm: support family 8000 B2/C steps")
CC: <stable@vger.kernel.org> [4.1]
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/pcie/trans.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index fe61d0a..6203c4a 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -2551,6 +2551,12 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
trans->hw_rev = (trans->hw_rev & 0xfff0) |
(CSR_HW_REV_STEP(trans->hw_rev << 2) << 2);
+ ret = iwl_pcie_prepare_card_hw(trans);
+ if (ret) {
+ IWL_WARN(trans, "Exit HW not ready\n");
+ goto out_pci_disable_msi;
+ }
+
/*
* in-order to recognize C step driver should read chip version
* id located at the AUX bus MISC address space.
--
2.1.4
next prev parent reply other threads:[~2015-07-12 17:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-12 17:06 pull request: iwlwifi 2015-06-15 Grumbach, Emmanuel
2015-07-12 17:08 ` [PATCH 01/10] iwlwifi: mvm: fix antenna selection when BT is active Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 02/10] iwlwifi: mvm: Avoid accessing Null pointer when setting igtk Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 03/10] iwlwifi: pcie: Fix bug in NIC's PM registers access Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 04/10] iwlwifi: pcie: don't panic if pcie transport alloc fails Emmanuel Grumbach
2015-07-12 17:08 ` Emmanuel Grumbach [this message]
2015-07-12 17:08 ` [PATCH 06/10] iwlwifi: mvm: check time-event vif to avoid bad deletion Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 07/10] iwlwifi: edit the 3165 series and 8000 series PCI IDs Emmanuel Grumbach
2015-07-17 8:15 ` Kalle Valo
2015-07-12 17:08 ` [PATCH 08/10] iwlwifi: mvm: Add preemptive flag to scheulded scan Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 09/10] Revert "iwlwifi: pcie: New RBD allocation model" Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 10/10] iwlwifi: nvm: remove mac address byte swapping in 8000 family Emmanuel Grumbach
2015-07-17 8:26 ` pull request: iwlwifi 2015-06-15 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=1436720900-18588-5-git-send-email-emmanuel.grumbach@intel.com \
--to=emmanuel.grumbach@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=stable@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).