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

Commit eabc4ac5 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: pcie: disable L1 Active after pci_enable_device 



As Arjan pointed out, we mustn't do anything related to PCI
configuration until the device is properly enabled with
pci_enable_device().

Cc: stable@vger.kernel.org
Reported-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 9186a1fd

drivers/net/wireless/iwlwifi/pcie/trans.c

+5 −5
Original line number Diff line number Diff line
@@ -1502,16 +1502,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, 
	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));