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

Commit 4b84bad9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: Fix print unwanted debug logs"

parents 0fac821e 8e89d6bc
Loading
Loading
Loading
Loading
+38 −14
Original line number Diff line number Diff line
@@ -1263,37 +1263,45 @@ int ipa3_get_clients_from_rm_resource(
		clients->names[i++] = IPA_CLIENT_USB_DPL_CONS;
		break;
	case IPA_RM_RESOURCE_HSIC_CONS:
		if (ipa3_get_ep_mapping(IPA_CLIENT_HSIC1_CONS) != -1)
			clients->names[i++] = IPA_CLIENT_HSIC1_CONS;
		break;
	case IPA_RM_RESOURCE_WLAN_CONS:
		clients->names[i++] = IPA_CLIENT_WLAN1_CONS;
		clients->names[i++] = IPA_CLIENT_WLAN2_CONS;
		clients->names[i++] = IPA_CLIENT_WLAN3_CONS;
		if (ipa3_get_ep_mapping(IPA_CLIENT_WLAN4_CONS) != -1)
			clients->names[i++] = IPA_CLIENT_WLAN4_CONS;
		break;
	case IPA_RM_RESOURCE_MHI_CONS:
		if (ipa3_get_ep_mapping(IPA_CLIENT_MHI_CONS) != -1)
			clients->names[i++] = IPA_CLIENT_MHI_CONS;
		break;
	case IPA_RM_RESOURCE_ODU_ADAPT_CONS:
		clients->names[i++] = IPA_CLIENT_ODU_EMB_CONS;
		if (ipa3_get_ep_mapping(IPA_CLIENT_ODU_TETH_CONS) != -1)
			clients->names[i++] = IPA_CLIENT_ODU_TETH_CONS;
		break;
	case IPA_RM_RESOURCE_ETHERNET_CONS:
		if (ipa3_get_ep_mapping(IPA_CLIENT_ETHERNET_CONS) != -1)
			clients->names[i++] = IPA_CLIENT_ETHERNET_CONS;
		break;
	case IPA_RM_RESOURCE_USB_PROD:
		clients->names[i++] = IPA_CLIENT_USB_PROD;
		break;
	case IPA_RM_RESOURCE_HSIC_PROD:
		if (ipa3_get_ep_mapping(IPA_CLIENT_HSIC1_PROD) != -1)
			clients->names[i++] = IPA_CLIENT_HSIC1_PROD;
		break;
	case IPA_RM_RESOURCE_MHI_PROD:
		if (ipa3_get_ep_mapping(IPA_CLIENT_MHI_PROD) != -1)
			clients->names[i++] = IPA_CLIENT_MHI_PROD;
		break;
	case IPA_RM_RESOURCE_ODU_ADAPT_PROD:
		clients->names[i++] = IPA_CLIENT_ODU_PROD;
		break;
	case IPA_RM_RESOURCE_ETHERNET_PROD:
		if (ipa3_get_ep_mapping(IPA_CLIENT_ETHERNET_PROD) != -1)
			clients->names[i++] = IPA_CLIENT_ETHERNET_PROD;
		break;
	default:
@@ -1327,17 +1335,33 @@ bool ipa3_should_pipe_be_suspended(enum ipa_client_type client)
	if (ep->keep_ipa_awake)
		return false;

	if (client == IPA_CLIENT_MHI_CONS &&
		(ipa3_get_ep_mapping(IPA_CLIENT_MHI_CONS) != -1))
		return true;

	if (client == IPA_CLIENT_HSIC1_CONS &&
		(ipa3_get_ep_mapping(IPA_CLIENT_HSIC1_CONS) != -1))
		return true;

	if (client == IPA_CLIENT_WLAN4_CONS &&
		(ipa3_get_ep_mapping(IPA_CLIENT_WLAN4_CONS) != -1))
		return true;

	if (client == IPA_CLIENT_ODU_TETH_CONS &&
		(ipa3_get_ep_mapping(IPA_CLIENT_ODU_TETH_CONS) != -1))
		return true;

	if (client == IPA_CLIENT_ETHERNET_CONS &&
		(ipa3_get_ep_mapping(IPA_CLIENT_ETHERNET_CONS) != -1))
		return true;


	if (client == IPA_CLIENT_USB_CONS     ||
	    client == IPA_CLIENT_USB_DPL_CONS ||
	    client == IPA_CLIENT_MHI_CONS     ||
	    client == IPA_CLIENT_HSIC1_CONS   ||
	    client == IPA_CLIENT_WLAN1_CONS   ||
	    client == IPA_CLIENT_WLAN2_CONS   ||
	    client == IPA_CLIENT_WLAN3_CONS   ||
	    client == IPA_CLIENT_WLAN4_CONS   ||
	    client == IPA_CLIENT_ODU_EMB_CONS ||
	    client == IPA_CLIENT_ODU_TETH_CONS ||
	    client == IPA_CLIENT_ETHERNET_CONS)
	    client == IPA_CLIENT_ODU_EMB_CONS)
		return true;

	return false;