diff mbox series

[1/4] net/cxgbe: use relative paths for including header files

Message ID 1544713333-32239-2-git-send-email-rahul.lakkireddy@chelsio.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers
Series net/cxgbe: fix build for Microsoft Windows OS support |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS

Commit Message

Rahul Lakkireddy Dec. 13, 2018, 3:02 p.m. UTC 
  Explicitly state header file location using relative paths.

Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
---
 drivers/net/cxgbe/Makefile         | 2 --
 drivers/net/cxgbe/base/adapter.h   | 4 ++--
 drivers/net/cxgbe/base/common.h    | 2 +-
 drivers/net/cxgbe/clip_tbl.c       | 2 +-
 drivers/net/cxgbe/cxgbe.h          | 4 ++--
 drivers/net/cxgbe/cxgbe_ethdev.c   | 2 +-
 drivers/net/cxgbe/cxgbe_filter.c   | 7 ++++---
 drivers/net/cxgbe/cxgbe_filter.h   | 2 +-
 drivers/net/cxgbe/cxgbe_flow.c     | 2 +-
 drivers/net/cxgbe/cxgbe_main.c     | 6 +++---
 drivers/net/cxgbe/cxgbevf_ethdev.c | 2 +-
 drivers/net/cxgbe/cxgbevf_main.c   | 6 +++---
 drivers/net/cxgbe/l2t.c            | 3 ++-
 drivers/net/cxgbe/l2t.h            | 2 +-
 drivers/net/cxgbe/mps_tcam.h       | 2 +-
 drivers/net/cxgbe/sge.c            | 6 +++---
 16 files changed, 27 insertions(+), 27 deletions(-)

Comments

Ferruh Yigit Dec. 18, 2018, 6:23 p.m. UTC | #1 
On 12/13/2018 3:02 PM, Rahul Lakkireddy wrote:
> Explicitly state header file location using relative paths.
> 
> Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
> ---
>  drivers/net/cxgbe/Makefile         | 2 --
>  drivers/net/cxgbe/base/adapter.h   | 4 ++--
>  drivers/net/cxgbe/base/common.h    | 2 +-
>  drivers/net/cxgbe/clip_tbl.c       | 2 +-
>  drivers/net/cxgbe/cxgbe.h          | 4 ++--
>  drivers/net/cxgbe/cxgbe_ethdev.c   | 2 +-
>  drivers/net/cxgbe/cxgbe_filter.c   | 7 ++++---
>  drivers/net/cxgbe/cxgbe_filter.h   | 2 +-
>  drivers/net/cxgbe/cxgbe_flow.c     | 2 +-
>  drivers/net/cxgbe/cxgbe_main.c     | 6 +++---
>  drivers/net/cxgbe/cxgbevf_ethdev.c | 2 +-
>  drivers/net/cxgbe/cxgbevf_main.c   | 6 +++---
>  drivers/net/cxgbe/l2t.c            | 3 ++-
>  drivers/net/cxgbe/l2t.h            | 2 +-
>  drivers/net/cxgbe/mps_tcam.h       | 2 +-
>  drivers/net/cxgbe/sge.c            | 6 +++---
>  16 files changed, 27 insertions(+), 27 deletions(-)
> 
> diff --git a/drivers/net/cxgbe/Makefile b/drivers/net/cxgbe/Makefile
> index 68466f13e..d809f4720 100644
> --- a/drivers/net/cxgbe/Makefile
> +++ b/drivers/net/cxgbe/Makefile
> @@ -9,8 +9,6 @@ include $(RTE_SDK)/mk/rte.vars.mk
>  #
>  LIB = librte_pmd_cxgbe.a
>  
> -CFLAGS += -I$(SRCDIR)/base/
> -CFLAGS += -I$(SRCDIR)
>  CFLAGS += -O3
>  CFLAGS += $(WERROR_FLAGS)

Hi Rahul,

