Commit d43c01d3 authored by Johannes Berg's avatar Johannes Berg Committed by Miri Korenblit
Browse files

wifi: iwlwifi: trans: remove SCD base address validation 



We pass this parameter around a lot of places just to
validate what the firmware told us against the hardware
with a warning, which seems to never trigger. Remove it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250503224232.5405014d7f88.I3b74a1fd51a39c6df5674f2994189092d1635e7f@changeid
parent 8f756120

drivers/net/wireless/intel/iwlwifi/dvm/ucode.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static int iwl_alive_notify(struct iwl_priv *priv) 
	int ret;

	int i;



	iwl_trans_fw_alive(priv->trans, 0);

	iwl_trans_fw_alive(priv->trans);



	if (priv->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_PAN &&

	    priv->nvm_data->sku_cap_ipan_enable) {

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

+2 −2
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ iwl_trans_release_nic_access(struct iwl_trans *trans) 
}

IWL_EXPORT_SYMBOL(iwl_trans_release_nic_access);



void iwl_trans_fw_alive(struct iwl_trans *trans, u32 scd_addr)

void iwl_trans_fw_alive(struct iwl_trans *trans)

{

	might_sleep();
@@ -586,7 +586,7 @@ void iwl_trans_fw_alive(struct iwl_trans *trans, u32 scd_addr) 
	if (trans->trans_cfg->gen2)

		iwl_trans_pcie_gen2_fw_alive(trans);

	else

		iwl_trans_pcie_fw_alive(trans, scd_addr);

		iwl_trans_pcie_fw_alive(trans);

}

IWL_EXPORT_SYMBOL(iwl_trans_fw_alive);

drivers/net/wireless/intel/iwlwifi/iwl-trans.h

+1 −1
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ int iwl_trans_start_hw(struct iwl_trans *trans); 


void iwl_trans_op_mode_leave(struct iwl_trans *trans);



void iwl_trans_fw_alive(struct iwl_trans *trans, u32 scd_addr);

void iwl_trans_fw_alive(struct iwl_trans *trans);



int iwl_trans_start_fw(struct iwl_trans *trans, const struct iwl_fw *fw,

		       enum iwl_ucode_type ucode_type, bool run_in_rfkill);

drivers/net/wireless/intel/iwlwifi/mld/fw.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int iwl_mld_load_fw_wait_alive(struct iwl_mld *mld) 
		return -EIO;

	}



	iwl_trans_fw_alive(mld->trans, 0);

	iwl_trans_fw_alive(mld->trans);



	return 0;

}

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

+1 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 


struct iwl_mvm_alive_data {

	bool valid;

	u32 scd_base_addr;

};



static int iwl_send_tx_ant_cfg(struct iwl_mvm *mvm, u8 valid_tx_ant)
@@ -244,7 +243,6 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait, 
		}

	}



	alive_data->scd_base_addr = le32_to_cpu(lmac1->dbg_ptrs.scd_base_ptr);

	alive_data->valid = status == IWL_ALIVE_STATUS_OK;



	IWL_DEBUG_FW(mvm,
@@ -429,7 +427,7 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm, 
	/* if reached this point, Alive notification was received */

	iwl_mei_alive_notif(true);



	iwl_trans_fw_alive(mvm->trans, alive_data.scd_base_addr);

	iwl_trans_fw_alive(mvm->trans);



	ret = iwl_pnvm_load(mvm->trans, &mvm->notif_wait,

			    &mvm->fw->ucode_capa);