Commit 792b75b1 authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski
Browse files

net: ipa: don't pass tag value to ipa_cmd_ip_tag_status_add() 



We only send a tagged packet from the AP->command TX endpoint when
we're clearing the hardware pipeline.  And when we receive the
tagged packet we don't care what the actual tag value is.

Stop passing a tag value to ipa_cmd_ip_tag_status_add(), and just
encode 0 as the tag sent.  Fix the function that encodes the tag so
it uses the proper byte ordering.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Acked-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 51c48ce2

drivers/net/ipa/ipa_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ void ipa_cmd_dma_shared_mem_add(struct gsi_trans *trans, u32 offset, u16 size, 
			  direction, opcode);

}



static void ipa_cmd_ip_tag_status_add(struct gsi_trans *trans, u64 tag)

static void ipa_cmd_ip_tag_status_add(struct gsi_trans *trans)

{

	struct ipa *ipa = container_of(trans->gsi, struct ipa, gsi);

	enum ipa_cmd_opcode opcode = IPA_CMD_IP_PACKET_TAG_STATUS;
@@ -543,7 +543,7 @@ static void ipa_cmd_ip_tag_status_add(struct gsi_trans *trans, u64 tag) 
	cmd_payload = ipa_cmd_payload_alloc(ipa, &payload_addr);

	payload = &cmd_payload->ip_packet_tag_status;



	payload->tag = u64_encode_bits(tag, IP_PACKET_TAG_STATUS_TAG_FMASK);

	payload->tag = le64_encode_bits(0, IP_PACKET_TAG_STATUS_TAG_FMASK);



	gsi_trans_cmd_add(trans, payload, sizeof(*payload), payload_addr,

			  direction, opcode);
@@ -583,13 +583,13 @@ void ipa_cmd_pipeline_clear_add(struct gsi_trans *trans) 
	 * command says to send the next packet directly to the exception

	 * endpoint without any other IPA processing.  The tag_status

	 * command requests that status be generated on completion of

	 * that transfer, and that it will contain the given tag value.

	 * that transfer, and that it will be tagged with a value.

	 * Finally, the transfer command sends a small packet of data

	 * (instead of a command) using the command endpoint.

	 */

	endpoint = ipa->name_map[IPA_ENDPOINT_AP_LAN_RX];

	ipa_cmd_ip_packet_init_add(trans, endpoint->endpoint_id);

	ipa_cmd_ip_tag_status_add(trans, 0xcba987654321);

	ipa_cmd_ip_tag_status_add(trans);

	ipa_cmd_transfer_add(trans, 4);

}