From 4e6a8cb530b51d6622c1cf29549b003b337b3bb1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 8 Aug 2013 18:25:17 -0700 Subject: [PATCH] delete queue-3.10/iwlwifi-pcie-clear-rfkill-interrupt-in-ampg.patch --- ...-pcie-clear-rfkill-interrupt-in-ampg.patch | 49 ------------------- queue-3.10/series | 1 - 2 files changed, 50 deletions(-) delete mode 100644 queue-3.10/iwlwifi-pcie-clear-rfkill-interrupt-in-ampg.patch diff --git a/queue-3.10/iwlwifi-pcie-clear-rfkill-interrupt-in-ampg.patch b/queue-3.10/iwlwifi-pcie-clear-rfkill-interrupt-in-ampg.patch deleted file mode 100644 index fd465be2ee0..00000000000 --- a/queue-3.10/iwlwifi-pcie-clear-rfkill-interrupt-in-ampg.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a53ee0a308b16e392e0219c585b10f329345766b Mon Sep 17 00:00:00 2001 -From: Emmanuel Grumbach -Date: Thu, 25 Jul 2013 13:14:34 +0300 -Subject: iwlwifi: pcie: clear RFKILL interrupt in AMPG - -From: Emmanuel Grumbach - -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 -Signed-off-by: Johannes Berg -Signed-off-by: Greg Kroah-Hartman - ---- - 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)) diff --git a/queue-3.10/series b/queue-3.10/series index 2371126dba4..d76968a79c9 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -32,7 +32,6 @@ iwlwifi-mvm-fix-bug-in-scan-ssid.patch iwlwifi-mvm-refuse-connection-to-aps-with-bi-16.patch iwlwifi-add-dell-sku-for-5150-hmc.patch iwlwifi-mvm-fix-flushing-not-started-aggregation-sessions.patch -iwlwifi-pcie-clear-rfkill-interrupt-in-ampg.patch ath9k_htc-do-some-initial-hardware-configuration.patch ath9k_htc-reboot-firmware-if-it-was-loaded.patch nl80211-fix-mgmt-tx-status-and-testmode-reporting-for-netns.patch -- 2.47.3