diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-05-09 15:35:06 +0200 |
|---|---|---|
| committer | Luca Coelho <luciano.coelho@intel.com> | 2017-06-23 12:27:31 +0300 |
| commit | c00ee467b3bf73c9505b1ea308a263ae3c5aab5d (patch) | |
| tree | 591fd409a5c78725eae3fd92fbde2952ebafa02d /drivers/net/wireless/intel/iwlwifi/pcie | |
| parent | 3b9449bb1df756cd16bfe50616392fb7caa1211d (diff) | |
| download | linux-stable-c00ee467b3bf73c9505b1ea308a263ae3c5aab5d.tar.gz linux-stable-c00ee467b3bf73c9505b1ea308a263ae3c5aab5d.tar.bz2 linux-stable-c00ee467b3bf73c9505b1ea308a263ae3c5aab5d.zip | |
iwlwifi: pcie: work around suspend/resume issue
In some platforms, having the device enabled with certain radio
frontends causes the platform to not be able to resume properly
from suspend, regardless of the wakeup cause. This was traced to
a hardware issue with the integrated 9000-series A-step variant.
Set the right hardware bit to disable the problematic state.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/pcie')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c index 233b6734c237..5778ba2278d1 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c @@ -3134,6 +3134,17 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, } } + /* + * 9000-series integrated A-step has a problem with suspend/resume + * and sometimes even causes the whole platform to get stuck. This + * workaround makes the hardware not go into the problematic state. + */ + if (trans->cfg->integrated && + trans->cfg->device_family == IWL_DEVICE_FAMILY_9000 && + CSR_HW_REV_STEP(trans->hw_rev) == SILICON_A_STEP) + iwl_set_bit(trans, CSR_HOST_CHICKEN, + CSR_HOST_CHICKEN_PM_IDLE_SRC_DIS_SB_PME); + trans->hw_rf_id = iwl_read32(trans, CSR_HW_RF_ID); iwl_pcie_set_interrupt_capa(pdev, trans); |