Merge "msm: ipa: Endpoints of USB and PCI is reversed in order" (16d9829b) · Commits · e / devices / android_kernel_fairphone_FP3

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

+15 −15

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -42,7 +42,6 @@
		#include <asm/cacheflush.h>

		#ifdef CONFIG_ARM64

		/* Outer caches unsupported on ARM64 platforms */
		#define outer_flush_range(x, y)
		#define __cpuc_flush_dcache_area __flush_dcache_area
		@@ -637,17 +636,16 @@ static void ipa3_get_usb_ep_info(
		pair_info[i].producer_pipe_num = -1;
		pair_info[i].ep_id = -1;
		}

		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_USB_PROD);
		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_USB2_PROD);

		if ((ep_index != -1) && ipa3_ctx->ep[ep_index].valid) {
		pair_info[ep_info->num_ep_pairs].consumer_pipe_num = ep_index;
		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_USB_CONS);
		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_USB2_CONS);
		if ((ep_index != -1) && (ipa3_ctx->ep[ep_index].valid)) {
		pair_info[ep_info->num_ep_pairs].producer_pipe_num =
		ep_index;
		pair_info[ep_info->num_ep_pairs].ep_id =
		IPA_USB0_EP_ID;
		IPA_USB1_EP_ID;

		IPADBG("ep_pair_info consumer_pipe_num %d",
		pair_info[ep_info->num_ep_pairs].
		@@ -669,16 +667,17 @@ static void ipa3_get_usb_ep_info(
		}
		}

		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_USB2_PROD);

		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_USB_PROD);

		if ((ep_index != -1) && ipa3_ctx->ep[ep_index].valid) {
		pair_info[ep_info->num_ep_pairs].consumer_pipe_num = ep_index;
		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_USB2_CONS);
		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_USB_CONS);
		if ((ep_index != -1) && (ipa3_ctx->ep[ep_index].valid)) {
		pair_info[ep_info->num_ep_pairs].producer_pipe_num =
		ep_index;
		pair_info[ep_info->num_ep_pairs].ep_id =
		IPA_USB1_EP_ID;
		IPA_USB0_EP_ID;

		IPADBG("ep_pair_info consumer_pipe_num %d",
		pair_info[ep_info->num_ep_pairs].
		@@ -699,6 +698,7 @@ static void ipa3_get_usb_ep_info(
		pair_info[ep_info->num_ep_pairs].ep_id);
		}
		}

		}

		static void ipa3_get_pcie_ep_info(
		@@ -715,16 +715,16 @@ static void ipa3_get_pcie_ep_info(
		pair_info[i].ep_id = -1;
		}

		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_MHI_PROD);
		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_MHI2_PROD);

		if ((ep_index != -1) && ipa3_ctx->ep[ep_index].valid) {
		pair_info[ep_info->num_ep_pairs].consumer_pipe_num = ep_index;
		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_MHI_CONS);
		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_MHI2_CONS);
		if ((ep_index != -1) && (ipa3_ctx->ep[ep_index].valid)) {
		pair_info[ep_info->num_ep_pairs].producer_pipe_num =
		ep_index;
		pair_info[ep_info->num_ep_pairs].ep_id =
		IPA_PCIE0_EP_ID;
		IPA_PCIE1_EP_ID;

		IPADBG("ep_pair_info consumer_pipe_num %d",
		pair_info[ep_info->num_ep_pairs].
		@@ -746,16 +746,16 @@ static void ipa3_get_pcie_ep_info(
		}
		}

		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_MHI2_PROD);
		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_MHI_PROD);

		if ((ep_index != -1) && ipa3_ctx->ep[ep_index].valid) {
		pair_info[ep_info->num_ep_pairs].consumer_pipe_num = ep_index;
		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_MHI2_CONS);
		ep_index = ipa3_get_ep_mapping(IPA_CLIENT_MHI_CONS);
		if ((ep_index != -1) && (ipa3_ctx->ep[ep_index].valid)) {
		pair_info[ep_info->num_ep_pairs].producer_pipe_num =
		ep_index;
		pair_info[ep_info->num_ep_pairs].ep_id =
		IPA_PCIE1_EP_ID;
		IPA_PCIE0_EP_ID;

		IPADBG("ep_pair_info consumer_pipe_num %d",
		pair_info[ep_info->num_ep_pairs].