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

Commit 4f0c848a authored by Guy Cohen's avatar Guy Cohen Committed by Johannes Berg
Browse files

Revert "iwlwifi: pcie: clear RFKILL interrupt in AMPG" 



This reverts commit a53ee0a3.

This fix causes a worse HW Error when entering RF-Kill.

Signed-off-by: default avatarGuy Cohen <guy.cohen@intel.com>
Signed-off-by: default avatarDor Shaish <dor.shaish@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent eabc4ac5

drivers/net/wireless/iwlwifi/iwl-prph.h

+0 −2
Original line number Diff line number Diff line
@@ -97,8 +97,6 @@ 


#define APMG_PCIDEV_STT_VAL_L1_ACT_DIS		(0x00000800)



#define APMG_RTC_INT_STT_RFKILL		(0x10000000)



/* Device system time */

#define DEVICE_SYSTEM_TIME_REG 0xA0206C

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

+0 −8
Original line number Diff line number Diff line
@@ -888,14 +888,6 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id) 


		iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);

		if (hw_rfkill) {

			/*

			 * Clear the interrupt in APMG if the NIC is going down.

			 * Note that when the NIC exits RFkill (else branch), we

			 * can't access prph and the NIC will be reset in

			 * start_hw anyway.

			 */

			iwl_write_prph(trans, APMG_RTC_INT_STT_REG,

				       APMG_RTC_INT_STT_RFKILL);

			set_bit(STATUS_RFKILL, &trans_pcie->status);

			if (test_and_clear_bit(STATUS_HCMD_ACTIVE,

					       &trans_pcie->status))