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

Commit 7c4eae36 authored by Sivan Reinstein's avatar Sivan Reinstein
Browse files

msm: ipa: fix not invoking tethering stats when polling is disabled 



When polling is stopped (either by explicit IOCTL or due to Modem
SSR) we need to make sure no polling request will be queued.
In addition, the timeouts of waiting for QMI reply for all tethering
stats related QMI messages has been reduced (To not wait for the
QMI framework timeout, which might be long).

Change-Id: I7729e8bc3356d5bc8a749cc1c70a9af0ae852ee1
Signed-off-by: default avatarSivan Reinstein <sivanr@codeaurora.org>
Acked-by: default avatarDavid Arinzon <darinzon@qti.qualcomm.com>
parent a69c694d

drivers/platform/msm/ipa/ipa_v2/ipa_qmi_service.c

+7 −4
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#define IPA_Q6_SERVICE_SVC_ID 0x31

#define IPA_Q6_SERVICE_INS_ID 2



#define QMI_SEND_STATS_REQ_TIMEOUT_MS 5000

#define QMI_SEND_REQ_TIMEOUT_MS 60000



static struct qmi_handle *ipa_svc_handle;
@@ -1072,7 +1073,7 @@ int ipa_qmi_get_data_stats(struct ipa_get_data_stats_req_msg_v01 *req, 
			sizeof(struct ipa_get_data_stats_req_msg_v01),

			&resp_desc, resp,

			sizeof(struct ipa_get_data_stats_resp_msg_v01),

			0);

			QMI_SEND_STATS_REQ_TIMEOUT_MS);



	IPAWANDBG("QMI_IPA_GET_DATA_STATS_RESP_V01 received\n");
@@ -1101,7 +1102,7 @@ int ipa_qmi_get_network_stats(struct ipa_get_apn_data_stats_req_msg_v01 *req, 
			sizeof(struct ipa_get_apn_data_stats_req_msg_v01),

			&resp_desc, resp,

			sizeof(struct ipa_get_apn_data_stats_resp_msg_v01),

			0);

			QMI_SEND_STATS_REQ_TIMEOUT_MS);



	IPAWANDBG("QMI_IPA_GET_APN_DATA_STATS_RESP_V01 received\n");
@@ -1131,7 +1132,8 @@ int ipa_qmi_set_data_quota(struct ipa_set_data_usage_quota_req_msg_v01 *req) 


	rc = qmi_send_req_wait(ipa_q6_clnt, &req_desc, req,

			sizeof(struct ipa_set_data_usage_quota_req_msg_v01),

			&resp_desc, &resp, sizeof(resp), 0);

			&resp_desc, &resp, sizeof(resp),

			QMI_SEND_STATS_REQ_TIMEOUT_MS);



	IPAWANDBG("QMI_IPA_SET_DATA_USAGE_QUOTA_RESP_V01 received\n");
@@ -1163,7 +1165,8 @@ int ipa_qmi_stop_data_qouta(void) 
	IPAWANDBG("Sending QMI_IPA_STOP_DATA_USAGE_QUOTA_REQ_V01\n");



	rc = qmi_send_req_wait(ipa_q6_clnt, &req_desc, &req, sizeof(req),

		&resp_desc, &resp, sizeof(resp), 0);

		&resp_desc, &resp, sizeof(resp),

		QMI_SEND_STATS_REQ_TIMEOUT_MS);



	IPAWANDBG("QMI_IPA_STOP_DATA_USAGE_QUOTA_RESP_V01 received\n");

drivers/platform/msm/ipa/ipa_v2/rmnet_ipa.c

+4 −2
Original line number Diff line number Diff line
@@ -2050,7 +2050,7 @@ static int ipa_wwan_remove(struct platform_device *pdev) 
		IPAWANERR("Error deleting resource %d, ret=%d\n",

		IPA_RM_RESOURCE_WWAN_0_PROD, ret);

	cancel_work_sync(&ipa_tx_wakequeue_work);

	cancel_delayed_work_sync(&ipa_tether_stats_poll_wakequeue_work);

	cancel_delayed_work(&ipa_tether_stats_poll_wakequeue_work);

	free_netdev(ipa_netdevs[0]);

	ipa_netdevs[0] = NULL;

	/* No need to remove wwan_ioctl during SSR */
