From 44ea5a55e0eec54f7d092876d8e488e0e7427a73 Mon Sep 17 00:00:00 2001
From: Ilia Lin <ilial@codeaurora.org>
Date: Sun, 24 May 2020 12:13:11 +0300
Subject: [PATCH] techpack: ipa: Fix include path

Defined proper include search path for the header files
in the project, and changed the "#include" lines accordingly.

Change-Id: I759177e2e2c32b2e062774d2a68d40b63a0f6906
Signed-off-by: Ilia Lin <ilial@codeaurora.org>
---
 drivers/platform/msm/Makefile                 | 19 +++++++++++++++++++
 drivers/platform/msm/ipa/Makefile             |  5 -----
 drivers/platform/msm/ipa/ipa_api.c            |  4 ++--
 .../platform/msm/ipa/ipa_clients/ecm_ipa.c    |  6 +++---
 .../msm/ipa/ipa_clients/ipa_clients_manager.c |  2 +-
 .../platform/msm/ipa/ipa_clients/ipa_gsb.c    |  6 +++---
 .../msm/ipa/ipa_clients/ipa_mhi_client.c      |  6 +++---
 .../msm/ipa/ipa_clients/ipa_uc_offload.c      |  4 ++--
 .../platform/msm/ipa/ipa_clients/ipa_usb.c    |  4 ++--
 .../platform/msm/ipa/ipa_clients/ipa_wdi3.c   |  8 ++++----
 .../platform/msm/ipa/ipa_clients/ipa_wigig.c  |  6 +++---
 .../platform/msm/ipa/ipa_clients/rndis_ipa.c  |  4 ++--
 .../msm/ipa/ipa_v3/dump/ipa_reg_dump.h        |  4 ++--
 drivers/platform/msm/ipa/ipa_v3/ipa.c         |  6 +++---
 drivers/platform/msm/ipa/ipa_v3/ipa_client.c  |  2 +-
 drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c |  4 ++--
 drivers/platform/msm/ipa/ipa_v3/ipa_dma.c     |  4 ++--
 drivers/platform/msm/ipa/ipa_v3/ipa_dp.c      |  4 ++--
 drivers/platform/msm/ipa/ipa_v3/ipa_flt.c     |  6 +++---
 drivers/platform/msm/ipa/ipa_v3/ipa_hdr.c     |  4 ++--
 .../platform/msm/ipa/ipa_v3/ipa_hw_stats.c    |  4 ++--
 drivers/platform/msm/ipa/ipa_v3/ipa_i.h       | 12 ++++++------
 drivers/platform/msm/ipa/ipa_v3/ipa_mhi.c     |  4 ++--
 .../platform/msm/ipa/ipa_v3/ipa_mhi_proxy.c   |  4 ++--
 drivers/platform/msm/ipa/ipa_v3/ipa_mpm.c     |  2 +-
 drivers/platform/msm/ipa/ipa_v3/ipa_nat.c     |  6 +++---
 drivers/platform/msm/ipa/ipa_v3/ipa_rt.c      |  6 +++---
 drivers/platform/msm/ipa/ipa_v3/ipa_utils.c   |  8 ++++----
 .../platform/msm/ipa/ipa_v3/ipahal/ipahal.h   |  6 +++---
 .../msm/ipa/ipa_v3/ipahal/ipahal_fltrt.c      |  4 ++--
 .../platform/msm/ipa/ipa_v3/ipahal/ipahal_i.h |  4 ++--
 drivers/platform/msm/ipa/test/ipa_pm_ut.c     |  6 +++---
 drivers/platform/msm/ipa/test/ipa_test_dma.c  |  4 ++--
 .../platform/msm/ipa/test/ipa_test_hw_stats.c |  4 ++--
 drivers/platform/msm/ipa/test/ipa_test_mhi.c  |  8 ++++----
 drivers/platform/msm/ipa/test/ipa_test_wdi3.c |  4 ++--
 .../platform/msm/ipa/test/ipa_ut_framework.c  |  4 ++--
 .../platform/msm/ipa/test/ipa_ut_framework.h  |  4 ++--
 38 files changed, 108 insertions(+), 94 deletions(-)