What issue do you observe if you don't use relative paths?
Rahul Lakkireddy Dec. 19, 2018, 12:42 p.m. UTC | #2 
On Tuesday, December 12/18/18, 2018 at 23:53:38 +0530, Ferruh Yigit wrote:
> On 12/13/2018 3:02 PM, Rahul Lakkireddy wrote:
> > Explicitly state header file location using relative paths.
> > 
> > Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
> > ---
> >  drivers/net/cxgbe/Makefile         | 2 --
> >  drivers/net/cxgbe/base/adapter.h   | 4 ++--
> >  drivers/net/cxgbe/base/common.h    | 2 +-
> >  drivers/net/cxgbe/clip_tbl.c       | 2 +-
> >  drivers/net/cxgbe/cxgbe.h          | 4 ++--
> >  drivers/net/cxgbe/cxgbe_ethdev.c   | 2 +-
> >  drivers/net/cxgbe/cxgbe_filter.c   | 7 ++++---
> >  drivers/net/cxgbe/cxgbe_filter.h   | 2 +-
> >  drivers/net/cxgbe/cxgbe_flow.c     | 2 +-
> >  drivers/net/cxgbe/cxgbe_main.c     | 6 +++---
> >  drivers/net/cxgbe/cxgbevf_ethdev.c | 2 +-
> >  drivers/net/cxgbe/cxgbevf_main.c   | 6 +++---
> >  drivers/net/cxgbe/l2t.c            | 3 ++-
> >  drivers/net/cxgbe/l2t.h            | 2 +-
> >  drivers/net/cxgbe/mps_tcam.h       | 2 +-
> >  drivers/net/cxgbe/sge.c            | 6 +++---
> >  16 files changed, 27 insertions(+), 27 deletions(-)
> > 
> > diff --git a/drivers/net/cxgbe/Makefile b/drivers/net/cxgbe/Makefile
> > index 68466f13e..d809f4720 100644
> > --- a/drivers/net/cxgbe/Makefile
> > +++ b/drivers/net/cxgbe/Makefile
> > @@ -9,8 +9,6 @@ include $(RTE_SDK)/mk/rte.vars.mk
> >  #
> >  LIB = librte_pmd_cxgbe.a
> >  
> > -CFLAGS += -I$(SRCDIR)/base/
> > -CFLAGS += -I$(SRCDIR)
> >  CFLAGS += -O3
> >  CFLAGS += $(WERROR_FLAGS)
> 
> Hi Rahul,
> 
> What issue do you observe if you don't use relative paths?

The Intel C++ compiler [1] is not able to locate the header files without
relative path in Windows. We get the following error for these header
files.

# base\common.h(9): error : cannot open source file "cxgbe_compat.h"
    #include "cxgbe_compat.h"
                             ^

We could reproduce the same error by removing the above two lines for
Linux. To keep it consistent across both OS, I'm using relative paths
for both.

[1] https://software.intel.com/en-us/parallel-studio-xe

Thanks,
Rahul
diff mbox series

Patch

diff --git a/drivers/net/cxgbe/Makefile b/drivers/net/cxgbe/Makefile
index 68466f13e..d809f4720 100644
--- a/drivers/net/cxgbe/Makefile
+++ b/drivers/net/cxgbe/Makefile
@@ -9,8 +9,6 @@  include $(RTE_SDK)/mk/rte.vars.mk
 #
 LIB = librte_pmd_cxgbe.a
 
-CFLAGS += -I$(SRCDIR)/base/
-CFLAGS += -I$(SRCDIR)
 CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)
 
diff --git a/drivers/net/cxgbe/base/adapter.h b/drivers/net/cxgbe/base/adapter.h
index 47cfc5f5f..17ce60d04 100644
--- a/drivers/net/cxgbe/base/adapter.h
+++ b/drivers/net/cxgbe/base/adapter.h
@@ -14,9 +14,9 @@ 
 #include <rte_rwlock.h>
 #include <rte_ethdev.h>
 
-#include "cxgbe_compat.h"
+#include "../cxgbe_compat.h"
+#include "../cxgbe_ofld.h"
 #include "t4_regs_values.h"
