iwlwifi: pcie: fix 9000-series RF-kill interrupt propagation

A hardware issue on 9000 series devices sometimes causes RF-kill
interrupts to not be propagated to the host properly if ASPM is
enabled. Work around this by setting the right hardware bit to
allow it to interrupt the host for this reason (rfkill).

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
index e239b1d92cf91bf3ad2ee3edd5a7b6f5c024b730..c6c1876c1ad4e190622defefddcb2849d3e3c558 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
@@ -312,7 +312,7 @@
 #define CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN           (0x00000001)
 
 #define CSR_GP_CNTRL_REG_MSK_POWER_SAVE_TYPE         (0x07000000)
-#define CSR_GP_CNTRL_REG_FLAG_MAC_POWER_SAVE         (0x04000000)
+#define CSR_GP_CNTRL_REG_FLAG_RFKILL_WAKE_L1A_EN     (0x04000000)
 #define CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW          (0x08000000)
 
 

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
index 1f4bc933f0f24b139e8039fbb1d6dbb5997fcd2d..7ec2d96cccebaa67e39b2d8db30b5c5a184208d9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
@@ -674,6 +674,16 @@ static inline void iwl_enable_rfkill_int(struct iwl_trans *trans)
                iwl_enable_hw_int_msk_msix(trans,
                                           MSIX_HW_INT_CAUSES_REG_RF_KILL);
        }
+
+       if (trans->cfg->device_family == IWL_DEVICE_FAMILY_9000) {
+               /*
+                * On 9000-series devices this bit isn't enabled by default, so
+                * when we power down the device we need set the bit to allow it
+                * to wake up the PCI-E bus for RF-kill interrupts.
+                */
+               iwl_set_bit(trans, CSR_GP_CNTRL,
+                           CSR_GP_CNTRL_REG_FLAG_RFKILL_WAKE_L1A_EN);
+       }
 }
 
 void iwl_pcie_handle_rfkill_irq(struct iwl_trans *trans);