Commit b201944a authored by Miri Korenblit's avatar Miri Korenblit Committed by Gregory Greenman
Browse files

wifi: iwlwifi: mvm: Don't use deprecated register 



The CSR_HW_IF_CONFIG_REG register is no longer in use from
IWL_DEVICE_FAMILY_AX210 and on.
This register uses now for CSR_CTXT_INFO_BOOT_CTRL
which has a different meaning and a different format.
Currently we're writing to the register according to
CSR_HW_IF_CONFIG_REGs format, regardless to the device family.
This causes to miss-interpretation of the register value, as it is
parsed according to CSR_CTXT_INFO_BOOT_CTRLs format for devices
families >= IWL_DEVICE_FAMILY_AX210.
Fix this by writing to the register according to the old format
only for the relevant hardware.

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20221205102808.8e91eb10dc7d.I3882a2452785ef8b455d99af235e4477917bf46d@changeid
parent 3a27a1a1

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

+6 −3
Original line number Diff line number Diff line
@@ -92,6 +92,12 @@ static void iwl_mvm_nic_config(struct iwl_op_mode *op_mode) 
	radio_cfg_dash = (phy_config & FW_PHY_CFG_RADIO_DASH) >>

			 FW_PHY_CFG_RADIO_DASH_POS;



	IWL_DEBUG_INFO(mvm, "Radio type=0x%x-0x%x-0x%x\n", radio_cfg_type,

		       radio_cfg_step, radio_cfg_dash);



	if (mvm->trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_AX210)

		return;



	/* SKU control */

	reg_val = CSR_HW_REV_STEP_DASH(mvm->trans->hw_rev);
@@ -127,9 +133,6 @@ static void iwl_mvm_nic_config(struct iwl_op_mode *op_mode) 
				CSR_HW_IF_CONFIG_REG_D3_DEBUG,

				reg_val);



	IWL_DEBUG_INFO(mvm, "Radio type=0x%x-0x%x-0x%x\n", radio_cfg_type,

		       radio_cfg_step, radio_cfg_dash);



	/*

	 * W/A : NIC is stuck in a reset state after Early PCIe power off

	 * (PCIe power is lost before PERST# is asserted), causing ME FW