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

Commit ba4a2a49 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa3: remove ipa3_ctx access from wan driver and qmi service"

parents ffa1b348 32a50913

drivers/platform/msm/ipa/ipa_v3/ipa_i.h

+0 −1
Original line number Diff line number Diff line
@@ -437,7 +437,6 @@ enum ipa_type_mode { 
};



enum ipa_flag {

	IPA_PM_EN,

	IPA_ENDP_DELAY_WA_EN,

	IPA_HW_STATS_EN,

	IPA_MHI_EN,

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

+2 −4
Original line number Diff line number Diff line
@@ -8142,12 +8142,12 @@ int ipa3_suspend_apps_pipes(bool suspend) 


	return 0;

undo_prod:

	for (client; client <= IPA_CLIENT_MAX && client >= 0; client--)

	for (; client <= IPA_CLIENT_MAX && client >= 0; client--)

		if (IPA_CLIENT_IS_APPS_PROD(client))

			_ipa_suspend_resume_pipe(client, !suspend);

	client = IPA_CLIENT_MAX;

undo_cons:

	for (client; client <= IPA_CLIENT_MAX && client >= 0; client--)

	for (; client <= IPA_CLIENT_MAX && client >= 0; client--)

		if (IPA_CLIENT_IS_APPS_CONS(client))

			_ipa_suspend_resume_pipe(client, !suspend);

	return res;
@@ -8874,8 +8874,6 @@ int ipa3_ctx_get_type(enum ipa_type_mode type) 
bool ipa3_ctx_get_flag(enum ipa_flag flag)

{

	switch (flag) {

	case IPA_PM_EN:

		return ipa3_ctx->use_ipa_pm;

	case IPA_ENDP_DELAY_WA_EN:

		return ipa3_ctx->ipa_endp_delay_wa;

	case IPA_HW_STATS_EN:

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

+5 −5
Original line number Diff line number Diff line
@@ -3099,7 +3099,7 @@ static int rmnet_ipa3_set_data_quota_wifi(struct wan_ioctl_set_data_quota *data) 
	IPAWANERR("iface name %s, quota %lu\n",

		  data->interface_name, (unsigned long) data->quota_mbytes);



	if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5) {

	if (ipa3_ctx_get_type(IPA_HW_TYPE) >= IPA_HW_v4_5) {

		IPADBG("use ipa-uc for quota\n");

		rc = ipa3_uc_quota_monitor(data->set_quota);

	} else {
@@ -3829,11 +3829,11 @@ int rmnet_ipa3_query_tethering_stats_all( 
			data->upstreamIface);

	} else if (upstream_type == IPA_UPSTEAM_WLAN) {

		IPAWANDBG_LOW(" query wifi-backhaul stats\n");

		if (ipa3_ctx->ipa_hw_type < IPA_HW_v4_5 ||

			!ipa3_ctx->hw_stats.enabled) {

		if (ipa3_ctx_get_type(IPA_HW_TYPE) < IPA_HW_v4_5 ||

			!ipa3_ctx_get_flag(IPA_HW_STATS_EN)) {

			IPAWANDBG("hw version %d,hw_stats.enabled %d\n",

				ipa3_ctx->ipa_hw_type,

				ipa3_ctx->hw_stats.enabled);

				ipa3_ctx_get_type(IPA_HW_TYPE),

				ipa3_ctx_get_flag(IPA_HW_STATS_EN));

			rc = rmnet_ipa3_query_tethering_stats_wifi(

				&tether_stats, data->reset_stats);

			if (rc) {