@@ -2279,6 +2279,8 @@ static void tethering_stats_poll_queue(struct work_struct *work) 
{

	rmnet_ipa_get_stats_and_update(false);



	/* Schedule again only if there's an active polling interval */

	if (0 != ipa_rmnet_ctx.polling_interval)

		schedule_delayed_work(&ipa_tether_stats_poll_wakequeue_work,

			msecs_to_jiffies(ipa_rmnet_ctx.polling_interval*1000));

}

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

+7 −4
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#define IPA_Q6_SERVICE_SVC_ID 0x31

#define IPA_Q6_SERVICE_INS_ID 2



#define QMI_SEND_STATS_REQ_TIMEOUT_MS 5000

#define QMI_SEND_REQ_TIMEOUT_MS 60000



static struct qmi_handle *ipa3_svc_handle;
@@ -1078,7 +1079,7 @@ int ipa3_qmi_get_data_stats(struct ipa_get_data_stats_req_msg_v01 *req, 
			sizeof(struct ipa_get_data_stats_req_msg_v01),

			&resp_desc, resp,

			sizeof(struct ipa_get_data_stats_resp_msg_v01),

			0);

			QMI_SEND_STATS_REQ_TIMEOUT_MS);



	IPAWANDBG("QMI_IPA_GET_DATA_STATS_RESP_V01 received\n");
@@ -1107,7 +1108,7 @@ int ipa3_qmi_get_network_stats(struct ipa_get_apn_data_stats_req_msg_v01 *req, 
			sizeof(struct ipa_get_apn_data_stats_req_msg_v01),

			&resp_desc, resp,

			sizeof(struct ipa_get_apn_data_stats_resp_msg_v01),

			0);

			QMI_SEND_STATS_REQ_TIMEOUT_MS);



	IPAWANDBG("QMI_IPA_GET_APN_DATA_STATS_RESP_V01 received\n");
@@ -1137,7 +1138,8 @@ int ipa3_qmi_set_data_quota(struct ipa_set_data_usage_quota_req_msg_v01 *req) 


	rc = qmi_send_req_wait(ipa_q6_clnt, &req_desc, req,

			sizeof(struct ipa_set_data_usage_quota_req_msg_v01),

			&resp_desc, &resp, sizeof(resp), 0);

			&resp_desc, &resp, sizeof(resp),

			QMI_SEND_STATS_REQ_TIMEOUT_MS);



	IPAWANDBG("QMI_IPA_SET_DATA_USAGE_QUOTA_RESP_V01 received\n");
@@ -1169,7 +1171,8 @@ int ipa3_qmi_stop_data_qouta(void) 
	IPAWANDBG("Sending QMI_IPA_STOP_DATA_USAGE_QUOTA_REQ_V01\n");



	rc = qmi_send_req_wait(ipa_q6_clnt, &req_desc, &req, sizeof(req),

		&resp_desc, &resp, sizeof(resp), 0);

		&resp_desc, &resp, sizeof(resp),

		QMI_SEND_STATS_REQ_TIMEOUT_MS);



	IPAWANDBG("QMI_IPA_STOP_DATA_USAGE_QUOTA_RESP_V01 received\n");

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

+4 −2
Original line number Diff line number Diff line
@@ -2041,7 +2041,7 @@ static int ipa3_wwan_remove(struct platform_device *pdev) 
		IPAWANERR("Error deleting resource %d, ret=%d\n",

		IPA_RM_RESOURCE_WWAN_0_PROD, ret);

	cancel_work_sync(&ipa3_tx_wakequeue_work);

	cancel_delayed_work_sync(&ipa_tether_stats_poll_wakequeue_work);

	cancel_delayed_work(&ipa_tether_stats_poll_wakequeue_work);

	free_netdev(ipa3_netdevs[0]);

	ipa3_netdevs[0] = NULL;

	/* No need to remove wwan_ioctl during SSR */
@@ -2258,6 +2258,8 @@ static void tethering_stats_poll_queue(struct work_struct *work) 
{

	rmnet_ipa_get_stats_and_update();



	/* Schedule again only if there's an active polling interval */

	if (0 != ipa_rmnet_ctx.polling_interval)

		schedule_delayed_work(&ipa_tether_stats_poll_wakequeue_work,

			msecs_to_jiffies(ipa3_rmnet_ctx.polling_interval*1000));

}