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

Commit 96791422 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: get the correct HCMD in the response handler 



Until now, the response handler of a Host Command got the
exact same pointer that was also given to the DMA engine.
We almost never need to the Host Command that was sent while
handling its response, but when we do need it, we see that
the command has been modified.

This mystery has been elucidated. The FH (our DMA engine)
writes its meta data on the buffer in the DRAM. Of course it
copies the buffer to the NIC first. This was known to happen
for Tx command, but as a matter of fact, it happens to all
TFD brought by the FH which doesn't care much about what it
brings from DRAM to internal SRAM.

So copy the Host Command to yet another buffer so that we
can properly pass the buffer that was sent originally to the
fw. Do that only if it was request by the user since very
few flows need to get the HCMD sent in the response handler.

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

drivers/net/wireless/iwlwifi/dvm/sta.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ int iwl_send_add_sta(struct iwl_priv *priv, 
		       sta_id, sta->sta.addr, flags & CMD_ASYNC ?  "a" : "");



	if (!(flags & CMD_ASYNC)) {

		cmd.flags |= CMD_WANT_SKB;

		cmd.flags |= CMD_WANT_SKB | CMD_WANT_HCMD;

		might_sleep();

	}

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

+8 −2
Original line number Diff line number Diff line
@@ -184,14 +184,20 @@ struct iwl_rx_packet { 
 * @CMD_SYNC: The caller will be stalled until the fw responds to the command

 * @CMD_ASYNC: Return right away and don't want for the response

 * @CMD_WANT_SKB: valid only with CMD_SYNC. The caller needs the buffer of the

 *	response.

 *	response. The caller needs to call iwl_free_resp when done.

 * @CMD_WANT_HCMD: The caller needs to get the HCMD that was sent in the

 *	response handler. Chunks flagged by %IWL_HCMD_DFL_NOCOPY won't be

 *	copied. The pointer passed to the response handler is in the transport

 *	ownership and don't need to be freed by the op_mode. This also means

 *	that the pointer is invalidated after the op_mode's handler returns.

 * @CMD_ON_DEMAND: This command is sent by the test mode pipe.

 */

enum CMD_MODE {

	CMD_SYNC = 0,

	CMD_ASYNC = BIT(0),

	CMD_WANT_SKB = BIT(1),

	CMD_ON_DEMAND = BIT(2),

	CMD_WANT_HCMD = BIT(2),

	CMD_ON_DEMAND = BIT(3),

};



#define DEF_CMD_PAYLOAD_SIZE 320

drivers/net/wireless/iwlwifi/pcie/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ struct iwl_queue { 


struct iwl_pcie_tx_queue_entry {

	struct iwl_device_cmd *cmd;

	struct iwl_device_cmd *copy_cmd;

	struct sk_buff *skb;

	struct iwl_cmd_meta meta;

};

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

+13 −3
Original line number Diff line number Diff line
@@ -421,13 +421,23 @@ static void iwl_rx_handle_rxbuf(struct iwl_trans *trans, 
		index = SEQ_TO_INDEX(sequence);

		cmd_index = get_cmd_index(&txq->q, index);



		if (reclaim)

			cmd = txq->entries[cmd_index].cmd;

		else

		if (reclaim) {

			struct iwl_pcie_tx_queue_entry *ent;

			ent = &txq->entries[cmd_index];

			cmd = ent->copy_cmd;

			WARN_ON_ONCE(!cmd && ent->meta.flags & CMD_WANT_HCMD);

		} else {

			cmd = NULL;

		}



		err = iwl_op_mode_rx(trans->op_mode, &rxcb, cmd);



		if (reclaim) {

			/* The original command isn't needed any more */

			kfree(txq->entries[cmd_index].copy_cmd);

			txq->entries[cmd_index].copy_cmd = NULL;

		}



		/*

		 * After here, we should always check rxcb._page_stolen,

		 * if it is true then one of the handlers took the page.

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

+3 −2
Original line number Diff line number Diff line
@@ -492,10 +492,11 @@ static void iwl_tx_queue_free(struct iwl_trans *trans, int txq_id) 
	iwl_tx_queue_unmap(trans, txq_id);



	/* De-alloc array of command/tx buffers */



	if (txq_id == trans_pcie->cmd_queue)

		for (i = 0; i < txq->q.n_window; i++)

		for (i = 0; i < txq->q.n_window; i++) {

			kfree(txq->entries[i].cmd);

			kfree(txq->entries[i].copy_cmd);

		}



	/* De-alloc circular buffer of TFDs */

	if (txq->q.n_bd) {