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

Commit 702e975d authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: track current firmware image in common code 



Track the current firmware image in the common code instead
of in the opmode so that later patches can access it there
in a common way.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent d0b813fc

drivers/net/wireless/intel/iwlwifi/fw/runtime.h

+10 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ struct iwl_fwrt_shared_mem_cfg { 
 * @num_of_paging_blk: number of paging blocks

 * @num_of_pages_in_last_blk: number of pages in the last block

 * @smem_cfg: saved firmware SMEM configuration

 * @cur_fw_img: current firmware image, must be maintained by

 *	the driver by calling &iwl_fw_set_current_image()

 */

struct iwl_fw_runtime {

	struct iwl_trans *trans;
@@ -96,6 +98,8 @@ struct iwl_fw_runtime { 
	u16 num_of_paging_blk;

	u16 num_of_pages_in_last_blk;



	enum iwl_ucode_type cur_fw_img;



	/* memory configuration */

	struct iwl_fwrt_shared_mem_cfg smem_cfg;

};
@@ -110,6 +114,12 @@ static inline void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, 
	fwrt->dev = trans->dev;

}



static inline void iwl_fw_set_current_image(struct iwl_fw_runtime *fwrt,

					    enum iwl_ucode_type cur_fw_img)

{

	fwrt->cur_fw_img = cur_fw_img;

}



int iwl_init_paging(struct iwl_fw_runtime *fwrt, enum iwl_ucode_type type);

void iwl_free_fw_paging(struct iwl_fw_runtime *fwrt);

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

+6 −6
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static ssize_t iwl_dbgfs_ctdp_budget_read(struct file *file, 
	int pos, budget;



	if (!iwl_mvm_firmware_running(mvm) ||

	    mvm->cur_ucode != IWL_UCODE_REGULAR)

	    mvm->fwrt.cur_fw_img != IWL_UCODE_REGULAR)

		return -EIO;



	mutex_lock(&mvm->mutex);
@@ -105,7 +105,7 @@ static ssize_t iwl_dbgfs_stop_ctdp_write(struct iwl_mvm *mvm, char *buf, 
	int ret;



	if (!iwl_mvm_firmware_running(mvm) ||

	    mvm->cur_ucode != IWL_UCODE_REGULAR)

	    mvm->fwrt.cur_fw_img != IWL_UCODE_REGULAR)

		return -EIO;



	mutex_lock(&mvm->mutex);
@@ -122,7 +122,7 @@ static ssize_t iwl_dbgfs_tx_flush_write(struct iwl_mvm *mvm, char *buf, 
	u32 flush_arg;



	if (!iwl_mvm_firmware_running(mvm) ||

	    mvm->cur_ucode != IWL_UCODE_REGULAR)

	    mvm->fwrt.cur_fw_img != IWL_UCODE_REGULAR)

		return -EIO;



	if (kstrtou32(buf, 0, &flush_arg))
@@ -155,7 +155,7 @@ static ssize_t iwl_dbgfs_sta_drain_write(struct iwl_mvm *mvm, char *buf, 
	int sta_id, drain, ret;



	if (!iwl_mvm_firmware_running(mvm) ||

	    mvm->cur_ucode != IWL_UCODE_REGULAR)

	    mvm->fwrt.cur_fw_img != IWL_UCODE_REGULAR)

		return -EIO;



	if (sscanf(buf, "%d %d", &sta_id, &drain) != 2)
@@ -192,7 +192,7 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file, char __user *user_buf, 
		return -EINVAL;



	/* default is to dump the entire data segment */

	img = &mvm->fw->img[mvm->cur_ucode];

	img = &mvm->fw->img[mvm->fwrt.cur_fw_img];

	ofs = img->sec[IWL_UCODE_SECTION_DATA].offset;

	len = img->sec[IWL_UCODE_SECTION_DATA].len;
@@ -224,7 +224,7 @@ static ssize_t iwl_dbgfs_sram_write(struct iwl_mvm *mvm, char *buf, 
	if (!iwl_mvm_firmware_running(mvm))

		return -EINVAL;



	img = &mvm->fw->img[mvm->cur_ucode];

	img = &mvm->fw->img[mvm->fwrt.cur_fw_img];

	img_offset = img->sec[IWL_UCODE_SECTION_DATA].offset;

	img_len = img->sec[IWL_UCODE_SECTION_DATA].len;

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

+3 −3
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) 
	if (!mvm->cfg->dccm_offset || !mvm->cfg->dccm_len) {

		const struct fw_img *img;



		img = &mvm->fw->img[mvm->cur_ucode];

		img = &mvm->fw->img[mvm->fwrt.cur_fw_img];

		sram_ofs = img->sec[IWL_UCODE_SECTION_DATA].offset;

		sram_len = img->sec[IWL_UCODE_SECTION_DATA].len;

	} else {
@@ -693,7 +693,7 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) 


	/* Make room for fw's virtual image pages, if it exists */

	if (!mvm->trans->cfg->gen2 &&

	    mvm->fw->img[mvm->cur_ucode].paging_mem_size &&

	    mvm->fw->img[mvm->fwrt.cur_fw_img].paging_mem_size &&

	    mvm->fwrt.fw_paging_db[0].fw_paging_block)

		file_len += mvm->fwrt.num_of_paging_blk *

			(sizeof(*dump_data) +
@@ -832,7 +832,7 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) 


	/* Dump fw's virtual image */

	if (!mvm->trans->cfg->gen2 &&

	    mvm->fw->img[mvm->cur_ucode].paging_mem_size &&

	    mvm->fw->img[mvm->fwrt.cur_fw_img].paging_mem_size &&

	    mvm->fwrt.fw_paging_db[0].fw_paging_block) {

		for (i = 1; i < mvm->fwrt.num_of_paging_blk + 1; i++) {

			struct iwl_fw_error_dump_paging *paging;

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

+7 −7
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm, 
	struct iwl_mvm_alive_data alive_data;

	const struct fw_img *fw;

	int ret, i;

	enum iwl_ucode_type old_type = mvm->cur_ucode;

	enum iwl_ucode_type old_type = mvm->fwrt.cur_fw_img;

	static const u16 alive_cmd[] = { MVM_ALIVE };

	struct iwl_sf_region st_fwrd_space;
@@ -264,7 +264,7 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm, 
		fw = iwl_get_ucode_image(mvm->fw, ucode_type);

	if (WARN_ON(!fw))

		return -EINVAL;

	mvm->cur_ucode = ucode_type;

	iwl_fw_set_current_image(&mvm->fwrt, ucode_type);

	clear_bit(IWL_MVM_STATUS_FIRMWARE_RUNNING, &mvm->status);



	iwl_init_notification_wait(&mvm->notif_wait, &alive_wait,
@@ -273,7 +273,7 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm, 


	ret = iwl_trans_start_fw(mvm->trans, fw, ucode_type == IWL_UCODE_INIT);

	if (ret) {

		mvm->cur_ucode = old_type;

		iwl_fw_set_current_image(&mvm->fwrt, old_type);

		iwl_remove_notification(&mvm->notif_wait, &alive_wait);

		return ret;

	}
@@ -297,13 +297,13 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm, 
				"SecBoot CPU1 Status: 0x%x, CPU2 Status: 0x%x\n",

				iwl_read_prph(trans, SB_CPU_1_STATUS),

				iwl_read_prph(trans, SB_CPU_2_STATUS));

		mvm->cur_ucode = old_type;

		iwl_fw_set_current_image(&mvm->fwrt, old_type);

		return ret;

	}



	if (!alive_data.valid) {

		IWL_ERR(mvm, "Loaded ucode is not valid!\n");

		mvm->cur_ucode = old_type;

		iwl_fw_set_current_image(&mvm->fwrt, old_type);

		return -EIO;

	}
@@ -432,7 +432,7 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) 
static int iwl_send_phy_cfg_cmd(struct iwl_mvm *mvm)

{

	struct iwl_phy_cfg_cmd phy_cfg_cmd;

	enum iwl_ucode_type ucode_type = mvm->cur_ucode;

	enum iwl_ucode_type ucode_type = mvm->fwrt.cur_fw_img;



	/* Set parameters */

	phy_cfg_cmd.phy_cfg = cpu_to_le32(iwl_mvm_get_phy_config(mvm));
@@ -1064,7 +1064,7 @@ static int iwl_mvm_load_rt_fw(struct iwl_mvm *mvm) 
	if (ret)

		return ret;



	return iwl_init_paging(&mvm->fwrt, mvm->cur_ucode);

	return iwl_init_paging(&mvm->fwrt, mvm->fwrt.cur_fw_img);

}



int iwl_mvm_up(struct iwl_mvm *mvm)

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+0 −1
Original line number Diff line number Diff line
@@ -754,7 +754,6 @@ struct iwl_mvm { 
	 */

	struct iwl_mvm_vif *bf_allowed_vif;



	enum iwl_ucode_type cur_ucode;

	bool hw_registered;

	bool calibrating;

	u32 error_event_table[2];