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

wifi: iwlwifi: pcie: fix a few legacy register accesses for new devices 



Do not access legacy bits for new devices, this has no effect.
Somehow, wowlan worked despite the usage of the wrong bits. Now
that we want to keep the firmware loaded during suspend even without
wowlan, this change is needed.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20240618200104.399d4d215210.Id12e7fdb7bab9f2c4c0d292519b5c1b4753a8c84@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1decf05d

drivers/net/wireless/intel/iwlwifi/iwl-io.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2003-2014, 2018-2022 Intel Corporation

 * Copyright (C) 2003-2014, 2018-2022, 2024 Intel Corporation

 * Copyright (C) 2015-2016 Intel Deutschland GmbH

 */

#include <linux/delay.h>
@@ -460,7 +460,7 @@ int iwl_finish_nic_init(struct iwl_trans *trans) 
	 */

	if (cfg_trans->device_family >= IWL_DEVICE_FAMILY_BZ) {

		iwl_set_bit(trans, CSR_GP_CNTRL,

			    CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY |

			    CSR_GP_CNTRL_REG_FLAG_BZ_MAC_ACCESS_REQ |

			    CSR_GP_CNTRL_REG_FLAG_MAC_INIT);

		poll_ready = CSR_GP_CNTRL_REG_FLAG_MAC_STATUS;

	} else {

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

+17 −5
Original line number Diff line number Diff line
@@ -1504,9 +1504,17 @@ void iwl_pcie_d3_complete_suspend(struct iwl_trans *trans, 


	iwl_pcie_synchronize_irqs(trans);



	if (trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ) {

		iwl_clear_bit(trans, CSR_GP_CNTRL,

			      CSR_GP_CNTRL_REG_FLAG_BZ_MAC_ACCESS_REQ);

		iwl_clear_bit(trans, CSR_GP_CNTRL,

			      CSR_GP_CNTRL_REG_FLAG_MAC_INIT);

	} else {

		iwl_clear_bit(trans, CSR_GP_CNTRL,

			      CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);

	iwl_clear_bit(trans, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);

		iwl_clear_bit(trans, CSR_GP_CNTRL,

			      CSR_GP_CNTRL_REG_FLAG_INIT_DONE);

	}



	if (reset) {

		/*
@@ -1584,6 +1592,10 @@ int iwl_trans_pcie_d3_resume(struct iwl_trans *trans, 
		goto out;

	}



	if (trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ)

		iwl_set_bit(trans, CSR_GP_CNTRL,

			    CSR_GP_CNTRL_REG_FLAG_BZ_MAC_ACCESS_REQ);

	else

		iwl_set_bit(trans, CSR_GP_CNTRL,

			    CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);