Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a7123cd authored by John W. Linville's avatar John W. Linville
Browse files

iwlwifi: disable aspm by default 



Some iwlwifi devices inexplicably disconnect themselves from the PCI-E
bus causing the predictable failures.  This seems to disappear if ASPM
is disabled.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c61029c7

drivers/net/wireless/iwlwifi/iwl-agn.c

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/module.h>

#include <linux/init.h>

#include <linux/pci.h>

#include <linux/pci-aspm.h>

#include <linux/slab.h>

#include <linux/dma-mapping.h>

#include <linux/delay.h>
@@ -3968,6 +3969,9 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/**************************

	 * 2. Initializing PCI bus

	 **************************/

	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_ieee80211_free_hw;

drivers/net/wireless/iwlwifi/iwl3945-base.c

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/module.h>

#include <linux/init.h>

#include <linux/pci.h>

#include <linux/pci-aspm.h>

#include <linux/slab.h>

#include <linux/dma-mapping.h>

#include <linux/delay.h>
@@ -3963,6 +3964,9 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e 
	/***************************

	 * 2. Initializing PCI bus

	 * *************************/

	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_ieee80211_free_hw;