This is a note to let you know that I've just added the patch titled
iwlwifi: pcie: clear RFKILL interrupt in AMPG
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iwlwifi-pcie-clear-rfkill-interrupt-in-ampg.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a53ee0a308b16e392e0219c585b10f329345766b Mon Sep 17 00:00:00 2001
From: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
Date: Thu, 25 Jul 2013 13:14:34 +0300
Subject: iwlwifi: pcie: clear RFKILL interrupt in AMPG
From: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
commit a53ee0a308b16e392e0219c585b10f329345766b upstream.
If we forget to do so, we can't send HCMD to firmware while
the NIC is in RFKILL state.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/iwlwifi/iwl-prph.h | 2 ++
drivers/net/wireless/iwlwifi/pcie/rx.c | 8 ++++++++
2 files changed, 10 insertions(+)
--- a/drivers/net/wireless/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
@@ -97,6 +97,8 @@
#define APMG_PCIDEV_STT_VAL_L1_ACT_DIS (0x00000800)
+#define APMG_RTC_INT_STT_RFKILL (0x10000000)
+
/* Device system time */
#define DEVICE_SYSTEM_TIME_REG 0xA0206C
--- a/drivers/net/wireless/iwlwifi/pcie/rx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/rx.c
@@ -886,6 +886,14 @@ irqreturn_t iwl_pcie_irq_handler(int irq
iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
if (hw_rfkill) {
+ /*
+ * Clear the interrupt in APMG if the NIC is going down.
+ * Note that when the NIC exits RFkill (else branch), we
+ * can't access prph and the NIC will be reset in
+ * start_hw anyway.
+ */
+ iwl_write_prph(trans, APMG_RTC_INT_STT_REG,
+ APMG_RTC_INT_STT_RFKILL);
set_bit(STATUS_RFKILL, &trans_pcie->status);
if (test_and_clear_bit(STATUS_HCMD_ACTIVE,
&trans_pcie->status))
Patches currently in stable-queue which might be from emmanuel.grumbach@xxxxxxxxx are
queue-3.10/iwlwifi-mvm-refuse-connection-to-aps-with-bi-16.patch
queue-3.10/iwlwifi-pcie-clear-rfkill-interrupt-in-ampg.patch
queue-3.10/iwlwifi-mvm-fix-flushing-not-started-aggregation-sessions.patch
queue-3.10/iwlwifi-add-dell-sku-for-5150-hmc.patch
queue-3.10/iwlwifi-mvm-fix-l2p-ba-ressources-leak.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html