-#include "cxgbe_ofld.h"
 
 enum {
 	MAX_ETH_QSETS = 64,           /* # of Ethernet Tx/Rx queue sets */
diff --git a/drivers/net/cxgbe/base/common.h b/drivers/net/cxgbe/base/common.h
index fd2006682..84311fc95 100644
--- a/drivers/net/cxgbe/base/common.h
+++ b/drivers/net/cxgbe/base/common.h
@@ -6,7 +6,7 @@ 
 #ifndef __CHELSIO_COMMON_H
 #define __CHELSIO_COMMON_H
 
-#include "cxgbe_compat.h"
+#include "../cxgbe_compat.h"
 #include "t4_hw.h"
 #include "t4vf_hw.h"
 #include "t4_chip_type.h"
diff --git a/drivers/net/cxgbe/clip_tbl.c b/drivers/net/cxgbe/clip_tbl.c
index 5e4dc5270..a0ab2a6ac 100644
--- a/drivers/net/cxgbe/clip_tbl.c
+++ b/drivers/net/cxgbe/clip_tbl.c
@@ -3,7 +3,7 @@ 
  * All rights reserved.
  */
 
-#include "common.h"
+#include "base/common.h"
 #include "clip_tbl.h"
 
 /**
diff --git a/drivers/net/cxgbe/cxgbe.h b/drivers/net/cxgbe/cxgbe.h
index eb58f8802..5a7490f91 100644
--- a/drivers/net/cxgbe/cxgbe.h
+++ b/drivers/net/cxgbe/cxgbe.h
@@ -6,8 +6,8 @@ 
 #ifndef _CXGBE_H_
 #define _CXGBE_H_
 
-#include "common.h"
-#include "t4_regs.h"
+#include "base/common.h"
+#include "base/t4_regs.h"
 
 #define CXGBE_MIN_RING_DESC_SIZE      128  /* Min TX/RX descriptor ring size */
 #define CXGBE_MAX_RING_DESC_SIZE      4096 /* Max TX/RX descriptor ring size */
diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c
index b2f83ea37..010a818eb 100644
--- a/drivers/net/cxgbe/cxgbe_ethdev.c
+++ b/drivers/net/cxgbe/cxgbe_ethdev.c
@@ -57,7 +57,7 @@ 
 /*
  *... and the PCI ID Table itself ...
  */
-#include "t4_pci_id_tbl.h"
+#include "base/t4_pci_id_tbl.h"
 
 uint16_t cxgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
 			 uint16_t nb_pkts)
diff --git a/drivers/net/cxgbe/cxgbe_filter.c b/drivers/net/cxgbe/cxgbe_filter.c
index 3a7912e48..86a6158fd 100644
--- a/drivers/net/cxgbe/cxgbe_filter.c
+++ b/drivers/net/cxgbe/cxgbe_filter.c
@@ -3,9 +3,10 @@ 
  * All rights reserved.
  */
 #include <rte_net.h>
-#include "common.h"
-#include "t4_tcb.h"
-#include "t4_regs.h"
+
+#include "base/common.h"
+#include "base/t4_tcb.h"
+#include "base/t4_regs.h"
 #include "cxgbe_filter.h"
 #include "clip_tbl.h"
 #include "l2t.h"
diff --git a/drivers/net/cxgbe/cxgbe_filter.h b/drivers/net/cxgbe/cxgbe_filter.h
index b7bcbf56a..2d6077718 100644
--- a/drivers/net/cxgbe/cxgbe_filter.h
+++ b/drivers/net/cxgbe/cxgbe_filter.h
@@ -6,7 +6,7 @@ 
 #ifndef _CXGBE_FILTER_H_
 #define _CXGBE_FILTER_H_
 
-#include "t4_msg.h"
+#include "base/t4_msg.h"
 /*
  * Defined bit width of user definable filter tuples
  */
diff --git a/drivers/net/cxgbe/cxgbe_flow.c b/drivers/net/cxgbe/cxgbe_flow.c
index 4deaff8f2..7b9f4d391 100644
--- a/drivers/net/cxgbe/cxgbe_flow.c
+++ b/drivers/net/cxgbe/cxgbe_flow.c
@@ -2,7 +2,7 @@ 
  * Copyright(c) 2018 Chelsio Communications.
  * All rights reserved.
  */
-#include "common.h"
+#include "base/common.h"
 #include "cxgbe_flow.h"
 
 #define __CXGBE_FILL_FS(__v, __m, fs, elem, e) \
