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

Commit 132db31c authored by Golan Ben-Ami's avatar Golan Ben-Ami Committed by Luca Coelho
Browse files

iwlwifi: introduce Image Loader (IML) - new firmware image 



In future devices a new image will be introduced - IML. The IML, image
loader, is loaded by the ROM, and as part of the new self-init flow,
loads the rest of the firmware images to the device.

Store the image, so the ROM can load it to the device.

Signed-off-by: default avatarGolan Ben Ami <golan.ben.ami@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent a8cbb46f

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

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -35,6 +36,7 @@ 
 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -143,6 +145,7 @@ enum iwl_ucode_tlv_type { 
	IWL_UCODE_TLV_FW_DBG_TRIGGER	= 40,

	IWL_UCODE_TLV_FW_GSCAN_CAPA	= 50,

	IWL_UCODE_TLV_FW_MEM_SEG	= 51,

	IWL_UCODE_TLV_IML		= 52,

};



struct iwl_ucode_tlv {

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

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016        Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -35,6 +36,7 @@ 
 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016        Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -241,6 +243,8 @@ enum iwl_fw_type { 
 * @ucode_ver: ucode version from the ucode file

 * @fw_version: firmware version string

 * @img: ucode image like ucode_rt, ucode_init, ucode_wowlan.

 * @iml_len: length of the image loader image

 * @iml: image loader fw image

 * @ucode_capa: capabilities parsed from the ucode file.

 * @enhance_sensitivity_table: device can do enhanced sensitivity.

 * @init_evtlog_ptr: event log offset for init ucode.
@@ -267,6 +271,8 @@ struct iwl_fw { 


	/* ucode images */

	struct fw_img img[IWL_UCODE_TYPE_MAX];

	size_t iml_len;

	u8 *iml;



	struct iwl_ucode_capabilities ucode_capa;

	bool enhance_sensitivity_table;

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

+8 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ static void iwl_dealloc_ucode(struct iwl_drv *drv) 
	for (i = 0; i < ARRAY_SIZE(drv->fw.dbg_trigger_tlv); i++)

		kfree(drv->fw.dbg_trigger_tlv[i]);

	kfree(drv->fw.dbg_mem_tlv);

	kfree(drv->fw.iml);



	for (i = 0; i < IWL_UCODE_TYPE_MAX; i++)

		iwl_free_fw_img(drv, drv->fw.img + i);
@@ -1126,6 +1127,13 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv, 
			pieces->n_dbg_mem_tlv++;

			break;

			}

		case IWL_UCODE_TLV_IML: {

			drv->fw.iml_len = tlv_len;

			drv->fw.iml = kmemdup(tlv_data, tlv_len, GFP_KERNEL);

			if (!drv->fw.iml)

				return -ENOMEM;

			break;

			}

		default:

			IWL_DEBUG_INFO(drv, "unknown TLV: %d\n", tlv_type);

			break;

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

+5 −0
Original line number Diff line number Diff line
@@ -691,6 +691,8 @@ enum iwl_plat_pm_mode { 
 * @wide_cmd_header: true when ucode supports wide command header format

 * @num_rx_queues: number of RX queues allocated by the transport;

 *	the transport must set this before calling iwl_drv_start()

 * @iml_len: the length of the image loader

 * @iml: a pointer to the image loader itself

 * @dev_cmd_pool: pool for Tx cmd allocation - for internal use only.

 *	The user should use iwl_trans_{alloc,free}_tx_cmd.

 * @rx_mpdu_cmd: MPDU RX command ID, must be assigned by opmode before
@@ -735,6 +737,9 @@ struct iwl_trans { 


	u8 num_rx_queues;



	size_t iml_len;

	u8 *iml;



	/* The following fields are internal only */

	struct kmem_cache *dev_cmd_pool;

	char dev_cmd_pool_name[50];

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

+3 −0
Original line number Diff line number Diff line
@@ -739,6 +739,9 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
	       sizeof(trans->dbg_conf_tlv));

	trans->dbg_trigger_tlv = mvm->fw->dbg_trigger_tlv;



	trans->iml = mvm->fw->iml;

	trans->iml_len = mvm->fw->iml_len;



	/* set up notification wait support */

	iwl_notification_wait_init(&mvm->notif_wait);