This is a note to let you know that I've just added the patch titled
iwlwifi: pcie: disable L1 Active after pci_enable_device
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-disable-l1-active-after-pci_enable_device.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 eabc4ac5d7606a57ee2b7308cb7323ea8f60183b Mon Sep 17 00:00:00 2001
From: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
Date: Mon, 29 Jul 2013 23:05:18 +0300
Subject: iwlwifi: pcie: disable L1 Active after pci_enable_device
From: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
commit eabc4ac5d7606a57ee2b7308cb7323ea8f60183b upstream.
As Arjan pointed out, we mustn't do anything related to PCI
configuration until the device is properly enabled with
pci_enable_device().
Reported-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
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/pcie/trans.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -1481,16 +1481,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s
spin_lock_init(&trans_pcie->reg_lock);
init_waitqueue_head(&trans_pcie->ucode_write_waitq);
- /* W/A - seems to solve weird behavior. We need to remove this if we
- * don't want to stay in L1 all the time. This wastes a lot of power */
- pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
- PCIE_LINK_STATE_CLKPM);
-
if (pci_enable_device(pdev)) {
err = -ENODEV;
goto out_no_pci;
}
+ /* W/A - seems to solve weird behavior. We need to remove this if we
+ * don't want to stay in L1 all the time. This wastes a lot of power */
+ pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
+ PCIE_LINK_STATE_CLKPM);
+
pci_set_master(pdev);
err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));
Patches currently in stable-queue which might be from emmanuel.grumbach@xxxxxxxxx are
queue-3.10/iwlwifi-mvm-correctly-configure-mcast-in-ap-mode.patch
queue-3.10/iwlwifi-pcie-disable-l1-active-after-pci_enable_device.patch
queue-3.10/iwlwifi-mvm-unregister-leds-when-registration-failed.patch
queue-3.10/iwlwifi-mvm-properly-tell-the-fw-that-a-sta-is-awake.patch
queue-3.10/iwlwifi-mvm-fix-mcast-in-ap-mode.patch
queue-3.10/iwlwifi-mvm-take-the-seqno-from-packet-if-transmit-failed.patch
queue-3.10/iwlwifi-dvm-fix-calling-ieee80211_chswitch_done-with-null.patch
queue-3.10/iwlwifi-mvm-don-t-set-the-mcast-queue-in-sta-s-queue-list.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