diff --git a/drivers/platform/msm/Makefile b/drivers/platform/msm/Makefile
index a6cbc24f17dd4..dff2077aacc26 100644
--- 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/
diff --git a/drivers/platform/msm/ipa/Makefile b/drivers/platform/msm/ipa/Makefile
index f6b545245672a..5e9d92db20639 100644
--- 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
diff --git a/drivers/platform/msm/ipa/ipa_api.c b/drivers/platform/msm/ipa/ipa_api.c
index 7d772b5da4017..f006ee20ccc20 100644
--- 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"
diff --git a/drivers/platform/msm/ipa/ipa_clients/ecm_ipa.c b/drivers/platform/msm/ipa/ipa_clients/ecm_ipa.c
index e48476b9a0bf2..3f1e059500011 100644
--- 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"
diff --git a/drivers/platform/msm/ipa/ipa_clients/ipa_clients_manager.c b/drivers/platform/msm/ipa/ipa_clients/ipa_clients_manager.c
index d9f2dc74de25b..6521b02af39d4 100644
--- 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)
 {
diff --git a/drivers/platform/msm/ipa/ipa_clients/ipa_gsb.c b/drivers/platform/msm/ipa/ipa_clients/ipa_gsb.c
index 8393f6bbe8a15..ff5c96c0ad848 100644
--- 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"
diff --git a/drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c b/drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c
index 884f5d41d0ff2..35680ea03a25f 100644
--- 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"
diff --git a/drivers/platform/msm/ipa/ipa_clients/ipa_uc_offload.c b/drivers/platform/msm/ipa/ipa_clients/ipa_uc_offload.c
index 03e2f0626942a..131b683dcb87e 100644
--- 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
diff --git a/drivers/platform/msm/ipa/ipa_clients/ipa_usb.c b/drivers/platform/msm/ipa/ipa_clients/ipa_usb.c
index f3a03cd699799..6b469a9c0e6bc 100644
--- 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
 
diff --git a/drivers/platform/msm/ipa/ipa_clients/ipa_wdi3.c b/drivers/platform/msm/ipa/ipa_clients/ipa_wdi3.c
index ac91a2c292b98..ed34f253628c7 100644
--- 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...) \
diff --git a/drivers/platform/msm/ipa/ipa_clients/ipa_wigig.c b/drivers/platform/msm/ipa/ipa_clients/ipa_wigig.c
index 3d9bbc9428518..df5fbce4e54ae 100644
--- 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"
diff --git a/drivers/platform/msm/ipa/ipa_clients/rndis_ipa.c b/drivers/platform/msm/ipa/ipa_clients/rndis_ipa.c
index 184f4645159ff..d750f8b20895c 100644
--- 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"
diff --git a/drivers/platform/msm/ipa/ipa_v3/dump/ipa_reg_dump.h b/drivers/platform/msm/ipa/ipa_v3/dump/ipa_reg_dump.h
index 9220fbb337fa9..50f8052b17fd5 100644
--- 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"
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa.c b/drivers/platform/msm/ipa/ipa_v3/ipa.c
index 56405a3900160..5a10036abcd6b 100644
--- 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"
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_client.c b/drivers/platform/msm/ipa/ipa_v3/ipa_client.c
index 7e2494454027c..61b0dee32ba79 100644
--- 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-
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c b/drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c
index b4b758ca9e7e5..7dc66375f6e7a 100644
--- 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"
 
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_dma.c b/drivers/platform/msm/ipa/ipa_v3/ipa_dma.c
index b7eb8e6bdf6d8..149e5564cbcb0 100644
--- 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"
 
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_dp.c b/drivers/platform/msm/ipa/ipa_v3/ipa_dp.c
index 4a243d63163c2..6e2adde507024 100644
--- 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
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_flt.c b/drivers/platform/msm/ipa/ipa_v3/ipa_flt.c
index 52f5df9a5ae0d..0391380371a74 100644
--- 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)
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_hdr.c b/drivers/platform/msm/ipa/ipa_v3/ipa_hdr.c
index 87925d89ba6be..ab04374b3afe3 100644
--- 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};
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c b/drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c
index 1b900a27173be..a564ba17dddea 100644
--- 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 && \
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_i.h b/drivers/platform/msm/ipa/ipa_v3/ipa_i.h
index 354f8cdf2321b..75ff76361fb94 100644
--- 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"
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_mhi.c b/drivers/platform/msm/ipa/ipa_v3/ipa_mhi.c
index 184c622f173c1..d6ec6b27c7fc0 100644
--- 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"
 
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_mhi_proxy.c b/drivers/platform/msm/ipa/ipa_v3/ipa_mhi_proxy.c
index 18cc101ec117d..4b5bb58f25382 100644
--- 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"
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_mpm.c b/drivers/platform/msm/ipa/ipa_v3/ipa_mpm.c
index b279b5661a9a9..52289dcf0e3b6 100644
--- 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"
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_nat.c b/drivers/platform/msm/ipa/ipa_v3/ipa_nat.c
index 344656ee13d4d..467294965abbc 100644
--- 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"
 
 
 /*
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c b/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c
index 7c6f123febc0c..378ca1261fbb8 100644
--- 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)
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c b/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c
index de32296db1058..98fe2ed84c2d7 100644
--- 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.
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.h b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.h
index 440c57036f198..7ad96aaf67150 100644
--- 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
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt.c b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt.c
index 5486266ee8f90..5a2fc92985e69 100644
--- 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 | \
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_i.h b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_i.h
index 8ab85cba79d2d..8ee6aba65f34a 100644
--- 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"
 
diff --git a/drivers/platform/msm/ipa/test/ipa_pm_ut.c b/drivers/platform/msm/ipa/test/ipa_pm_ut.c
index 37a03a9bbdea0..07864065ced8f 100644
--- 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>
 
diff --git a/drivers/platform/msm/ipa/test/ipa_test_dma.c b/drivers/platform/msm/ipa/test/ipa_test_dma.c
index 62a1ea9b5a856..d01f094166acd 100644
--- 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
diff --git a/drivers/platform/msm/ipa/test/ipa_test_hw_stats.c b/drivers/platform/msm/ipa/test/ipa_test_hw_stats.c
index 0ee1a80144b75..5355142a6a0ee 100644
--- 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 {
diff --git a/drivers/platform/msm/ipa/test/ipa_test_mhi.c b/drivers/platform/msm/ipa/test/ipa_test_mhi.c
index 79409580a0a35..9cbaf1e117420 100644
--- 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
diff --git a/drivers/platform/msm/ipa/test/ipa_test_wdi3.c b/drivers/platform/msm/ipa/test/ipa_test_wdi3.c
index a6f69cc34138a..971d98cf95bda 100644
--- 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
diff --git a/drivers/platform/msm/ipa/test/ipa_ut_framework.c b/drivers/platform/msm/ipa/test/ipa_ut_framework.c
index 9184a82288430..d0b483bc0ccee 100644
--- 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"
diff --git a/drivers/platform/msm/ipa/test/ipa_ut_framework.h b/drivers/platform/msm/ipa/test/ipa_ut_framework.h
index 5ea1b682b9832..88323ff2c2dd3 100644
--- 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"