Merge "techpack: ipa: Fix include path"

2020-07-07 12:45:21 -07:00 · 2020-07-07 12:45:21 -07:00 · 8bb9e5aa2e
commit 8bb9e5aa2e
parent c67509b1c4 44ea5a55e0
38 changed files with 108 additions and 94 deletions
--- a/drivers/platform/msm/Makefile
+++ b/drivers/platform/msm/Makefile
@ -26,5 +26,24 @@ include $(srctree)/techpack/dataipa/config/dataipa_GKI.conf
 endif
 endif

+DATAIPADRVTOP = $(srctree)/techpack/dataipa/drivers/platform/msm
+
+ifneq (,$(filter $(CONFIG_IPA3),y m))
+LINUXINCLUDE += -I$(DATAIPADRVTOP)/gsi
+LINUXINCLUDE += -I$(DATAIPADRVTOP)/ipa
+LINUXINCLUDE += -I$(DATAIPADRVTOP)/ipa/ipa_v3
+LINUXINCLUDE += -I$(DATAIPADRVTOP)/ipa/ipa_v3/ipahal
+LINUXINCLUDE += -I$(DATAIPADRVTOP)/ipa/ipa_clients
+endif
+
+ifneq (,$(filter $(CONFIG_IPA3_REGDUMP),y m))
+LINUXINCLUDE += -I$(DATAIPADRVTOP)/ipa/ipa_v3/dump
+endif
+
+ifneq (,$(filter $(CONFIG_IPA3_REGDUMP_IPA_4_5),y m))
+LINUXINCLUDE += -I$(DATAIPADRVTOP)/ipa/ipa_v3/dump/ipa4.5
+endif
+
+
 obj-$(CONFIG_GSI) += gsi/
 obj-$(CONFIG_IPA3) += ipa/
--- a/drivers/platform/msm/ipa/Makefile
+++ b/drivers/platform/msm/ipa/Makefile
@ -49,8 +49,3 @@ obj-$(CONFIG_IPA3) += ipam.o

 obj-y += ipa_v3/ ipa_clients/

-ccflags-$(CONFIG_IPA3) += -Idrivers/platform/msm/ipa/ipa_v3
-ccflags-$(CONFIG_IPA3) += -Idrivers/platform/msm/ipa/ipa_v3/ipahal
-ccflags-$(CONFIG_IPA3) += -Idrivers/platform/msm/ipa/ipa_clients
-ccflags-$(CONFIG_IPA3_REGDUMP) += -Idrivers/platform/msm/ipa/ipa_v3/dump
-ccflags-$(CONFIG_IPA3_REGDUMP_IPA_4_5) += -Idrivers/platform/msm/ipa/ipa_v3/dump/ipa4.5
--- a/drivers/platform/msm/ipa/ipa_api.c
+++ b/drivers/platform/msm/ipa/ipa_api.c
@ -14,13 +14,13 @@
 #include <linux/ipa_uc_offload.h>
 #include <linux/pci.h>
 #include "ipa_api.h"
-#include "ipa_v3/ipa_i.h"
+#include "ipa_i.h"

 /*
 * The following for adding code (ie. for EMULATION) not found on x86.
 */
 #if defined(CONFIG_IPA_EMULATION)
-# include "ipa_v3/ipa_emulation_stubs.h"
+# include "ipa_emulation_stubs.h"
 #endif

 #define DRV_NAME "ipa"
--- a/drivers/platform/msm/ipa/ipa_clients/ecm_ipa.c
+++ b/drivers/platform/msm/ipa/ipa_clients/ecm_ipa.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
 */

 #include <linux/debugfs.h>
@ -14,8 +14,8 @@
 #include <linux/sched.h>
 #include <linux/atomic.h>
 #include <linux/ecm_ipa.h>
-#include "../ipa_common_i.h"
-#include "../ipa_v3/ipa_pm.h"
+#include "ipa_common_i.h"
+#include "ipa_pm.h"

 #define DRIVER_NAME "ecm_ipa"
 #define ECM_IPA_IPV4_HDR_NAME "ecm_eth_ipv4"
