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

Commit fc26460e authored by Amir Levy's avatar Amir Levy Committed by Gerrit - the friendly Code Review server
Browse files

msm:ipa3: fix dependencies not added on composition switch 



USB\Q6 dependencies are not added on composition switch 9063->90A9.
This is due to tethering bridge state machine getting out of sync when
both RMNET and MBIM are in the same USB composition, causing the
dependencies not to be added in the tethering bridge INIT phase.
This change removes the tethering bridge state machine and moves
the addition of dependencies to the CONNECT phase.

Change-Id: If44948b201872dad3319c203a4b278fc81a101b0
Signed-off-by: default avatarAmir Levy <alevy@codeaurora.org>
parent 1b180deb

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

+19 −26
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ struct ipa3_usb_context { 
	struct ipa3_usb_teth_prot_context

		teth_prot_ctx[IPA_USB_MAX_TETH_PROT_SIZE];

	int num_init_prot; /* without dpl */

	enum ipa3_usb_teth_prot_state teth_bridge_state;

	struct teth_bridge_init_params teth_bridge_params;

	struct completion dev_ready_comp;

	u32 qmi_req_id;
@@ -435,7 +434,6 @@ int ipa3_usb_init(void) 
		ipa3_usb_ctx->teth_prot_ctx[i].state =

			IPA_USB_TETH_PROT_INVALID;

	ipa3_usb_ctx->num_init_prot = 0;

	ipa3_usb_ctx->teth_bridge_state = IPA_USB_TETH_PROT_INVALID;

	init_completion(&ipa3_usb_ctx->dev_ready_comp);

	ipa3_usb_ctx->qmi_req_id = 0;

	spin_lock_init(&ipa3_usb_ctx->state_lock);
@@ -776,15 +774,11 @@ static int ipa3_usb_init_teth_bridge(void) 
{

	int result;



	if (ipa3_usb_ctx->teth_bridge_state != IPA_USB_TETH_PROT_INVALID)

		return 0;



	result = teth_bridge_init(&ipa3_usb_ctx->teth_bridge_params);

	if (result) {

		IPA_USB_ERR("Failed to initialize teth_bridge.\n");

		return result;

	}

	ipa3_usb_ctx->teth_bridge_state = IPA_USB_TETH_PROT_INITIALIZED;



	return 0;

}
@@ -1375,9 +1369,6 @@ static int ipa3_usb_connect_teth_bridge( 
{

	int result;



	if (ipa3_usb_ctx->teth_bridge_state != IPA_USB_TETH_PROT_INITIALIZED)

		return 0;



	result = teth_bridge_connect(params);

	if (result) {

		IPA_USB_ERR("failed to connect teth_bridge (%s)\n",
@@ -1385,7 +1376,6 @@ static int ipa3_usb_connect_teth_bridge( 
			"rmnet" : "mbim");

		return result;

	}

	ipa3_usb_ctx->teth_bridge_state = IPA_USB_TETH_PROT_CONNECTED;



	return 0;

}
@@ -1394,19 +1384,29 @@ static int ipa3_usb_connect_dpl(void) 
{

	int res = 0;



	/* Add DPL dependency to RM dependency graph */

	/*

	 * Add DPL dependency to RM dependency graph, first add_dependency call

	 * is sync in order to make sure the IPA clocks are up before we

	 * continue and notify the USB driver it may continue.

	 */

	res = ipa3_rm_add_dependency_sync(IPA_RM_RESOURCE_USB_DPL_DUMMY_PROD,

				    IPA_RM_RESOURCE_Q6_CONS);

	if (res < 0) {

		IPA_USB_ERR("ipa3_rm_add_dependency_sync() failed.\n");

		return res;

	}



	/*

	 * this add_dependency call can't be sync since it will block until DPL

	 * status is connected (which can happen only later in the flow),

	 * the clocks are already up so the call doesn't need to block.

	 */

	res = ipa3_rm_add_dependency(IPA_RM_RESOURCE_Q6_PROD,

				    IPA_RM_RESOURCE_USB_DPL_CONS);

	if (res < 0 && res != -EINPROGRESS) {

		IPA_USB_ERR("ipa3_rm_add_dependency() failed.\n");

		return res;

	}

	res = ipa3_rm_add_dependency(IPA_RM_RESOURCE_USB_DPL_DUMMY_PROD,

		ipa3_rm_delete_dependency(IPA_RM_RESOURCE_USB_DPL_DUMMY_PROD,

				IPA_RM_RESOURCE_Q6_CONS);

	if (res < 0 && res != -EINPROGRESS) {

		IPA_USB_ERR("ipa3_rm_add_dependency() failed.\n");

		ipa3_rm_delete_dependency(IPA_RM_RESOURCE_Q6_PROD,

			IPA_RM_RESOURCE_USB_DPL_CONS);

		return res;

	}
@@ -1557,15 +1557,11 @@ static int ipa3_usb_disconnect_teth_bridge(void) 
{

	int result;



	if (ipa3_usb_ctx->teth_bridge_state != IPA_USB_TETH_PROT_CONNECTED)

		return 0;



	result = teth_bridge_disconnect(IPA_CLIENT_USB_PROD);

	if (result) {

		IPA_USB_ERR("failed to disconnect teth_bridge.\n");

		return result;

	}

	ipa3_usb_ctx->teth_bridge_state = IPA_USB_TETH_PROT_INVALID;



	return 0;

}
@@ -2061,9 +2057,6 @@ int ipa3_usb_deinit_teth_prot(enum ipa_usb_teth_prot teth_prot) 
			result = -EINVAL;

			goto bad_params;

		}

		result = ipa3_usb_disconnect_teth_bridge();

		if (result)

			goto bad_params;



		ipa3_usb_ctx->teth_prot_ctx[teth_prot].user_data =

			NULL;

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

+35 −24
Original line number Diff line number Diff line
@@ -98,8 +98,6 @@ static void teth_bridge_ipa_cb(void *priv, enum ipa_dp_evt_type evt, 
*/

int ipa3_teth_bridge_init(struct teth_bridge_init_params *params)

{

	int res = 0;



	TETH_DBG_FUNC_ENTRY();



	if (!params) {
@@ -112,28 +110,8 @@ int ipa3_teth_bridge_init(struct teth_bridge_init_params *params) 
	params->private_data = NULL;

	params->skip_ep_cfg = true;



	/* Build dependency graph */

	res = ipa3_rm_add_dependency(IPA_RM_RESOURCE_USB_PROD,

				    IPA_RM_RESOURCE_Q6_CONS);

	if (res < 0 && res != -EINPROGRESS) {

		TETH_ERR("ipa3_rm_add_dependency() failed.\n");

		goto bail;

	}

	res = ipa3_rm_add_dependency(IPA_RM_RESOURCE_Q6_PROD,

				    IPA_RM_RESOURCE_USB_CONS);

	if (res < 0 && res != -EINPROGRESS) {

		ipa3_rm_delete_dependency(IPA_RM_RESOURCE_USB_PROD,

					IPA_RM_RESOURCE_Q6_CONS);

		TETH_ERR("ipa3_rm_add_dependency() failed.\n");

		goto bail;

	}



	res = 0;

	goto bail;



bail:

	TETH_DBG_FUNC_EXIT();

	return res;

	return 0;

}



/**
@@ -162,7 +140,40 @@ int ipa3_teth_bridge_disconnect(enum ipa_client_type client) 
*/

int ipa3_teth_bridge_connect(struct teth_bridge_connect_params *connect_params)

{

	return 0;

	int res = 0;



	TETH_DBG_FUNC_ENTRY();



	/* Build the dependency graph, first add_dependency call is sync

	 * in order to make sure the IPA clocks are up before we continue

	 * and notify the USB driver it may continue.

	 */

	res = ipa3_rm_add_dependency_sync(IPA_RM_RESOURCE_USB_PROD,

				    IPA_RM_RESOURCE_Q6_CONS);

	if (res < 0) {

		TETH_ERR("ipa3_rm_add_dependency() failed.\n");

		goto bail;

	}



	/* this add_dependency call can't be sync since it will block until USB

	 * status is connected (which can happen only after the tethering

	 * bridge is connected), the clocks are already up so the call doesn't

	 * need to block.

	 */

	res = ipa3_rm_add_dependency(IPA_RM_RESOURCE_Q6_PROD,

				    IPA_RM_RESOURCE_USB_CONS);

	if (res < 0 && res != -EINPROGRESS) {

		ipa3_rm_delete_dependency(IPA_RM_RESOURCE_USB_PROD,

					IPA_RM_RESOURCE_Q6_CONS);

		TETH_ERR("ipa3_rm_add_dependency() failed.\n");

		goto bail;

	}



	res = 0;



bail:

	TETH_DBG_FUNC_EXIT();

	return res;

}



static long ipa3_teth_bridge_ioctl(struct file *filp,