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

Commit 1afbfb60 authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: rename IWL_MAX_CMD_TFDS to IWL_MAX_CMD_TBS_PER_TFD 



The IWL_MAX_CMD_TFDS name for this constant is wrong, the
constant really indicates how many TBs we can use in the
driver for a single command TFD, rename the constant and
also add a comment explaining it.

Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 98891754

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

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ TRACE_EVENT(iwlwifi_dev_hcmd, 
		__entry->flags = cmd->flags;

		memcpy(__get_dynamic_array(hcmd), hdr, sizeof(*hdr));



		for (i = 0; i < IWL_MAX_CMD_TFDS; i++) {

		for (i = 0; i < IWL_MAX_CMD_TBS_PER_TFD; i++) {

			if (!cmd->len[i])

				continue;

			memcpy((u8 *)__get_dynamic_array(hcmd) + offset,

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

+8 −4
Original line number Diff line number Diff line
@@ -217,7 +217,11 @@ struct iwl_device_cmd { 


#define TFD_MAX_PAYLOAD_SIZE (sizeof(struct iwl_device_cmd))



#define IWL_MAX_CMD_TFDS	2

/*

 * number of transfer buffers (fragments) per transmit frame descriptor;

 * this is just the driver's idea, the hardware supports 20

 */

#define IWL_MAX_CMD_TBS_PER_TFD	2



/**

 * struct iwl_hcmd_dataflag - flag for each one of the chunks of the command
@@ -254,15 +258,15 @@ enum iwl_hcmd_dataflag { 
 * @id: id of the host command

 */

struct iwl_host_cmd {

	const void *data[IWL_MAX_CMD_TFDS];

	const void *data[IWL_MAX_CMD_TBS_PER_TFD];

	struct iwl_rx_packet *resp_pkt;

	unsigned long _rx_page_addr;

	u32 _rx_page_order;

	int handler_status;



	u32 flags;

	u16 len[IWL_MAX_CMD_TFDS];

	u8 dataflags[IWL_MAX_CMD_TFDS];

	u16 len[IWL_MAX_CMD_TBS_PER_TFD];

	u8 dataflags[IWL_MAX_CMD_TBS_PER_TFD];

	u8 id;

};

drivers/net/wireless/iwlwifi/pcie/tx.c

+6 −6
Original line number Diff line number Diff line
@@ -1146,16 +1146,16 @@ static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans, 
	bool had_nocopy = false;

	int i;

	u32 cmd_pos;

	const u8 *cmddata[IWL_MAX_CMD_TFDS];

	u16 cmdlen[IWL_MAX_CMD_TFDS];

	const u8 *cmddata[IWL_MAX_CMD_TBS_PER_TFD];

	u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD];



	copy_size = sizeof(out_cmd->hdr);

	cmd_size = sizeof(out_cmd->hdr);



	/* need one for the header if the first is NOCOPY */

	BUILD_BUG_ON(IWL_MAX_CMD_TFDS > IWL_NUM_OF_TBS - 1);

	BUILD_BUG_ON(IWL_MAX_CMD_TBS_PER_TFD > IWL_NUM_OF_TBS - 1);



	for (i = 0; i < IWL_MAX_CMD_TFDS; i++) {

	for (i = 0; i < IWL_MAX_CMD_TBS_PER_TFD; i++) {

		cmddata[i] = cmd->data[i];

		cmdlen[i] = cmd->len[i];
@@ -1250,7 +1250,7 @@ static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans, 
	/* and copy the data that needs to be copied */

	cmd_pos = offsetof(struct iwl_device_cmd, payload);

	copy_size = sizeof(out_cmd->hdr);

	for (i = 0; i < IWL_MAX_CMD_TFDS; i++) {

	for (i = 0; i < IWL_MAX_CMD_TBS_PER_TFD; i++) {

		int copy = 0;



		if (!cmd->len)
@@ -1319,7 +1319,7 @@ static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans, 
	iwl_pcie_txq_build_tfd(trans, txq, phys_addr, copy_size, 1);



	/* map the remaining (adjusted) nocopy/dup fragments */

	for (i = 0; i < IWL_MAX_CMD_TFDS; i++) {

	for (i = 0; i < IWL_MAX_CMD_TBS_PER_TFD; i++) {

		const void *data = cmddata[i];



		if (!cmdlen[i])