lkml.org 
[lkml]   [2013]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 35/58] iwlwifi: pcie: disable L1 Active after pci_enable_device
    Date
    3.8.13.8 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

    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@linux.intel.com>
    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/net/wireless/iwlwifi/pcie/trans.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
    index 35708b9..be0f8b9 100644
    --- a/drivers/net/wireless/iwlwifi/pcie/trans.c
    +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
    @@ -1262,16 +1262,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
    spin_lock_init(&trans_pcie->irq_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));
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-09-03 19:21    [W:4.378 / U:0.508 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site