This is not really representing TBs per TFD (which is 20 and not 2), this is just the API that the transport provides. Signed-off-by: Miri Korenblit --- .../wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h | 4 ++-- drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 11 +++++------ drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 10 +++++----- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 12 ++++++------ 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h index ead72c3d33bd..1743490ad2e6 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h @@ -4,7 +4,7 @@ * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2015 Intel Mobile Communications GmbH * Copyright(c) 2016 - 2017 Intel Deutschland GmbH - * Copyright(c) 2018, 2023-2024 Intel Corporation + * Copyright(c) 2018, 2023-2024, 2026 Intel Corporation *****************************************************************************/ #if !defined(__IWLWIFI_DEVICE_TRACE_IWLWIFI) || defined(TRACE_HEADER_MULTI_READ) @@ -35,7 +35,7 @@ TRACE_EVENT(iwlwifi_dev_hcmd, __entry->flags = cmd->flags; memcpy(__get_dynamic_array(hcmd), hdr, offset); - for (i = 0; i < IWL_MAX_CMD_TBS_PER_TFD; i++) { + for (i = 0; i < IWL_MAX_CMD_CHUNKS_PER_HCMD; i++) { if (!cmd->len[i]) continue; memcpy((u8 *)__get_dynamic_array(hcmd) + offset, diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h index 7a358daab584..a07dd492beb5 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h @@ -166,10 +166,9 @@ struct iwl_device_tx_cmd { (TFD_MAX_PAYLOAD_SIZE - sizeof(struct iwl_cmd_header_wide)) /* - * number of transfer buffers (fragments) per transmit frame descriptor; - * this is just the driver's idea, the hardware supports 20 + * number of transfer buffers (fragments) per hcmd; */ -#define IWL_MAX_CMD_TBS_PER_TFD 2 +#define IWL_MAX_CMD_CHUNKS_PER_HCMD 2 /** * enum iwl_hcmd_dataflag - flag for each one of the chunks of the command @@ -215,15 +214,15 @@ enum iwl_error_event_table_status { * version and group as well */ struct iwl_host_cmd { - const void *data[IWL_MAX_CMD_TBS_PER_TFD]; + const void *data[IWL_MAX_CMD_CHUNKS_PER_HCMD]; struct iwl_rx_packet *resp_pkt; unsigned long _rx_page_addr; u32 _rx_page_order; u32 flags; u32 id; - u16 len[IWL_MAX_CMD_TBS_PER_TFD]; - u8 dataflags[IWL_MAX_CMD_TBS_PER_TFD]; + u16 len[IWL_MAX_CMD_CHUNKS_PER_HCMD]; + u8 dataflags[IWL_MAX_CMD_CHUNKS_PER_HCMD]; }; static inline void iwl_free_resp(struct iwl_host_cmd *cmd) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c index b235a4539d7c..3dcb62a67e2f 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c @@ -1210,8 +1210,8 @@ int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans, u16 copy_size, cmd_size, tb0_size; bool had_nocopy = false; u8 group_id = iwl_cmd_groupid(cmd->id); - const u8 *cmddata[IWL_MAX_CMD_TBS_PER_TFD]; - u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD]; + const u8 *cmddata[IWL_MAX_CMD_CHUNKS_PER_HCMD]; + u16 cmdlen[IWL_MAX_CMD_CHUNKS_PER_HCMD]; struct iwl_tfh_tfd *tfd; unsigned long flags; @@ -1221,7 +1221,7 @@ int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans, copy_size = sizeof(struct iwl_cmd_header_wide); cmd_size = sizeof(struct iwl_cmd_header_wide); - for (i = 0; i < IWL_MAX_CMD_TBS_PER_TFD; i++) { + for (i = 0; i < IWL_MAX_CMD_CHUNKS_PER_HCMD; i++) { cmddata[i] = cmd->data[i]; cmdlen[i] = cmd->len[i]; @@ -1325,7 +1325,7 @@ int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans, copy_size = sizeof(struct iwl_cmd_header_wide); /* and copy the data that needs to be copied */ - for (i = 0; i < IWL_MAX_CMD_TBS_PER_TFD; i++) { + for (i = 0; i < IWL_MAX_CMD_CHUNKS_PER_HCMD; i++) { int copy; if (!cmd->len[i]) @@ -1390,7 +1390,7 @@ int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans, } /* map the remaining (adjusted) nocopy/dup fragments */ - for (i = 0; i < IWL_MAX_CMD_TBS_PER_TFD; i++) { + for (i = 0; i < IWL_MAX_CMD_CHUNKS_PER_HCMD; i++) { void *data = (void *)(uintptr_t)cmddata[i]; if (!cmdlen[i]) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c index 0c29fb6b9ca7..ad9b80ed7214 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c @@ -1370,8 +1370,8 @@ int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans, u8 group_id = iwl_cmd_groupid(cmd->id); int i, ret; u32 cmd_pos; - const u8 *cmddata[IWL_MAX_CMD_TBS_PER_TFD]; - u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD]; + const u8 *cmddata[IWL_MAX_CMD_CHUNKS_PER_HCMD]; + u16 cmdlen[IWL_MAX_CMD_CHUNKS_PER_HCMD]; unsigned long flags; if (WARN(!trans->conf.wide_cmd_header && @@ -1388,9 +1388,9 @@ int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans, } /* need one for the header if the first is NOCOPY */ - BUILD_BUG_ON(IWL_MAX_CMD_TBS_PER_TFD > IWL_NUM_OF_TBS - 1); + BUILD_BUG_ON(IWL_MAX_CMD_CHUNKS_PER_HCMD > IWL_NUM_OF_TBS - 1); - for (i = 0; i < IWL_MAX_CMD_TBS_PER_TFD; i++) { + for (i = 0; i < IWL_MAX_CMD_CHUNKS_PER_HCMD; i++) { cmddata[i] = cmd->data[i]; cmdlen[i] = cmd->len[i]; @@ -1505,7 +1505,7 @@ int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans, } /* and copy the data that needs to be copied */ - for (i = 0; i < IWL_MAX_CMD_TBS_PER_TFD; i++) { + for (i = 0; i < IWL_MAX_CMD_CHUNKS_PER_HCMD; i++) { int copy; if (!cmd->len[i]) @@ -1574,7 +1574,7 @@ int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans, } /* map the remaining (adjusted) nocopy/dup fragments */ - for (i = 0; i < IWL_MAX_CMD_TBS_PER_TFD; i++) { + for (i = 0; i < IWL_MAX_CMD_CHUNKS_PER_HCMD; i++) { void *data = (void *)(uintptr_t)cmddata[i]; if (!cmdlen[i]) -- 2.34.1