--- a/drivers/platform/msm/ipa/ipa_clients/ipa_clients_manager.c
+++ b/drivers/platform/msm/ipa/ipa_clients/ipa_clients_manager.c
@ -8,7 +8,7 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include "ipa_clients_i.h"
-#include "../ipa_v3/ipa_i.h"
+#include "ipa_i.h"

 static int __init ipa_clients_manager_init(void)
 {
--- a/drivers/platform/msm/ipa/ipa_clients/ipa_gsb.c
+++ b/drivers/platform/msm/ipa/ipa_clients/ipa_gsb.c
@ -19,9 +19,9 @@
 #include <linux/ipa.h>
 #include <linux/cdev.h>
 #include <linux/ipa_odu_bridge.h>
-#include "../ipa_common_i.h"
-#include "../ipa_v3/ipa_pm.h"
-#include "../ipa_v3/ipa_i.h"
+#include "ipa_common_i.h"
+#include "ipa_pm.h"
+#include "ipa_i.h"
 #include <linux/ipa_fmwk.h>

 #define IPA_GSB_DRV_NAME "ipa_gsb"
--- a/drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c
+++ b/drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c
@ -11,9 +11,9 @@
 #include <linux/ipa.h>
 #include <linux/msm_gsi.h>
 #include <linux/ipa_mhi.h>
-#include "../ipa_common_i.h"
-#include "../ipa_v3/ipa_pm.h"
-#include "../ipa_v3/ipa_i.h"
+#include "ipa_common_i.h"
+#include "ipa_pm.h"
+#include "ipa_i.h"
 #include <linux/ipa_fmwk.h>

 #define IPA_MHI_DRV_NAME "ipa_mhi_client"
--- a/drivers/platform/msm/ipa/ipa_clients/ipa_uc_offload.c
+++ b/drivers/platform/msm/ipa/ipa_clients/ipa_uc_offload.c
@ -6,8 +6,8 @@
 #include <linux/ipa_uc_offload.h>
 #include <linux/msm_ipa.h>
 #include <linux/if_vlan.h>
-#include "../ipa_common_i.h"
-#include "../ipa_v3/ipa_pm.h"
+#include "ipa_common_i.h"
+#include "ipa_pm.h"
 #include <linux/ipa_fmwk.h>

 #define IPA_NTN_DMA_POOL_ALIGNMENT 8
--- a/drivers/platform/msm/ipa/ipa_clients/ipa_usb.c
+++ b/drivers/platform/msm/ipa/ipa_clients/ipa_usb.c
@ -12,8 +12,8 @@
 #include <linux/rndis_ipa.h>
 #include <linux/ecm_ipa.h>
 #include <linux/ipa_fmwk.h>
-#include "../ipa_v3/ipa_i.h"
-#include "../ipa_rm_i.h"
+#include "ipa_i.h"
+#include "ipa_rm_i.h"

 #define IPA_USB_DEV_READY_TIMEOUT_MSEC 10000

--- a/drivers/platform/msm/ipa/ipa_clients/ipa_wdi3.c
+++ b/drivers/platform/msm/ipa/ipa_clients/ipa_wdi3.c
@ -1,14 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
 */

 #include <linux/ipa_wdi3.h>
 #include <linux/msm_ipa.h>
 #include <linux/string.h>
-#include "../ipa_common_i.h"
-#include "../ipa_v3/ipa_pm.h"
-#include "../ipa_v3/ipa_i.h"
+#include "ipa_common_i.h"
+#include "ipa_pm.h"
+#include "ipa_i.h"

 #define OFFLOAD_DRV_NAME "ipa_wdi"
 #define IPA_WDI_DBG(fmt, args...) \
--- a/drivers/platform/msm/ipa/ipa_clients/ipa_wigig.c
+++ b/drivers/platform/msm/ipa/ipa_clients/ipa_wigig.c
@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
 */

 #include <linux/ipa_wigig.h>
 #include <linux/debugfs.h>
 #include <linux/string.h>
-#include "../ipa_common_i.h"
-#include "../ipa_v3/ipa_pm.h"
+#include "ipa_common_i.h"
+#include "ipa_pm.h"
 #include <linux/ipa_fmwk.h>

 #define OFFLOAD_DRV_NAME "ipa_wigig"
--- a/drivers/platform/msm/ipa/ipa_clients/rndis_ipa.c
+++ b/drivers/platform/msm/ipa/ipa_clients/rndis_ipa.c
@ -21,8 +21,8 @@
 #include <linux/random.h>
 #include <linux/rndis_ipa.h>
 #include <linux/workqueue.h>
-#include "../ipa_common_i.h"
-#include "../ipa_v3/ipa_pm.h"
+#include "ipa_common_i.h"
+#include "ipa_pm.h"

 #define CREATE_TRACE_POINTS
 #include "rndis_ipa_trace.h"
--- a/drivers/platform/msm/ipa/ipa_v3/dump/ipa_reg_dump.h
+++ b/drivers/platform/msm/ipa/ipa_v3/dump/ipa_reg_dump.h
@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
 */
 #if !defined(_IPA_REG_DUMP_H_)
 #define _IPA_REG_DUMP_H_
@ -8,7 +8,7 @@
 #include <linux/types.h>
 #include <linux/string.h>

-#include "../ipa_i.h"
+#include "ipa_i.h"

 #include "ipa_pkt_cntxt.h"
 #include "ipa_hw_common_ex.h"
--- a/drivers/platform/msm/ipa/ipa_v3/ipa.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa.c
@ -47,9 +47,9 @@
 #define IPA_UC_SUBSYSTEM_NAME "ipa_uc"

 #include "ipa_i.h"
-#include "../ipa_rm_i.h"
-#include "ipahal/ipahal.h"
-#include "ipahal/ipahal_fltrt.h"
+#include "ipa_rm_i.h"
+#include "ipahal.h"
+#include "ipahal_fltrt.h"

 #define CREATE_TRACE_POINTS
 #include "ipa_trace.h"
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_client.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_client.c
@ -7,7 +7,7 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include "ipa_i.h"
-#include "linux/msm_gsi.h"
+#include <linux/msm_gsi.h>

 /*
 * These values were determined empirically and shows good E2E bi-
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c
@ -9,8 +9,8 @@
 #include <linux/kernel.h>
 #include <linux/stringify.h>
 #include "ipa_i.h"
-#include "../ipa_rm_i.h"
-#include "ipahal/ipahal_nat.h"
+#include "ipa_rm_i.h"
+#include "ipahal_nat.h"
 #include "ipa_odl.h"
 #include "ipa_qmi_service.h"

--- a/drivers/platform/msm/ipa/ipa_v3/ipa_dma.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_dma.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
 */


@ -11,7 +11,7 @@
 #include <linux/msm_ipa.h>
 #include <linux/mutex.h>
 #include <linux/ipa.h>
-#include "linux/msm_gsi.h"
+#include <linux/msm_gsi.h>
 #include <linux/dmapool.h>
 #include "ipa_i.h"

--- a/drivers/platform/msm/ipa/ipa_v3/ipa_dp.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_dp.c
@ -13,8 +13,8 @@
 #include <net/sock.h>
 #include "ipa_i.h"
 #include "ipa_trace.h"
-#include "ipahal/ipahal.h"
-#include "ipahal/ipahal_fltrt.h"
+#include "ipahal.h"
+#include "ipahal_fltrt.h"

 #define IPA_GSI_EVENT_RP_SIZE 8
 #define IPA_WAN_AGGR_PKT_CNT 1
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_flt.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_flt.c
@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
 */

 #include "ipa_i.h"
-#include "ipahal/ipahal.h"
-#include "ipahal/ipahal_fltrt.h"
+#include "ipahal.h"
+#include "ipahal_fltrt.h"

 #define IPA_FLT_STATUS_OF_ADD_FAILED		(-1)
 #define IPA_FLT_STATUS_OF_DEL_FAILED		(-1)
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_hdr.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_hdr.c
@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
 */

 #include "ipa_i.h"
-#include "ipahal/ipahal.h"
+#include "ipahal.h"

 static const u32 ipa_hdr_bin_sz[IPA_HDR_BIN_MAX] = { 8, 16, 24, 36, 64};
 static const u32 ipa_hdr_proc_ctx_bin_sz[IPA_HDR_PROC_CTX_BIN_MAX] = { 32, 64};
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c
@ -7,8 +7,8 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include "ipa_i.h"
-#include "ipahal/ipahal.h"
-#include "ipahal/ipahal_hw_stats.h"
+#include "ipahal.h"
+#include "ipahal_hw_stats.h"

 #define IPA_CLIENT_BIT_32(client) \
 	((ipa3_get_ep_mapping(client) >= 0 && \
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_i.h
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_i.h
@ -23,12 +23,12 @@
 #include <linux/platform_device.h>
 #include <linux/firmware.h>
 #include "ipa_qmi_service.h"
-#include "../ipa_api.h"
-#include "ipahal/ipahal_reg.h"
-#include "ipahal/ipahal.h"
-#include "ipahal/ipahal_fltrt.h"
-#include "ipahal/ipahal_hw_stats.h"
-#include "../ipa_common_i.h"
+#include "ipa_api.h"
+#include "ipahal_reg.h"
+#include "ipahal.h"
+#include "ipahal_fltrt.h"
+#include "ipahal_hw_stats.h"
+#include "ipa_common_i.h"
 #include "ipa_uc_offload_i.h"
 #include "ipa_pm.h"
 #include "ipa_defs.h"
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_mhi.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_mhi.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
 */

 #include <linux/debugfs.h>
@ -11,7 +11,7 @@
 #include <linux/ipa.h>
 #include <linux/msm_gsi.h>
 #include <linux/ipa_mhi.h>
-#include "../ipa_common_i.h"
+#include "ipa_common_i.h"
 #include "ipa_i.h"
 #include "ipa_qmi_service.h"

--- a/drivers/platform/msm/ipa/ipa_v3/ipa_mhi_proxy.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_mhi_proxy.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
 */

 #include <linux/dma-mapping.h>
@ -10,7 +10,7 @@
 #include <linux/module.h>
 #include <linux/mhi.h>
 #include "ipa_qmi_service.h"
-#include "../ipa_common_i.h"
+#include "ipa_common_i.h"
 #include "ipa_i.h"

 #define IMP_DRV_NAME "ipa_mhi_proxy"
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_mpm.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_mpm.c
@ -13,7 +13,7 @@
 #include <linux/delay.h>
 #include <linux/log2.h>
 #include <linux/gfp.h>
-#include "../ipa_common_i.h"
+#include "ipa_common_i.h"
 #include "ipa_i.h"

 #define IPA_MPM_DRV_NAME "ipa_mpm"
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_nat.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_nat.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
 */

 #include <linux/device.h>
@ -11,8 +11,8 @@
 #include <linux/uaccess.h>
 #include <linux/dma-noncoherent.h>
 #include "ipa_i.h"
-#include "ipahal/ipahal.h"
-#include "ipahal/ipahal_nat.h"
+#include "ipahal.h"
+#include "ipahal_nat.h"


 /*
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c
@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
 */

 #include <linux/bitops.h>
 #include <linux/idr.h>
 #include "ipa_i.h"
-#include "ipahal/ipahal.h"
-#include "ipahal/ipahal_fltrt.h"
+#include "ipahal.h"
+#include "ipahal_fltrt.h"

 #define IPA_RT_INDEX_BITMAP_SIZE	(32)
 #define IPA_RT_STATUS_OF_ADD_FAILED	(-1)
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c
@ -11,10 +11,10 @@
 #include <linux/msm_gsi.h>
 #include <linux/elf.h>
 #include "ipa_i.h"
-#include "ipahal/ipahal.h"
-#include "ipahal/ipahal_fltrt.h"
-#include "ipahal/ipahal_hw_stats.h"
-#include "../ipa_rm_i.h"
+#include "ipahal.h"
+#include "ipahal_fltrt.h"
+#include "ipahal_hw_stats.h"
+#include "ipa_rm_i.h"

 /*
 * The following for adding code (ie. for EMULATION) not found on x86.
--- a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.h
+++ b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.h
@ -1,13 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
 */

 #ifndef _IPAHAL_H_
 #define _IPAHAL_H_

-#include "../ipa_defs.h"
-#include "../../ipa_common_i.h"
+#include "ipa_defs.h"
+#include "ipa_common_i.h"

 /*
 * Immediate command names
--- a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
 */

 #include <linux/ipa.h>
@ -11,7 +11,7 @@
 #include "ipahal_fltrt.h"
 #include "ipahal_fltrt_i.h"
 #include "ipahal_i.h"
-#include "../../ipa_common_i.h"
+#include "ipa_common_i.h"

 #define IPA_MAC_FLT_BITS (IPA_FLT_MAC_DST_ADDR_ETHER_II | \
 		IPA_FLT_MAC_SRC_ADDR_ETHER_II | IPA_FLT_MAC_DST_ADDR_802_3 | \
--- a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_i.h
+++ b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_i.h
@ -1,13 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
 */

 #ifndef _IPAHAL_I_H_
 #define _IPAHAL_I_H_

 #include <linux/ipa.h>
-#include "../../ipa_common_i.h"
+#include "ipa_common_i.h"

 #define IPAHAL_DRV_NAME "ipahal"

--- a/drivers/platform/msm/ipa/test/ipa_pm_ut.c
+++ b/drivers/platform/msm/ipa/test/ipa_pm_ut.c
@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
 */

 #include <linux/ipa.h>
-#include "../ipa_v3/ipa_pm.h"
-#include "../ipa_v3/ipa_i.h"
+#include "ipa_pm.h"
+#include "ipa_i.h"
 #include "ipa_ut_framework.h"
 #include <linux/delay.h>

--- a/drivers/platform/msm/ipa/test/ipa_test_dma.c
+++ b/drivers/platform/msm/ipa/test/ipa_test_dma.c
@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
 */

 #include <linux/ipa.h>
-#include "../ipa_v3/ipa_i.h"
+#include "ipa_i.h"
 #include "ipa_ut_framework.h"

 #define IPA_TEST_DMA_WQ_NAME_BUFF_SZ		64
--- a/drivers/platform/msm/ipa/test/ipa_test_hw_stats.c
+++ b/drivers/platform/msm/ipa/test/ipa_test_hw_stats.c
@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
 */

 #include "ipa_ut_framework.h"
-#include "../ipa_v3/ipa_i.h"
+#include "ipa_i.h"
 #include <linux/netdevice.h>

 struct ipa_test_hw_stats_ctx {
--- a/drivers/platform/msm/ipa/test/ipa_test_mhi.c
+++ b/drivers/platform/msm/ipa/test/ipa_test_mhi.c
@ -1,14 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
 */

 #include <linux/delay.h>
 #include <linux/ipa_mhi.h>
 #include <linux/ipa.h>
-#include "../ipa_v3/ipa_i.h"
-#include "../../gsi/gsi.h"
-#include "../../gsi/gsi_reg.h"
+#include "ipa_i.h"
+#include "gsi.h"
+#include "gsi_reg.h"
 #include "ipa_ut_framework.h"

 #define IPA_MHI_TEST_NUM_CHANNELS		8
--- a/drivers/platform/msm/ipa/test/ipa_test_wdi3.c
+++ b/drivers/platform/msm/ipa/test/ipa_test_wdi3.c
@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2018 - 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018 - 2020, The Linux Foundation. All rights reserved.
 */

 #include "ipa_ut_framework.h"
 #include <linux/ipa_wdi3.h>
 #include <linux/ipa.h>
 #include <linux/delay.h>
-#include "../ipa_v3/ipa_i.h"
+#include "ipa_i.h"

 #define NUM_TX_BUFS 10
 #define NUM_RX_BUFS 10
--- a/drivers/platform/msm/ipa/test/ipa_ut_framework.c
+++ b/drivers/platform/msm/ipa/test/ipa_ut_framework.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
 */

 #include <linux/mutex.h>
@ -8,7 +8,7 @@
 #include <linux/debugfs.h>
 #include <linux/device.h>
 #include <linux/ipa.h>
-#include "../ipa_v3/ipa_i.h"
+#include "ipa_i.h"
 #include "ipa_ut_framework.h"
 #include "ipa_ut_suite_list.h"
 #include "ipa_ut_i.h"
--- a/drivers/platform/msm/ipa/test/ipa_ut_framework.h
+++ b/drivers/platform/msm/ipa/test/ipa_ut_framework.h
@ -1,13 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
 */

 #ifndef _IPA_UT_FRAMEWORK_H_
 #define _IPA_UT_FRAMEWORK_H_

 #include <linux/kernel.h>
-#include "../ipa_common_i.h"
+#include "ipa_common_i.h"
 #include "ipa_ut_i.h"

 #define IPA_UT_DRV_NAME "ipa_ut"