* [PATCH 0/2] infiniband: trivial header search path fixups
@ 2019-01-25 4:39 Masahiro Yamada
2019-01-25 4:39 ` [PATCH 1/2] infiniband: remove unneeded header search paths Masahiro Yamada
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Masahiro Yamada @ 2019-01-25 4:39 UTC (permalink / raw)
To: Jason Gunthorpe, linux-rdma, Doug Ledford
Cc: Masahiro Yamada, Jason Gunthorpe, Somnath Kotur, Sagi Grimberg,
Nelson Escobar, Sriharsha Basavapatna, Parvi Kaustubhi,
linux-kernel, Lijun Ou, Steve Wise, target-devel,
Christian Benvenuti, Faisal Latif, Bart Van Assche, Shiraz Saleem,
Selvin Xavier, Wei Hu(Xavier), Devesh Sharma
My main motivation is to get rid of crappy header search path manipulation
from Kbuild core.
Before that, I want to do as many treewide cleanups as possible.
If you are interested in the big picture of this work,
the full patch set is available at:
git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git build-test
Masahiro Yamada (2):
infiniband: remove unneeded header search paths
infiniband: prefix header search paths with $(srctree)/
drivers/infiniband/hw/bnxt_re/Makefile | 2 +-
drivers/infiniband/hw/cxgb3/Makefile | 2 +-
drivers/infiniband/hw/cxgb4/Makefile | 4 ++--
drivers/infiniband/hw/hns/Makefile | 2 +-
drivers/infiniband/hw/i40iw/Makefile | 2 +-
drivers/infiniband/hw/ocrdma/Makefile | 2 +-
drivers/infiniband/hw/usnic/Makefile | 2 +-
drivers/infiniband/ulp/isert/Makefile | 1 -
drivers/infiniband/ulp/srpt/Makefile | 1 -
9 files changed, 8 insertions(+), 10 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] infiniband: remove unneeded header search paths 2019-01-25 4:39 [PATCH 0/2] infiniband: trivial header search path fixups Masahiro Yamada @ 2019-01-25 4:39 ` Masahiro Yamada 2019-01-25 5:27 ` Bart Van Assche 2019-01-25 4:39 ` [PATCH 2/2] infiniband: prefix header search paths with $(srctree)/ Masahiro Yamada 2019-01-25 22:51 ` [PATCH 0/2] infiniband: trivial header search path fixups Jason Gunthorpe 2 siblings, 1 reply; 6+ messages in thread From: Masahiro Yamada @ 2019-01-25 4:39 UTC (permalink / raw) To: Jason Gunthorpe, linux-rdma, Doug Ledford Cc: Masahiro Yamada, Jason Gunthorpe, Sagi Grimberg, linux-kernel, target-devel, Bart Van Assche The included headers are located in include/target/. I was able to build these drivers without the extra header search paths. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- drivers/infiniband/ulp/isert/Makefile | 1 - drivers/infiniband/ulp/srpt/Makefile | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/infiniband/ulp/isert/Makefile b/drivers/infiniband/ulp/isert/Makefile index c8bf242..a4a4766 100644 --- a/drivers/infiniband/ulp/isert/Makefile +++ b/drivers/infiniband/ulp/isert/Makefile @@ -1,2 +1 @@ -ccflags-y := -Idrivers/target -Idrivers/target/iscsi obj-$(CONFIG_INFINIBAND_ISERT) += ib_isert.o diff --git a/drivers/infiniband/ulp/srpt/Makefile b/drivers/infiniband/ulp/srpt/Makefile index e3ee4bd..43fbde4 100644 --- a/drivers/infiniband/ulp/srpt/Makefile +++ b/drivers/infiniband/ulp/srpt/Makefile @@ -1,2 +1 @@ -ccflags-y := -Idrivers/target obj-$(CONFIG_INFINIBAND_SRPT) += ib_srpt.o -- 2.7.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] infiniband: remove unneeded header search paths 2019-01-25 4:39 ` [PATCH 1/2] infiniband: remove unneeded header search paths Masahiro Yamada @ 2019-01-25 5:27 ` Bart Van Assche 0 siblings, 0 replies; 6+ messages in thread From: Bart Van Assche @ 2019-01-25 5:27 UTC (permalink / raw) To: Masahiro Yamada, Jason Gunthorpe, linux-rdma, Doug Ledford Cc: Jason Gunthorpe, Sagi Grimberg, linux-kernel, target-devel On 1/24/19 8:39 PM, Masahiro Yamada wrote: > The included headers are located in include/target/. I was able to > build these drivers without the extra header search paths. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > drivers/infiniband/ulp/isert/Makefile | 1 - > drivers/infiniband/ulp/srpt/Makefile | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/drivers/infiniband/ulp/isert/Makefile b/drivers/infiniband/ulp/isert/Makefile > index c8bf242..a4a4766 100644 > --- a/drivers/infiniband/ulp/isert/Makefile > +++ b/drivers/infiniband/ulp/isert/Makefile > @@ -1,2 +1 @@ > -ccflags-y := -Idrivers/target -Idrivers/target/iscsi > obj-$(CONFIG_INFINIBAND_ISERT) += ib_isert.o > diff --git a/drivers/infiniband/ulp/srpt/Makefile b/drivers/infiniband/ulp/srpt/Makefile > index e3ee4bd..43fbde4 100644 > --- a/drivers/infiniband/ulp/srpt/Makefile > +++ b/drivers/infiniband/ulp/srpt/Makefile > @@ -1,2 +1 @@ > -ccflags-y := -Idrivers/target > obj-$(CONFIG_INFINIBAND_SRPT) += ib_srpt.o Reviewed-by: Bart Van Assche <bvanassche@acm.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] infiniband: prefix header search paths with $(srctree)/ 2019-01-25 4:39 [PATCH 0/2] infiniband: trivial header search path fixups Masahiro Yamada 2019-01-25 4:39 ` [PATCH 1/2] infiniband: remove unneeded header search paths Masahiro Yamada @ 2019-01-25 4:39 ` Masahiro Yamada 2019-01-25 21:35 ` Parvi Kaustubhi (pkaustub) 2019-01-25 22:51 ` [PATCH 0/2] infiniband: trivial header search path fixups Jason Gunthorpe 2 siblings, 1 reply; 6+ messages in thread From: Masahiro Yamada @ 2019-01-25 4:39 UTC (permalink / raw) To: Jason Gunthorpe, linux-rdma, Doug Ledford Cc: Masahiro Yamada, Jason Gunthorpe, Somnath Kotur, Christian Benvenuti, Nelson Escobar, Sriharsha Basavapatna, Parvi Kaustubhi, Lijun Ou, linux-kernel, Steve Wise, Faisal Latif, Shiraz Saleem, Selvin Xavier, Wei Hu(Xavier), Devesh Sharma Currently, the Kbuild core manipulates header search paths in a crazy way [1]. To fix this mess, I want all Makefiles to add explicit $(srctree)/ to the search paths in the srctree. Some Makefiles are already written in that way, but not all. The goal of this work is to make the notation consistent, and finally get rid of the gross hacks. Having whitespaces after -I does not matter since commit 48f6e3cf5bc6 ("kbuild: do not drop -I without parameter"). [1]: https://patchwork.kernel.org/patch/9632347/ Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- drivers/infiniband/hw/bnxt_re/Makefile | 2 +- drivers/infiniband/hw/cxgb3/Makefile | 2 +- drivers/infiniband/hw/cxgb4/Makefile | 4 ++-- drivers/infiniband/hw/hns/Makefile | 2 +- drivers/infiniband/hw/i40iw/Makefile | 2 +- drivers/infiniband/hw/ocrdma/Makefile | 2 +- drivers/infiniband/hw/usnic/Makefile | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/infiniband/hw/bnxt_re/Makefile b/drivers/infiniband/hw/bnxt_re/Makefile index 6e3bc25..ee9bb1b 100644 --- a/drivers/infiniband/hw/bnxt_re/Makefile +++ b/drivers/infiniband/hw/bnxt_re/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y := -Idrivers/net/ethernet/broadcom/bnxt +ccflags-y := -I $(srctree)/drivers/net/ethernet/broadcom/bnxt obj-$(CONFIG_INFINIBAND_BNXT_RE) += bnxt_re.o bnxt_re-y := main.o ib_verbs.o \ qplib_res.o qplib_rcfw.o \ diff --git a/drivers/infiniband/hw/cxgb3/Makefile b/drivers/infiniband/hw/cxgb3/Makefile index 66fe091..34bb86a 100644 --- a/drivers/infiniband/hw/cxgb3/Makefile +++ b/drivers/infiniband/hw/cxgb3/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb3 +ccflags-y := -I $(srctree)/drivers/net/ethernet/chelsio/cxgb3 obj-$(CONFIG_INFINIBAND_CXGB3) += iw_cxgb3.o diff --git a/drivers/infiniband/hw/cxgb4/Makefile b/drivers/infiniband/hw/cxgb4/Makefile index 9edd920..31a87d9 100644 --- a/drivers/infiniband/hw/cxgb4/Makefile +++ b/drivers/infiniband/hw/cxgb4/Makefile @@ -1,5 +1,5 @@ -ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4 -ccflags-y += -Idrivers/net/ethernet/chelsio/libcxgb +ccflags-y := -I $(srctree)/drivers/net/ethernet/chelsio/cxgb4 +ccflags-y += -I $(srctree)/drivers/net/ethernet/chelsio/libcxgb obj-$(CONFIG_INFINIBAND_CXGB4) += iw_cxgb4.o diff --git a/drivers/infiniband/hw/hns/Makefile b/drivers/infiniband/hw/hns/Makefile index 004c88b..e2a7f14 100644 --- a/drivers/infiniband/hw/hns/Makefile +++ b/drivers/infiniband/hw/hns/Makefile @@ -2,7 +2,7 @@ # Makefile for the Hisilicon RoCE drivers. # -ccflags-y := -Idrivers/net/ethernet/hisilicon/hns3 +ccflags-y := -I $(srctree)/drivers/net/ethernet/hisilicon/hns3 obj-$(CONFIG_INFINIBAND_HNS) += hns-roce.o hns-roce-objs := hns_roce_main.o hns_roce_cmd.o hns_roce_pd.o \ diff --git a/drivers/infiniband/hw/i40iw/Makefile b/drivers/infiniband/hw/i40iw/Makefile index 5a8a7a3..8942f82 100644 --- a/drivers/infiniband/hw/i40iw/Makefile +++ b/drivers/infiniband/hw/i40iw/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y := -Idrivers/net/ethernet/intel/i40e +ccflags-y := -I $(srctree)/drivers/net/ethernet/intel/i40e obj-$(CONFIG_INFINIBAND_I40IW) += i40iw.o diff --git a/drivers/infiniband/hw/ocrdma/Makefile b/drivers/infiniband/hw/ocrdma/Makefile index d1bfd4f..e3f20ca 100644 --- a/drivers/infiniband/hw/ocrdma/Makefile +++ b/drivers/infiniband/hw/ocrdma/Makefile @@ -1,4 +1,4 @@ -ccflags-y := -Idrivers/net/ethernet/emulex/benet +ccflags-y := -I $(srctree)/drivers/net/ethernet/emulex/benet obj-$(CONFIG_INFINIBAND_OCRDMA) += ocrdma.o diff --git a/drivers/infiniband/hw/usnic/Makefile b/drivers/infiniband/hw/usnic/Makefile index 94ae7a1..f12a493 100644 --- a/drivers/infiniband/hw/usnic/Makefile +++ b/drivers/infiniband/hw/usnic/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y := -Idrivers/net/ethernet/cisco/enic +ccflags-y := -I $(srctree)/drivers/net/ethernet/cisco/enic obj-$(CONFIG_INFINIBAND_USNIC)+= usnic_verbs.o -- 2.7.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] infiniband: prefix header search paths with $(srctree)/ 2019-01-25 4:39 ` [PATCH 2/2] infiniband: prefix header search paths with $(srctree)/ Masahiro Yamada @ 2019-01-25 21:35 ` Parvi Kaustubhi (pkaustub) 0 siblings, 0 replies; 6+ messages in thread From: Parvi Kaustubhi (pkaustub) @ 2019-01-25 21:35 UTC (permalink / raw) To: Masahiro Yamada Cc: Jason Gunthorpe, linux-rdma@vger.kernel.org, Doug Ledford, Jason Gunthorpe, Somnath Kotur, Christian Benvenuti (benve), Nelson Escobar (neescoba), Sriharsha Basavapatna, Lijun Ou, linux-kernel@vger.kernel.org, Steve Wise, Faisal Latif, Shiraz Saleem, Selvin Xavier, Wei Hu(Xavier), Devesh Sharma Thanks, Acked-by: Parvi Kaustubhi <pkaustub@cisco.com> > On Jan 24, 2019, at 8:39 PM, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > > Currently, the Kbuild core manipulates header search paths in a crazy > way [1]. > > To fix this mess, I want all Makefiles to add explicit $(srctree)/ to > the search paths in the srctree. Some Makefiles are already written in > that way, but not all. The goal of this work is to make the notation > consistent, and finally get rid of the gross hacks. > > Having whitespaces after -I does not matter since commit 48f6e3cf5bc6 > ("kbuild: do not drop -I without parameter"). > > [1]: https://patchwork.kernel.org/patch/9632347/ > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > drivers/infiniband/hw/bnxt_re/Makefile | 2 +- > drivers/infiniband/hw/cxgb3/Makefile | 2 +- > drivers/infiniband/hw/cxgb4/Makefile | 4 ++-- > drivers/infiniband/hw/hns/Makefile | 2 +- > drivers/infiniband/hw/i40iw/Makefile | 2 +- > drivers/infiniband/hw/ocrdma/Makefile | 2 +- > drivers/infiniband/hw/usnic/Makefile | 2 +- > 7 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/infiniband/hw/bnxt_re/Makefile b/drivers/infiniband/hw/bnxt_re/Makefile > index 6e3bc25..ee9bb1b 100644 > --- a/drivers/infiniband/hw/bnxt_re/Makefile > +++ b/drivers/infiniband/hw/bnxt_re/Makefile > @@ -1,6 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0 > > -ccflags-y := -Idrivers/net/ethernet/broadcom/bnxt > +ccflags-y := -I $(srctree)/drivers/net/ethernet/broadcom/bnxt > obj-$(CONFIG_INFINIBAND_BNXT_RE) += bnxt_re.o > bnxt_re-y := main.o ib_verbs.o \ > qplib_res.o qplib_rcfw.o \ > diff --git a/drivers/infiniband/hw/cxgb3/Makefile b/drivers/infiniband/hw/cxgb3/Makefile > index 66fe091..34bb86a 100644 > --- a/drivers/infiniband/hw/cxgb3/Makefile > +++ b/drivers/infiniband/hw/cxgb3/Makefile > @@ -1,5 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0 > -ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb3 > +ccflags-y := -I $(srctree)/drivers/net/ethernet/chelsio/cxgb3 > > obj-$(CONFIG_INFINIBAND_CXGB3) += iw_cxgb3.o > > diff --git a/drivers/infiniband/hw/cxgb4/Makefile b/drivers/infiniband/hw/cxgb4/Makefile > index 9edd920..31a87d9 100644 > --- a/drivers/infiniband/hw/cxgb4/Makefile > +++ b/drivers/infiniband/hw/cxgb4/Makefile > @@ -1,5 +1,5 @@ > -ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4 > -ccflags-y += -Idrivers/net/ethernet/chelsio/libcxgb > +ccflags-y := -I $(srctree)/drivers/net/ethernet/chelsio/cxgb4 > +ccflags-y += -I $(srctree)/drivers/net/ethernet/chelsio/libcxgb > > obj-$(CONFIG_INFINIBAND_CXGB4) += iw_cxgb4.o > > diff --git a/drivers/infiniband/hw/hns/Makefile b/drivers/infiniband/hw/hns/Makefile > index 004c88b..e2a7f14 100644 > --- a/drivers/infiniband/hw/hns/Makefile > +++ b/drivers/infiniband/hw/hns/Makefile > @@ -2,7 +2,7 @@ > # Makefile for the Hisilicon RoCE drivers. > # > > -ccflags-y := -Idrivers/net/ethernet/hisilicon/hns3 > +ccflags-y := -I $(srctree)/drivers/net/ethernet/hisilicon/hns3 > > obj-$(CONFIG_INFINIBAND_HNS) += hns-roce.o > hns-roce-objs := hns_roce_main.o hns_roce_cmd.o hns_roce_pd.o \ > diff --git a/drivers/infiniband/hw/i40iw/Makefile b/drivers/infiniband/hw/i40iw/Makefile > index 5a8a7a3..8942f82 100644 > --- a/drivers/infiniband/hw/i40iw/Makefile > +++ b/drivers/infiniband/hw/i40iw/Makefile > @@ -1,5 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0 > -ccflags-y := -Idrivers/net/ethernet/intel/i40e > +ccflags-y := -I $(srctree)/drivers/net/ethernet/intel/i40e > > obj-$(CONFIG_INFINIBAND_I40IW) += i40iw.o > > diff --git a/drivers/infiniband/hw/ocrdma/Makefile b/drivers/infiniband/hw/ocrdma/Makefile > index d1bfd4f..e3f20ca 100644 > --- a/drivers/infiniband/hw/ocrdma/Makefile > +++ b/drivers/infiniband/hw/ocrdma/Makefile > @@ -1,4 +1,4 @@ > -ccflags-y := -Idrivers/net/ethernet/emulex/benet > +ccflags-y := -I $(srctree)/drivers/net/ethernet/emulex/benet > > obj-$(CONFIG_INFINIBAND_OCRDMA) += ocrdma.o > > diff --git a/drivers/infiniband/hw/usnic/Makefile b/drivers/infiniband/hw/usnic/Makefile > index 94ae7a1..f12a493 100644 > --- a/drivers/infiniband/hw/usnic/Makefile > +++ b/drivers/infiniband/hw/usnic/Makefile > @@ -1,5 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0 > -ccflags-y := -Idrivers/net/ethernet/cisco/enic > +ccflags-y := -I $(srctree)/drivers/net/ethernet/cisco/enic > > obj-$(CONFIG_INFINIBAND_USNIC)+= usnic_verbs.o > > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] infiniband: trivial header search path fixups 2019-01-25 4:39 [PATCH 0/2] infiniband: trivial header search path fixups Masahiro Yamada 2019-01-25 4:39 ` [PATCH 1/2] infiniband: remove unneeded header search paths Masahiro Yamada 2019-01-25 4:39 ` [PATCH 2/2] infiniband: prefix header search paths with $(srctree)/ Masahiro Yamada @ 2019-01-25 22:51 ` Jason Gunthorpe 2 siblings, 0 replies; 6+ messages in thread From: Jason Gunthorpe @ 2019-01-25 22:51 UTC (permalink / raw) To: Masahiro Yamada Cc: linux-rdma, Doug Ledford, Somnath Kotur, Sagi Grimberg, Nelson Escobar, Sriharsha Basavapatna, Parvi Kaustubhi, linux-kernel, Lijun Ou, Steve Wise, target-devel, Christian Benvenuti, Faisal Latif, Bart Van Assche, Shiraz Saleem, Selvin Xavier, Wei Hu(Xavier), Devesh Sharma On Fri, Jan 25, 2019 at 01:39:29PM +0900, Masahiro Yamada wrote: > My main motivation is to get rid of crappy header search path manipulation > from Kbuild core. > > Before that, I want to do as many treewide cleanups as possible. > > If you are interested in the big picture of this work, > the full patch set is available at: > > git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git build-test > > > > Masahiro Yamada (2): > infiniband: remove unneeded header search paths > infiniband: prefix header search paths with $(srctree)/ Still compiles for me too, applied to rdam for-next Thanks, Jason ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-01-25 22:51 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-01-25 4:39 [PATCH 0/2] infiniband: trivial header search path fixups Masahiro Yamada 2019-01-25 4:39 ` [PATCH 1/2] infiniband: remove unneeded header search paths Masahiro Yamada 2019-01-25 5:27 ` Bart Van Assche 2019-01-25 4:39 ` [PATCH 2/2] infiniband: prefix header search paths with $(srctree)/ Masahiro Yamada 2019-01-25 21:35 ` Parvi Kaustubhi (pkaustub) 2019-01-25 22:51 ` [PATCH 0/2] infiniband: trivial header search path fixups Jason Gunthorpe
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox