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

Commit 6a822d06 authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlwifi: add TLV to specify the size of phy calibration table 



Different devices have different size of phy calibration table; add
new TLV to specify the size. If the TLV is not part of uCode header, the
default table size will be used to make sure the backward
compatibilities.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent ffb7d896

drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static void iwlagn_gain_computation(struct iwl_priv *priv, 


		memset(&cmd, 0, sizeof(cmd));



		cmd.hdr.op_code = IWL_PHY_CALIBRATE_CHAIN_NOISE_GAIN_CMD;

		cmd.hdr.op_code = priv->_agn.phy_calib_chain_noise_gain_cmd;

		cmd.hdr.first_group = 0;

		cmd.hdr.groups_num = 1;

		cmd.hdr.data_valid = 1;
@@ -197,7 +197,7 @@ static void iwlagn_chain_noise_reset(struct iwl_priv *priv) 
		data->beacon_count = 0;



		memset(&cmd, 0, sizeof(cmd));

		cmd.hdr.op_code = IWL_PHY_CALIBRATE_CHAIN_NOISE_RESET_CMD;

		cmd.hdr.op_code = priv->_agn.phy_calib_chain_noise_reset_cmd;

		cmd.hdr.first_group = 0;

		cmd.hdr.groups_num = 1;

		cmd.hdr.data_valid = 1;

drivers/net/wireless/iwlwifi/iwl-agn.c

+24 −0
Original line number Diff line number Diff line
@@ -1692,6 +1692,7 @@ static void iwl_nic_start(struct iwl_priv *priv) 


struct iwlagn_ucode_capabilities {

	u32 max_probe_length;

	u32 standard_phy_calibration_size;

};



static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context);
@@ -1967,6 +1968,13 @@ static int iwlagn_load_firmware(struct iwl_priv *priv, 
			else

				priv->enhance_sensitivity_table = true;

			break;

		case IWL_UCODE_TLV_PHY_CALIBRATION_SIZE:

			if (tlv_len != fixed_tlv_size)

				ret = -EINVAL;

			else

				capa->standard_phy_calibration_size =

					le32_to_cpup((__le32 *)tlv_data);

			break;

		default:

			IWL_WARN(priv, "unknown TLV: %d\n", tlv_type);

			break;
@@ -2005,6 +2013,8 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) 
	u32 build;

	struct iwlagn_ucode_capabilities ucode_capa = {

		.max_probe_length = 200,

		.standard_phy_calibration_size =

			IWL_MAX_STANDARD_PHY_CALIBRATE_TBL_SIZE,

	};



	memset(&pieces, 0, sizeof(pieces));
@@ -2226,6 +2236,20 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) 
			pieces.boot_size);

	memcpy(priv->ucode_boot.v_addr, pieces.boot, pieces.boot_size);



	/*

	 * figure out the offset of chain noise reset and gain commands

	 * base on the size of standard phy calibration commands table size

	 */

	if (ucode_capa.standard_phy_calibration_size >

	    IWL_MAX_PHY_CALIBRATE_TBL_SIZE)

		ucode_capa.standard_phy_calibration_size =

			IWL_MAX_STANDARD_PHY_CALIBRATE_TBL_SIZE;



	priv->_agn.phy_calib_chain_noise_reset_cmd =

		ucode_capa.standard_phy_calibration_size;

	priv->_agn.phy_calib_chain_noise_gain_cmd =

		ucode_capa.standard_phy_calibration_size + 1;



	/**************************************************

	 * This is still part of probe() in a sense...

	 *

drivers/net/wireless/iwlwifi/iwl-commands.h

+2 −2
Original line number Diff line number Diff line
@@ -3660,10 +3660,10 @@ enum { 
	IWL_PHY_CALIBRATE_CRYSTAL_FRQ_CMD	= 15,

	IWL_PHY_CALIBRATE_BASE_BAND_CMD		= 16,

	IWL_PHY_CALIBRATE_TX_IQ_PERD_CMD	= 17,

	IWL_PHY_CALIBRATE_CHAIN_NOISE_RESET_CMD	= 18,

	IWL_PHY_CALIBRATE_CHAIN_NOISE_GAIN_CMD	= 19,

	IWL_MAX_STANDARD_PHY_CALIBRATE_TBL_SIZE	= 18,

};



#define IWL_MAX_PHY_CALIBRATE_TBL_SIZE		(253)



#define IWL_CALIB_INIT_CFG_ALL	cpu_to_le32(0xffffffff)

drivers/net/wireless/iwlwifi/iwl-dev.h

+9 −0
Original line number Diff line number Diff line
@@ -571,6 +571,7 @@ enum iwl_ucode_tlv_type { 
	IWL_UCODE_TLV_INIT_EVTLOG_SIZE	= 12,

	IWL_UCODE_TLV_INIT_ERRLOG_PTR	= 13,

	IWL_UCODE_TLV_ENHANCE_SENS_TBL	= 14,

	IWL_UCODE_TLV_PHY_CALIBRATION_SIZE = 15,

};



struct iwl_ucode_tlv {
@@ -1321,6 +1322,14 @@ struct iwl_priv { 
			u32 init_evtlog_ptr, init_evtlog_size, init_errlog_ptr;

			u32 inst_evtlog_ptr, inst_evtlog_size, inst_errlog_ptr;



			/*

			 * chain noise reset and gain commands are the

			 * two extra calibration commands follows the standard

			 * phy calibration commands

			 */

			u8 phy_calib_chain_noise_reset_cmd;

			u8 phy_calib_chain_noise_gain_cmd;



			struct iwl_notif_statistics statistics;

			struct iwl_bt_notif_statistics statistics_bt;

#ifdef CONFIG_IWLWIFI_DEBUGFS