* [PATCH 1/5] iwlwifi: fix name of ucode loaded for 8265 series
2016-02-15 11:57 pull request: iwlwifi-2016-02-16 Grumbach, Emmanuel
@ 2016-02-15 11:59 ` Emmanuel Grumbach
2016-02-15 11:59 ` [PATCH 2/5] iwlwifi: dvm: remove a wrong dependency on m Emmanuel Grumbach
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Emmanuel Grumbach @ 2016-02-15 11:59 UTC (permalink / raw)
To: linux-wireless; +Cc: Oren Givon, Emmanuel Grumbach
From: Oren Givon <oren.givon@intel.com>
Fix the name of the ucode being loaded for 8265 series
to be: iwlwifi-8265-XX.ucode
Signed-off-by: Oren Givon <oren.givon@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 42 +++++++++++++++++++++------
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 6 ++--
2 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
index c84a029..bce9b3420 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
@@ -7,6 +7,7 @@
*
* Copyright(c) 2014 Intel Corporation. All rights reserved.
* Copyright(c) 2014 - 2015 Intel Mobile Communications GmbH
+ * Copyright(c) 2016 Intel Deutschland GmbH
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
@@ -70,12 +71,15 @@
/* Highest firmware API version supported */
#define IWL8000_UCODE_API_MAX 20
+#define IWL8265_UCODE_API_MAX 20
/* Oldest version we won't warn about */
#define IWL8000_UCODE_API_OK 13
+#define IWL8265_UCODE_API_OK 20
/* Lowest firmware API version supported */
#define IWL8000_UCODE_API_MIN 13
+#define IWL8265_UCODE_API_MIN 20
/* NVM versions */
#define IWL8000_NVM_VERSION 0x0a1d
@@ -93,6 +97,10 @@
#define IWL8000_MODULE_FIRMWARE(api) \
IWL8000_FW_PRE "-" __stringify(api) ".ucode"
+#define IWL8265_FW_PRE "iwlwifi-8265-"
+#define IWL8265_MODULE_FIRMWARE(api) \
+ IWL8265_FW_PRE __stringify(api) ".ucode"
+
#define NVM_HW_SECTION_NUM_FAMILY_8000 10
#define DEFAULT_NVM_FILE_FAMILY_8000B "nvmData-8000B"
#define DEFAULT_NVM_FILE_FAMILY_8000C "nvmData-8000C"
@@ -144,10 +152,7 @@ static const struct iwl_tt_params iwl8000_tt_params = {
.support_tx_backoff = true,
};
-#define IWL_DEVICE_8000 \
- .ucode_api_max = IWL8000_UCODE_API_MAX, \
- .ucode_api_ok = IWL8000_UCODE_API_OK, \
- .ucode_api_min = IWL8000_UCODE_API_MIN, \
+#define IWL_DEVICE_8000_COMMON \
.device_family = IWL_DEVICE_FAMILY_8000, \
.max_inst_size = IWL60_RTC_INST_SIZE, \
.max_data_size = IWL60_RTC_DATA_SIZE, \
@@ -167,10 +172,28 @@ static const struct iwl_tt_params iwl8000_tt_params = {
.thermal_params = &iwl8000_tt_params, \
.apmg_not_supported = true
+#define IWL_DEVICE_8000 \
+ IWL_DEVICE_8000_COMMON, \
+ .ucode_api_max = IWL8000_UCODE_API_MAX, \
+ .ucode_api_ok = IWL8000_UCODE_API_OK, \
+ .ucode_api_min = IWL8000_UCODE_API_MIN \
+
+#define IWL_DEVICE_8260 \
+ IWL_DEVICE_8000_COMMON, \
+ .ucode_api_max = IWL8000_UCODE_API_MAX, \
+ .ucode_api_ok = IWL8000_UCODE_API_OK, \
+ .ucode_api_min = IWL8000_UCODE_API_MIN \
+
+#define IWL_DEVICE_8265 \
+ IWL_DEVICE_8000_COMMON, \
+ .ucode_api_max = IWL8265_UCODE_API_MAX, \
+ .ucode_api_ok = IWL8265_UCODE_API_OK, \
+ .ucode_api_min = IWL8265_UCODE_API_MIN \
+
const struct iwl_cfg iwl8260_2n_cfg = {
.name = "Intel(R) Dual Band Wireless N 8260",
.fw_name_pre = IWL8000_FW_PRE,
- IWL_DEVICE_8000,
+ IWL_DEVICE_8260,
.ht_params = &iwl8000_ht_params,
.nvm_ver = IWL8000_NVM_VERSION,
.nvm_calib_ver = IWL8000_TX_POWER_VERSION,
@@ -179,7 +202,7 @@ const struct iwl_cfg iwl8260_2n_cfg = {
const struct iwl_cfg iwl8260_2ac_cfg = {
.name = "Intel(R) Dual Band Wireless AC 8260",
.fw_name_pre = IWL8000_FW_PRE,
- IWL_DEVICE_8000,
+ IWL_DEVICE_8260,
.ht_params = &iwl8000_ht_params,
.nvm_ver = IWL8000_NVM_VERSION,
.nvm_calib_ver = IWL8000_TX_POWER_VERSION,
@@ -188,8 +211,8 @@ const struct iwl_cfg iwl8260_2ac_cfg = {
const struct iwl_cfg iwl8265_2ac_cfg = {
.name = "Intel(R) Dual Band Wireless AC 8265",
- .fw_name_pre = IWL8000_FW_PRE,
- IWL_DEVICE_8000,
+ .fw_name_pre = IWL8265_FW_PRE,
+ IWL_DEVICE_8265,
.ht_params = &iwl8000_ht_params,
.nvm_ver = IWL8000_NVM_VERSION,
.nvm_calib_ver = IWL8000_TX_POWER_VERSION,
@@ -209,7 +232,7 @@ const struct iwl_cfg iwl4165_2ac_cfg = {
const struct iwl_cfg iwl8260_2ac_sdio_cfg = {
.name = "Intel(R) Dual Band Wireless-AC 8260",
.fw_name_pre = IWL8000_FW_PRE,
- IWL_DEVICE_8000,
+ IWL_DEVICE_8260,
.ht_params = &iwl8000_ht_params,
.nvm_ver = IWL8000_NVM_VERSION,
.nvm_calib_ver = IWL8000_TX_POWER_VERSION,
@@ -236,3 +259,4 @@ const struct iwl_cfg iwl4165_2ac_sdio_cfg = {
};
MODULE_FIRMWARE(IWL8000_MODULE_FIRMWARE(IWL8000_UCODE_API_OK));
+MODULE_FIRMWARE(IWL8265_MODULE_FIRMWARE(IWL8265_UCODE_API_OK));
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 7acb490..ab4c2a0 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -243,8 +243,10 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first)
if (drv->trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) {
char rev_step = 'A' + CSR_HW_REV_STEP(drv->trans->hw_rev);
- snprintf(drv->firmware_name, sizeof(drv->firmware_name),
- "%s%c-%s.ucode", name_pre, rev_step, tag);
+ if (rev_step != 'A')
+ snprintf(drv->firmware_name,
+ sizeof(drv->firmware_name), "%s%c-%s.ucode",
+ name_pre, rev_step, tag);
}
IWL_DEBUG_INFO(drv, "attempting to load firmware %s'%s'\n",
--
2.5.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/5] iwlwifi: dvm: remove a wrong dependency on m
2016-02-15 11:57 pull request: iwlwifi-2016-02-16 Grumbach, Emmanuel
2016-02-15 11:59 ` [PATCH 1/5] iwlwifi: fix name of ucode loaded for 8265 series Emmanuel Grumbach
@ 2016-02-15 11:59 ` Emmanuel Grumbach
2016-02-15 11:59 ` [PATCH 3/5] iwlwifi: mvm: don't allow sched scans without matches to be started Emmanuel Grumbach
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Emmanuel Grumbach @ 2016-02-15 11:59 UTC (permalink / raw)
To: linux-wireless; +Cc: Emmanuel Grumbach
This was wronly added when the dependency on IWLWIFI was
removed.
This fixes https://bugzilla.kernel.org/show_bug.cgi?id=112201
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/intel/iwlwifi/Kconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig b/drivers/net/wireless/intel/iwlwifi/Kconfig
index 8660677..7438fbe 100644
--- a/drivers/net/wireless/intel/iwlwifi/Kconfig
+++ b/drivers/net/wireless/intel/iwlwifi/Kconfig
@@ -53,7 +53,6 @@ config IWLWIFI_LEDS
config IWLDVM
tristate "Intel Wireless WiFi DVM Firmware support"
- depends on m
help
This is the driver that supports the DVM firmware. The list
of the devices that use this firmware is available here:
--
2.5.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/5] iwlwifi: mvm: don't allow sched scans without matches to be started
2016-02-15 11:57 pull request: iwlwifi-2016-02-16 Grumbach, Emmanuel
2016-02-15 11:59 ` [PATCH 1/5] iwlwifi: fix name of ucode loaded for 8265 series Emmanuel Grumbach
2016-02-15 11:59 ` [PATCH 2/5] iwlwifi: dvm: remove a wrong dependency on m Emmanuel Grumbach
@ 2016-02-15 11:59 ` Emmanuel Grumbach
2016-02-15 11:59 ` [PATCH 4/5] iwlwifi: pcie: fix RF-Kill vs. firmware load race Emmanuel Grumbach
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Emmanuel Grumbach @ 2016-02-15 11:59 UTC (permalink / raw)
To: linux-wireless; +Cc: Luca Coelho, stable, Emmanuel Grumbach
From: Luca Coelho <luciano.coelho@intel.com>
The firmware can perform a scheduled scan with not matchsets passed,
but it can't send notification that results were found. Since the
userspace then cannot know when we got new results and the firmware
wouldn't trigger a wake in case we are sleeping, it's better not to
allow scans without matchsets.
This fixes https://bugzilla.kernel.org/show_bug.cgi?id=110831
Cc: <stable@vger.kernel.org> [3.17+]
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 9a15642..ea1e177 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -1298,6 +1298,10 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,
return -EBUSY;
}
+ /* we don't support "match all" in the firmware */
+ if (!req->n_match_sets)
+ return -EOPNOTSUPP;
+
ret = iwl_mvm_check_running_scans(mvm, type);
if (ret)
return ret;
--
2.5.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/5] iwlwifi: pcie: fix RF-Kill vs. firmware load race
2016-02-15 11:57 pull request: iwlwifi-2016-02-16 Grumbach, Emmanuel
` (2 preceding siblings ...)
2016-02-15 11:59 ` [PATCH 3/5] iwlwifi: mvm: don't allow sched scans without matches to be started Emmanuel Grumbach
@ 2016-02-15 11:59 ` Emmanuel Grumbach
2016-02-15 11:59 ` [PATCH 5/5] iwlwifi: pcie: fix erroneous return value Emmanuel Grumbach
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Emmanuel Grumbach @ 2016-02-15 11:59 UTC (permalink / raw)
To: linux-wireless; +Cc: Emmanuel Grumbach
When we load the firmware, we hold trans_pcie->mutex to
avoid nested flows. We also rely on the ISR to wake up the
thread when the DMA has finished copying a chunk. During
this flow, we enable the RF-Kill interrupt.
The problem is that the RF-Kill interrupt handler can take
the mutex and bring the device down. This means that if
we load the firmware while the RF-Kill switch is enabled
(which will happen when we load the INIT firmware to read
the device's capabilities and register to mac80211), we
may get an RF-Kill interrupt immediately and the ISR will
be waiting for the mutex held by the thread that is
currently loading the firmware. At this stage, the ISR
won't be able to service the DMA's interrupt needed to
wake up the thread that load the firmware. We are in a
deadlock situation which ends when the thread that loads
the firmware fails on timeout and releases the mutex.
To fix this, take the mutex later in the flow, disable
the interrupts and synchronize_irq() to give a chance to
the RF-Kill interrupt to run and complete.
After that, mask all the interrupts besides the DMA
interrupt and proceed with firmware load. Make sure to
check that there was no RF-Kill interrupt when the
interrupts were disabled.
This fixes https://bugzilla.kernel.org/show_bug.cgi?id=111361
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 9 +
drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 8 +-
drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 188 ++++++++++++---------
3 files changed, 123 insertions(+), 82 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
index cc3888e..73c9559 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
@@ -490,6 +490,15 @@ static inline void iwl_enable_interrupts(struct iwl_trans *trans)
iwl_write32(trans, CSR_INT_MASK, trans_pcie->inta_mask);
}
+static inline void iwl_enable_fw_load_int(struct iwl_trans *trans)
+{
+ struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+
+ IWL_DEBUG_ISR(trans, "Enabling FW load interrupt\n");
+ trans_pcie->inta_mask = CSR_INT_BIT_FH_TX;
+ iwl_write32(trans, CSR_INT_MASK, trans_pcie->inta_mask);
+}
+
static inline void iwl_enable_rfkill_int(struct iwl_trans *trans)
{
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
index ccafbd8..152cf9a 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
@@ -1438,9 +1438,11 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
inta & ~trans_pcie->inta_mask);
}
- /* Re-enable all interrupts */
- /* only Re-enable if disabled by irq */
- if (test_bit(STATUS_INT_ENABLED, &trans->status))
+ /* we are loading the firmware, enable FH_TX interrupt only */
+ if (handled & CSR_INT_BIT_FH_TX)
+ iwl_enable_fw_load_int(trans);
+ /* only Re-enable all interrupt if disabled by irq */
+ else if (test_bit(STATUS_INT_ENABLED, &trans->status))
iwl_enable_interrupts(trans);
/* Re-enable RF_KILL if it occurred */
else if (handled & CSR_INT_BIT_RF_KILL)
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index d60a467..5503072 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -1021,82 +1021,6 @@ static int iwl_pcie_load_given_ucode_8000(struct iwl_trans *trans,
&first_ucode_section);
}
-static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
- const struct fw_img *fw, bool run_in_rfkill)
-{
- struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
- bool hw_rfkill;
- int ret;
-
- mutex_lock(&trans_pcie->mutex);
-
- /* Someone called stop_device, don't try to start_fw */
- if (trans_pcie->is_down) {
- IWL_WARN(trans,
- "Can't start_fw since the HW hasn't been started\n");
- ret = EIO;
- goto out;
- }
-
- /* This may fail if AMT took ownership of the device */
- if (iwl_pcie_prepare_card_hw(trans)) {
- IWL_WARN(trans, "Exit HW not ready\n");
- ret = -EIO;
- goto out;
- }
-
- iwl_enable_rfkill_int(trans);
-
- /* If platform's RF_KILL switch is NOT set to KILL */
- hw_rfkill = iwl_is_rfkill_set(trans);
- if (hw_rfkill)
- set_bit(STATUS_RFKILL, &trans->status);
- else
- clear_bit(STATUS_RFKILL, &trans->status);
- iwl_trans_pcie_rf_kill(trans, hw_rfkill);
- if (hw_rfkill && !run_in_rfkill) {
- ret = -ERFKILL;
- goto out;
- }
-
- iwl_write32(trans, CSR_INT, 0xFFFFFFFF);
-
- ret = iwl_pcie_nic_init(trans);
- if (ret) {
- IWL_ERR(trans, "Unable to init nic\n");
- goto out;
- }
-
- /* make sure rfkill handshake bits are cleared */
- iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
- iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR,
- CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
-
- /* clear (again), then enable host interrupts */
- iwl_write32(trans, CSR_INT, 0xFFFFFFFF);
- iwl_enable_interrupts(trans);
-
- /* really make sure rfkill handshake bits are cleared */
- iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
- iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
-
- /* Load the given image to the HW */
- if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
- ret = iwl_pcie_load_given_ucode_8000(trans, fw);
- else
- ret = iwl_pcie_load_given_ucode(trans, fw);
-
-out:
- mutex_unlock(&trans_pcie->mutex);
- return ret;
-}
-
-static void iwl_trans_pcie_fw_alive(struct iwl_trans *trans, u32 scd_addr)
-{
- iwl_pcie_reset_ict(trans);
- iwl_pcie_tx_start(trans, scd_addr);
-}
-
static void _iwl_trans_pcie_stop_device(struct iwl_trans *trans, bool low_power)
{
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
@@ -1127,7 +1051,8 @@ static void _iwl_trans_pcie_stop_device(struct iwl_trans *trans, bool low_power)
* already dead.
*/
if (test_and_clear_bit(STATUS_DEVICE_ENABLED, &trans->status)) {
- IWL_DEBUG_INFO(trans, "DEVICE_ENABLED bit was set and is now cleared\n");
+ IWL_DEBUG_INFO(trans,
+ "DEVICE_ENABLED bit was set and is now cleared\n");
iwl_pcie_tx_stop(trans);
iwl_pcie_rx_stop(trans);
@@ -1161,7 +1086,6 @@ static void _iwl_trans_pcie_stop_device(struct iwl_trans *trans, bool low_power)
iwl_disable_interrupts(trans);
spin_unlock(&trans_pcie->irq_lock);
-
/* clear all status bits */
clear_bit(STATUS_SYNC_HCMD_ACTIVE, &trans->status);
clear_bit(STATUS_INT_ENABLED, &trans->status);
@@ -1194,10 +1118,116 @@ static void _iwl_trans_pcie_stop_device(struct iwl_trans *trans, bool low_power)
if (hw_rfkill != was_hw_rfkill)
iwl_trans_pcie_rf_kill(trans, hw_rfkill);
- /* re-take ownership to prevent other users from stealing the deivce */
+ /* re-take ownership to prevent other users from stealing the device */
iwl_pcie_prepare_card_hw(trans);
}
+static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
+ const struct fw_img *fw, bool run_in_rfkill)
+{
+ struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+ bool hw_rfkill;
+ int ret;
+
+ /* This may fail if AMT took ownership of the device */
+ if (iwl_pcie_prepare_card_hw(trans)) {
+ IWL_WARN(trans, "Exit HW not ready\n");
+ ret = -EIO;
+ goto out;
+ }
+
+ iwl_enable_rfkill_int(trans);
+
+ iwl_write32(trans, CSR_INT, 0xFFFFFFFF);
+
+ /*
+ * We enabled the RF-Kill interrupt and the handler may very
+ * well be running. Disable the interrupts to make sure no other
+ * interrupt can be fired.
+ */
+ iwl_disable_interrupts(trans);
+
+ /* Make sure it finished running */
+ synchronize_irq(trans_pcie->pci_dev->irq);
+
+ mutex_lock(&trans_pcie->mutex);
+
+ /* If platform's RF_KILL switch is NOT set to KILL */
+ hw_rfkill = iwl_is_rfkill_set(trans);
+ if (hw_rfkill)
+ set_bit(STATUS_RFKILL, &trans->status);
+ else
+ clear_bit(STATUS_RFKILL, &trans->status);
+ iwl_trans_pcie_rf_kill(trans, hw_rfkill);
+ if (hw_rfkill && !run_in_rfkill) {
+ ret = -ERFKILL;
+ goto out;
+ }
+
+ /* Someone called stop_device, don't try to start_fw */
+ if (trans_pcie->is_down) {
+ IWL_WARN(trans,
+ "Can't start_fw since the HW hasn't been started\n");
+ ret = EIO;
+ goto out;
+ }
+
+ /* make sure rfkill handshake bits are cleared */
+ iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
+ iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR,
+ CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
+
+ /* clear (again), then enable host interrupts */
+ iwl_write32(trans, CSR_INT, 0xFFFFFFFF);
+
+ ret = iwl_pcie_nic_init(trans);
+ if (ret) {
+ IWL_ERR(trans, "Unable to init nic\n");
+ goto out;
+ }
+
+ /*
+ * Now, we load the firmware and don't want to be interrupted, even
+ * by the RF-Kill interrupt (hence mask all the interrupt besides the
+ * FH_TX interrupt which is needed to load the firmware). If the
+ * RF-Kill switch is toggled, we will find out after having loaded
+ * the firmware and return the proper value to the caller.
+ */
+ iwl_enable_fw_load_int(trans);
+
+ /* really make sure rfkill handshake bits are cleared */
+ iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
+ iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
+
+ /* Load the given image to the HW */
+ if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
+ ret = iwl_pcie_load_given_ucode_8000(trans, fw);
+ else
+ ret = iwl_pcie_load_given_ucode(trans, fw);
+ iwl_enable_interrupts(trans);
+
+ /* re-check RF-Kill state since we may have missed the interrupt */
+ hw_rfkill = iwl_is_rfkill_set(trans);
+ if (hw_rfkill)
+ set_bit(STATUS_RFKILL, &trans->status);
+ else
+ clear_bit(STATUS_RFKILL, &trans->status);
+
+ iwl_trans_pcie_rf_kill(trans, hw_rfkill);
+ if (hw_rfkill && !run_in_rfkill)
+ ret = -ERFKILL;
+
+out:
+ mutex_unlock(&trans_pcie->mutex);
+ return ret;
+}
+
+static void iwl_trans_pcie_fw_alive(struct iwl_trans *trans, u32 scd_addr)
+{
+ iwl_pcie_reset_ict(trans);
+ iwl_pcie_tx_start(trans, scd_addr);
+}
+
static void iwl_trans_pcie_stop_device(struct iwl_trans *trans, bool low_power)
{
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
--
2.5.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/5] iwlwifi: pcie: fix erroneous return value
2016-02-15 11:57 pull request: iwlwifi-2016-02-16 Grumbach, Emmanuel
` (3 preceding siblings ...)
2016-02-15 11:59 ` [PATCH 4/5] iwlwifi: pcie: fix RF-Kill vs. firmware load race Emmanuel Grumbach
@ 2016-02-15 11:59 ` Emmanuel Grumbach
2016-02-16 16:02 ` pull request: iwlwifi-2016-02-16 Kalle Valo
2016-03-18 19:52 ` Arend Van Spriel
6 siblings, 0 replies; 9+ messages in thread
From: Emmanuel Grumbach @ 2016-02-15 11:59 UTC (permalink / raw)
To: linux-wireless; +Cc: Anton Protopopov, Emmanuel Grumbach
From: Anton Protopopov <a.s.protopopov@gmail.com>
The iwl_trans_pcie_start_fw() function may return the positive value EIO
instead of -EIO in case of error.
Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index 5503072..5a854c6 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -1168,7 +1168,7 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
if (trans_pcie->is_down) {
IWL_WARN(trans,
"Can't start_fw since the HW hasn't been started\n");
- ret = EIO;
+ ret = -EIO;
goto out;
}
--
2.5.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: pull request: iwlwifi-2016-02-16
2016-02-15 11:57 pull request: iwlwifi-2016-02-16 Grumbach, Emmanuel
` (4 preceding siblings ...)
2016-02-15 11:59 ` [PATCH 5/5] iwlwifi: pcie: fix erroneous return value Emmanuel Grumbach
@ 2016-02-16 16:02 ` Kalle Valo
2016-03-18 19:52 ` Arend Van Spriel
6 siblings, 0 replies; 9+ messages in thread
From: Kalle Valo @ 2016-02-16 16:02 UTC (permalink / raw)
To: Grumbach, Emmanuel; +Cc: linux-wireless@vger.kernel.org
"Grumbach, Emmanuel" <emmanuel.grumbach@intel.com> writes:
> This is a pull request for 4.5. Apart from my RF-Kill fix, the patches are
> really small. My RF-Kill patch needed to move code around to avoid adding
> a forward declaration and on the way there were a few very trivial code style
> fixes, that were needed to make checkpatch happy.
>
> Let me know if you have issues, thanks!
>
>
> The following changes since commit 69c7fda40921c125eeeef6a827f6270ac6aa1baa:
>
> iwlwifi: mvm: rs: fix TPC statistics handling (2016-01-26 16:03:35 +0200)
>
> are available in the git repository at:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git tags/iwlwifi-for-kalle-2016-02-15
Pulled, thanks.
--
Kalle Valo
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: pull request: iwlwifi-2016-02-16
2016-02-15 11:57 pull request: iwlwifi-2016-02-16 Grumbach, Emmanuel
` (5 preceding siblings ...)
2016-02-16 16:02 ` pull request: iwlwifi-2016-02-16 Kalle Valo
@ 2016-03-18 19:52 ` Arend Van Spriel
2016-03-18 20:03 ` Coelho, Luciano
6 siblings, 1 reply; 9+ messages in thread
From: Arend Van Spriel @ 2016-03-18 19:52 UTC (permalink / raw)
To: Coelho, Luciano; +Cc: linux-wireless@vger.kernel.org, Grumbach, Emmanuel
On 15-2-2016 12:57, Grumbach, Emmanuel wrote:
> * Luca fixes a very visible bug in scheduled scan: our firmware
> doesn't support scheduled scan with no profile configured and
> the supplicant sometimes requests such scheduled scans.
Hi Luca,
I have seen this happening as well, but did not find the exact scenario
in which supplicant does this. Would you happen to know?
Regards,
Arend
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: pull request: iwlwifi-2016-02-16
2016-03-18 19:52 ` Arend Van Spriel
@ 2016-03-18 20:03 ` Coelho, Luciano
0 siblings, 0 replies; 9+ messages in thread
From: Coelho, Luciano @ 2016-03-18 20:03 UTC (permalink / raw)
To: arend.vanspriel@broadcom.com
Cc: linux-wireless@vger.kernel.org, Grumbach, Emmanuel
SGkgQXJlbmQsDQoNCk9uIEZyaSwgMjAxNi0wMy0xOCBhdCAyMDo1MiArMDEwMCwgQXJlbmQgVmFu
IFNwcmllbCB3cm90ZToNCj4gT24gMTUtMi0yMDE2IDEyOjU3LCBHcnVtYmFjaCwgRW1tYW51ZWwg
d3JvdGU6DQo+ID4gDQo+ID4gKiBMdWNhIGZpeGVzIGEgdmVyeSB2aXNpYmxlIGJ1ZyBpbiBzY2hl
ZHVsZWQgc2Nhbjogb3VyIGZpcm13YXJlDQo+ID4gwqAgZG9lc24ndCBzdXBwb3J0IHNjaGVkdWxl
ZCBzY2FuIHdpdGggbm8gcHJvZmlsZSBjb25maWd1cmVkIGFuZA0KPiA+IMKgIHRoZSBzdXBwbGlj
YW50IHNvbWV0aW1lcyByZXF1ZXN0cyBzdWNoIHNjaGVkdWxlZCBzY2Fucy4NCj4gSGkgTHVjYSwN
Cj4gDQo+IEkgaGF2ZSBzZWVuIHRoaXMgaGFwcGVuaW5nIGFzIHdlbGwsIGJ1dCBkaWQgbm90IGZp
bmQgdGhlIGV4YWN0DQo+IHNjZW5hcmlvDQo+IGluIHdoaWNoIHN1cHBsaWNhbnQgZG9lcyB0aGlz
LiBXb3VsZCB5b3UgaGFwcGVuIHRvIGtub3c/DQoNCkkgZG9uJ3QgcmVtZW1iZXIgZXhhY3RseSB3
aGF0IHdhcyB0aGUgc2NlbmFyaW8sIGJ1dCBJIHRoaW5rIGl0IHdhcyB3aGVuDQp3cGFfcyBoYWQg
YSBzaW5nbGUgQVAgY29uZmlndXJlIGFuZCBmYWlsZWQgdG8gY29ubmVjdCB0byBpdCAoYW5kDQpi
bGFja2xpc3RlZCBpdCkuIMKgVGhlbiBpdCB3b3VsZCB0cnkgYSBjb3VwbGUgb2YgcmVndWxhciBz
Y2FucyB3aXRoDQpicm9hZGNhc3QgU1NJRCB0aGVuIHN3aXRjaCB0byBzY2hlZCBzY2FuLg0KDQpJ
J2xsIGRpZyB0aGUgYnVnIHVwIG5leHQgd2VlayBzbyBJIGNhbiB0ZWxsIHlvdSBmb3Igc3VyZS4N
Cg0KLS0NCkNoZWVycywNCkx1Y2Eu
^ permalink raw reply [flat|nested] 9+ messages in thread