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

Commit 9dc5ffb8 authored by Amir Levy's avatar Amir Levy
Browse files

msm: ipa3: change the order of chained ICs 



Ipa_v3 architecture requires reordering of the chained immediate
commands. This change swaps between the packet init IC and the
tag descriptors.

Change-Id: Ic42b66bcbda006af47b97b7d75fd21d1dde54b55
Acked-by: default avatarAdy Abraham <adya@qti.qualcomm.com>
Signed-off-by: default avatarNadine Toledano <nadinet@codeaurora.org>
Signed-off-by: default avatarAmir Levy <alevy@codeaurora.org>
parent 62ad167c

drivers/platform/msm/ipa/ipa_v3/ipa_utils.c

+24 −24
Original line number Diff line number Diff line
@@ -3729,25 +3729,13 @@ int ipa3_tag_process(struct ipa3_desc desc[], 
		goto fail_alloc_desc;

	}



	/* IP_PACKET_INIT IC for tag status to be sent to apps */

	pkt_init = kzalloc(sizeof(*pkt_init), GFP_KERNEL);

	if (!pkt_init) {

		IPAERR("failed to allocate memory\n");

		res = -ENOMEM;

		goto fail_alloc_pkt_init;

	/* Copy the required descriptors from the client now */

	if (desc) {

		memcpy(&(tag_desc[0]), desc, descs_num *

			sizeof(tag_desc[0]));

		desc_idx += descs_num;

	}



	pkt_init->destination_pipe_index =

		ipa3_get_ep_mapping(IPA_CLIENT_APPS_LAN_CONS);



	tag_desc[desc_idx].opcode = IPA_IP_PACKET_INIT;

	tag_desc[desc_idx].pyld = pkt_init;

	tag_desc[desc_idx].len = sizeof(*pkt_init);

	tag_desc[desc_idx].type = IPA_IMM_CMD_DESC;

	tag_desc[desc_idx].callback = ipa3_tag_free_buf;

	tag_desc[desc_idx].user1 = pkt_init;

	desc_idx++;



	/* NO-OP IC for ensuring that IPA pipeline is empty */

	reg_write_nop = kzalloc(sizeof(*reg_write_nop), GFP_KERNEL);

	if (!reg_write_nop) {
@@ -3768,6 +3756,25 @@ int ipa3_tag_process(struct ipa3_desc desc[], 
	tag_desc[desc_idx].user1 = reg_write_nop;

	desc_idx++;



	/* IP_PACKET_INIT IC for tag status to be sent to apps */

	pkt_init = kzalloc(sizeof(*pkt_init), GFP_KERNEL);

	if (!pkt_init) {

		IPAERR("failed to allocate memory\n");

		res = -ENOMEM;

		goto fail_alloc_pkt_init;

	}



	pkt_init->destination_pipe_index =

		ipa3_get_ep_mapping(IPA_CLIENT_APPS_LAN_CONS);



	tag_desc[desc_idx].opcode = IPA_IP_PACKET_INIT;

	tag_desc[desc_idx].pyld = pkt_init;

	tag_desc[desc_idx].len = sizeof(*pkt_init);

	tag_desc[desc_idx].type = IPA_IMM_CMD_DESC;

	tag_desc[desc_idx].callback = ipa3_tag_free_buf;

	tag_desc[desc_idx].user1 = pkt_init;

	desc_idx++;



	/* status IC */

	status = kzalloc(sizeof(*status), GFP_KERNEL);

	if (!status) {
@@ -3786,13 +3793,6 @@ int ipa3_tag_process(struct ipa3_desc desc[], 
	tag_desc[desc_idx].user1 = status;

	desc_idx++;



	/* Copy the required descriptors from the client now */

	if (desc) {

		memcpy(&(tag_desc[desc_idx]), desc, descs_num *

			sizeof(struct ipa3_desc));

		desc_idx += descs_num;

	}



	comp = kzalloc(sizeof(*comp), GFP_KERNEL);

	if (!comp) {

		IPAERR("no mem\n");