iwlwifi: remove wide_cmd_header field
Driver doesn't support fw without wide_cmd so driver always sets it to true. instead of setting it always to true just remove the field. Signed-off-by: Mordechay Goodstein <mordechay.goodstein@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Link: https://lore.kernel.org/r/iwlwifi.20200928121852.e6137861d917.I93405604eb503568688b28d3169fea7fbb88ed7e@changeid Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
parent
e80bfd117d
commit
0a8159cbd1
4 changed files with 1 additions and 9 deletions
|
@ -181,7 +181,7 @@ int iwl_trans_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
|
||||||
if (!(cmd->flags & CMD_ASYNC))
|
if (!(cmd->flags & CMD_ASYNC))
|
||||||
lock_map_acquire_read(&trans->sync_cmd_lockdep_map);
|
lock_map_acquire_read(&trans->sync_cmd_lockdep_map);
|
||||||
|
|
||||||
if (trans->wide_cmd_header && !iwl_cmd_groupid(cmd->id))
|
if (!iwl_cmd_groupid(cmd->id))
|
||||||
cmd->id = DEF_ID(cmd->id);
|
cmd->id = DEF_ID(cmd->id);
|
||||||
|
|
||||||
ret = trans->ops->send_cmd(trans, cmd);
|
ret = trans->ops->send_cmd(trans, cmd);
|
||||||
|
|
|
@ -960,7 +960,6 @@ struct iwl_trans_txqs {
|
||||||
* @hw_id_str: a string with info about HW ID. Set during transport allocation.
|
* @hw_id_str: a string with info about HW ID. Set during transport allocation.
|
||||||
* @pm_support: set to true in start_hw if link pm is supported
|
* @pm_support: set to true in start_hw if link pm is supported
|
||||||
* @ltr_enabled: set to true if the LTR is enabled
|
* @ltr_enabled: set to true if the LTR is enabled
|
||||||
* @wide_cmd_header: true when ucode supports wide command header format
|
|
||||||
* @num_rx_queues: number of RX queues allocated by the transport;
|
* @num_rx_queues: number of RX queues allocated by the transport;
|
||||||
* the transport must set this before calling iwl_drv_start()
|
* the transport must set this before calling iwl_drv_start()
|
||||||
* @iml_len: the length of the image loader
|
* @iml_len: the length of the image loader
|
||||||
|
@ -1000,7 +999,6 @@ struct iwl_trans {
|
||||||
|
|
||||||
const struct iwl_hcmd_arr *command_groups;
|
const struct iwl_hcmd_arr *command_groups;
|
||||||
int command_groups_size;
|
int command_groups_size;
|
||||||
bool wide_cmd_header;
|
|
||||||
|
|
||||||
u8 num_rx_queues;
|
u8 num_rx_queues;
|
||||||
|
|
||||||
|
|
|
@ -757,7 +757,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
|
||||||
trans_cfg.rx_buf_size = rb_size_default;
|
trans_cfg.rx_buf_size = rb_size_default;
|
||||||
}
|
}
|
||||||
|
|
||||||
trans->wide_cmd_header = true;
|
|
||||||
trans_cfg.bc_table_dword =
|
trans_cfg.bc_table_dword =
|
||||||
mvm->trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_AX210;
|
mvm->trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_AX210;
|
||||||
|
|
||||||
|
|
|
@ -1538,11 +1538,6 @@ static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,
|
||||||
const u8 *cmddata[IWL_MAX_CMD_TBS_PER_TFD];
|
const u8 *cmddata[IWL_MAX_CMD_TBS_PER_TFD];
|
||||||
u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD];
|
u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD];
|
||||||
|
|
||||||
if (WARN(!trans->wide_cmd_header &&
|
|
||||||
group_id > IWL_ALWAYS_LONG_GROUP,
|
|
||||||
"unsupported wide command %#x\n", cmd->id))
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
if (group_id != 0) {
|
if (group_id != 0) {
|
||||||
copy_size = sizeof(struct iwl_cmd_header_wide);
|
copy_size = sizeof(struct iwl_cmd_header_wide);
|
||||||
cmd_size = sizeof(struct iwl_cmd_header_wide);
|
cmd_size = sizeof(struct iwl_cmd_header_wide);
|
||||||
|
|
Loading…
Add table
Reference in a new issue