diff --git a/drivers/net/cxgbe/cxgbe_main.c b/drivers/net/cxgbe/cxgbe_main.c
index ec080e5d3..27327d500 100644
--- a/drivers/net/cxgbe/cxgbe_main.c
+++ b/drivers/net/cxgbe/cxgbe_main.c
@@ -33,9 +33,9 @@ 
 #include <rte_dev.h>
 #include <rte_kvargs.h>
 
-#include "common.h"
-#include "t4_regs.h"
-#include "t4_msg.h"
+#include "base/common.h"
+#include "base/t4_regs.h"
+#include "base/t4_msg.h"
 #include "cxgbe.h"
 #include "clip_tbl.h"
 #include "l2t.h"
diff --git a/drivers/net/cxgbe/cxgbevf_ethdev.c b/drivers/net/cxgbe/cxgbevf_ethdev.c
index a6458d533..0e93d99e6 100644
--- a/drivers/net/cxgbe/cxgbevf_ethdev.c
+++ b/drivers/net/cxgbe/cxgbevf_ethdev.c
@@ -28,7 +28,7 @@ 
 /*
  *... and the PCI ID Table itself ...
  */
-#include "t4_pci_id_tbl.h"
+#include "base/t4_pci_id_tbl.h"
 
 /*
  * Get port statistics.
diff --git a/drivers/net/cxgbe/cxgbevf_main.c b/drivers/net/cxgbe/cxgbevf_main.c
index 61bd85193..f440b4345 100644
--- a/drivers/net/cxgbe/cxgbevf_main.c
+++ b/drivers/net/cxgbe/cxgbevf_main.c
@@ -7,9 +7,9 @@ 
 #include <rte_ethdev_pci.h>
 #include <rte_malloc.h>
 
-#include "common.h"
-#include "t4_regs.h"
-#include "t4_msg.h"
+#include "base/common.h"
+#include "base/t4_regs.h"
+#include "base/t4_msg.h"
 #include "cxgbe.h"
 #include "mps_tcam.h"
 
diff --git a/drivers/net/cxgbe/l2t.c b/drivers/net/cxgbe/l2t.c
index 814188fea..27cdf6f33 100644
--- a/drivers/net/cxgbe/l2t.c
+++ b/drivers/net/cxgbe/l2t.c
@@ -2,7 +2,8 @@ 
  * Copyright(c) 2018 Chelsio Communications.
  * All rights reserved.
  */
-#include "common.h"
+
+#include "base/common.h"
 #include "l2t.h"
 
 /**
diff --git a/drivers/net/cxgbe/l2t.h b/drivers/net/cxgbe/l2t.h
index 22a34e388..ee40dc1f6 100644
--- a/drivers/net/cxgbe/l2t.h
+++ b/drivers/net/cxgbe/l2t.h
@@ -5,7 +5,7 @@ 
 #ifndef _CXGBE_L2T_H_
 #define _CXGBE_L2T_H_
 
-#include "t4_msg.h"
+#include "base/t4_msg.h"
 
 enum {
 	L2T_SIZE = 4096       /* # of L2T entries */
diff --git a/drivers/net/cxgbe/mps_tcam.h b/drivers/net/cxgbe/mps_tcam.h
index c3d6fe0d7..f86bac7bd 100644
--- a/drivers/net/cxgbe/mps_tcam.h
+++ b/drivers/net/cxgbe/mps_tcam.h
@@ -6,7 +6,7 @@ 
 #ifndef _CXGBE_MPSTCAM_H_
 #define _CXGBE_MPSTCAM_H_
 
-#include "common.h"
+#include "base/common.h"
 
 enum {
 	MPS_ENTRY_UNUSED,	/* Keep this first so memset 0 renders
diff --git a/drivers/net/cxgbe/sge.c b/drivers/net/cxgbe/sge.c
index f9d2d48a0..bf0afb138 100644
--- a/drivers/net/cxgbe/sge.c
+++ b/drivers/net/cxgbe/sge.c
@@ -33,9 +33,9 @@ 
 #include <rte_random.h>
 #include <rte_dev.h>
 
-#include "common.h"
-#include "t4_regs.h"
-#include "t4_msg.h"
+#include "base/common.h"
+#include "base/t4_regs.h"
+#include "base/t4_msg.h"
 #include "cxgbe.h"
 
 static inline void ship_tx_pkt_coalesce_wr(struct adapter *adap,