[dpdk-dev,v6,4/5] iFPGA: add meson build
Checks
Commit Message
From: Figo Zhang <tianfei.zhang@intel.com>
add meson build support for iFPGA driver.
Signed-off-by: Figo Zhang <tianfei.zhang@intel.com>
---
drivers/meson.build | 3 ++-
drivers/raw/ifpga_rawdev/base/meson.build | 34 +++++++++++++++++++++++++++++++
drivers/raw/ifpga_rawdev/meson.build | 13 ++++++++++++
drivers/raw/meson.build | 6 ++++++
4 files changed, 55 insertions(+), 1 deletion(-)
create mode 100644 drivers/raw/ifpga_rawdev/base/meson.build
create mode 100644 drivers/raw/ifpga_rawdev/meson.build
create mode 100644 drivers/raw/meson.build
Comments
On Thursday 26 April 2018 03:13 PM, Xu, Rosen wrote:
> From: Figo Zhang <tianfei.zhang@intel.com>
>
> add meson build support for iFPGA driver.
>
> Signed-off-by: Figo Zhang <tianfei.zhang@intel.com>
> ---
> drivers/meson.build | 3 ++-
> drivers/raw/ifpga_rawdev/base/meson.build | 34 +++++++++++++++++++++++++++++++
> drivers/raw/ifpga_rawdev/meson.build | 13 ++++++++++++
> drivers/raw/meson.build | 6 ++++++
> 4 files changed, 55 insertions(+), 1 deletion(-)
> create mode 100644 drivers/raw/ifpga_rawdev/base/meson.build
> create mode 100644 drivers/raw/ifpga_rawdev/meson.build
> create mode 100644 drivers/raw/meson.build
>
> diff --git a/drivers/meson.build b/drivers/meson.build
> index b146f09..b7fc0d6 100644
> --- a/drivers/meson.build
> +++ b/drivers/meson.build
> @@ -7,7 +7,8 @@ driver_classes = ['common',
> 'mempool', # depends on common and bus.
> 'net', # depends on common, bus and mempool.
> 'crypto', # depends on common, bus and mempool (net in future).
> - 'event'] # depends on common, bus, mempool and net.
> + 'event', # depends on common, bus, mempool and net.
> + 'raw']
>
> foreach class:driver_classes
> drivers = []
[...]
> diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build
> new file mode 100644
> index 0000000..410f908
> --- /dev/null
> +++ b/drivers/raw/meson.build
> @@ -0,0 +1,6 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +# Copyright(c) 2017 Intel Corporation
> +
> +drivers = ['ifpga_rawdev']
> +config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
> +driver_name_fmt = 'rte_@0@'
>
Just a heads-up for Thomas/Ferruh: Either this or patches from Nipun [1]
would conflict here as drivers/raw/meson.build is being introduced by both.
[1] http://dpdk.org/ml/archives/dev/2018-April/098827.html
> -----Original Message-----
> From: Shreyansh Jain [mailto:shreyansh.jain@nxp.com]
> Sent: Wednesday, May 2, 2018 5:47 PM
> To: Xu, Rosen <rosen.xu@intel.com>; dev@dpdk.org; Yigit, Ferruh
> <ferruh.yigit@intel.com>
> Cc: Doherty, Declan <declan.doherty@intel.com>; Richardson, Bruce
> <bruce.richardson@intel.com>; Ananyev, Konstantin
> <konstantin.ananyev@intel.com>; Zhang, Tianfei <tianfei.zhang@intel.com>;
> Wu, Hao <hao.wu@intel.com>; gaetan.rivet@6wind.com
> Subject: Re: [dpdk-dev] [PATCH v6 4/5] iFPGA: add meson build
>
> On Thursday 26 April 2018 03:13 PM, Xu, Rosen wrote:
> > From: Figo Zhang <tianfei.zhang@intel.com>
> >
> > add meson build support for iFPGA driver.
> >
> > Signed-off-by: Figo Zhang <tianfei.zhang@intel.com>
> > ---
> > drivers/meson.build | 3 ++-
> > drivers/raw/ifpga_rawdev/base/meson.build | 34
> +++++++++++++++++++++++++++++++
> > drivers/raw/ifpga_rawdev/meson.build | 13 ++++++++++++
> > drivers/raw/meson.build | 6 ++++++
> > 4 files changed, 55 insertions(+), 1 deletion(-)
> > create mode 100644 drivers/raw/ifpga_rawdev/base/meson.build
> > create mode 100644 drivers/raw/ifpga_rawdev/meson.build
> > create mode 100644 drivers/raw/meson.build
> >
> > diff --git a/drivers/meson.build b/drivers/meson.build index
> > b146f09..b7fc0d6 100644
> > --- a/drivers/meson.build
> > +++ b/drivers/meson.build
> > @@ -7,7 +7,8 @@ driver_classes = ['common',
> > 'mempool', # depends on common and bus.
> > 'net', # depends on common, bus and mempool.
> > 'crypto', # depends on common, bus and mempool (net
> in future).
> > - 'event'] # depends on common, bus, mempool and net.
> > + 'event', # depends on common, bus, mempool and net.
> > + 'raw']
> >
> > foreach class:driver_classes
> > drivers = []
>
> [...]
>
> > diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build new
> > file mode 100644 index 0000000..410f908
> > --- /dev/null
> > +++ b/drivers/raw/meson.build
> > @@ -0,0 +1,6 @@
> > +# SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel
> > +Corporation
> > +
> > +drivers = ['ifpga_rawdev']
> > +config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
> > +driver_name_fmt = 'rte_@0@'
> >
>
> Just a heads-up for Thomas/Ferruh: Either this or patches from Nipun [1]
> would conflict here as drivers/raw/meson.build is being introduced by both.
>
> [1] http://dpdk.org/ml/archives/dev/2018-April/098827.html
Thomas and Ferruh's patch has merged into mainline?
We will rebase to latest master branch and send the V7 patches soon.
On Wednesday 02 May 2018 07:06 PM, Zhang, Tianfei wrote:
>
>> -----Original Message-----
>> From: Shreyansh Jain [mailto:shreyansh.jain@nxp.com]
>> Sent: Wednesday, May 2, 2018 5:47 PM
>> To: Xu, Rosen <rosen.xu@intel.com>; dev@dpdk.org; Yigit, Ferruh
>> <ferruh.yigit@intel.com>
>> Cc: Doherty, Declan <declan.doherty@intel.com>; Richardson, Bruce
>> <bruce.richardson@intel.com>; Ananyev, Konstantin
>> <konstantin.ananyev@intel.com>; Zhang, Tianfei <tianfei.zhang@intel.com>;
>> Wu, Hao <hao.wu@intel.com>; gaetan.rivet@6wind.com
>> Subject: Re: [dpdk-dev] [PATCH v6 4/5] iFPGA: add meson build
>>
>> On Thursday 26 April 2018 03:13 PM, Xu, Rosen wrote:
>>> From: Figo Zhang <tianfei.zhang@intel.com>
>>>
>>> add meson build support for iFPGA driver.
>>>
>>> Signed-off-by: Figo Zhang <tianfei.zhang@intel.com>
>>> ---
>>> drivers/meson.build | 3 ++-
>>> drivers/raw/ifpga_rawdev/base/meson.build | 34
>> +++++++++++++++++++++++++++++++
>>> drivers/raw/ifpga_rawdev/meson.build | 13 ++++++++++++
>>> drivers/raw/meson.build | 6 ++++++
>>> 4 files changed, 55 insertions(+), 1 deletion(-)
>>> create mode 100644 drivers/raw/ifpga_rawdev/base/meson.build
>>> create mode 100644 drivers/raw/ifpga_rawdev/meson.build
>>> create mode 100644 drivers/raw/meson.build
>>>
>>> diff --git a/drivers/meson.build b/drivers/meson.build index
>>> b146f09..b7fc0d6 100644
>>> --- a/drivers/meson.build
>>> +++ b/drivers/meson.build
>>> @@ -7,7 +7,8 @@ driver_classes = ['common',
>>> 'mempool', # depends on common and bus.
>>> 'net', # depends on common, bus and mempool.
>>> 'crypto', # depends on common, bus and mempool (net
>> in future).
>>> - 'event'] # depends on common, bus, mempool and net.
>>> + 'event', # depends on common, bus, mempool and net.
>>> + 'raw']
>>>
>>> foreach class:driver_classes
>>> drivers = []
>>
>> [...]
>>
>>> diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build new
>>> file mode 100644 index 0000000..410f908
>>> --- /dev/null
>>> +++ b/drivers/raw/meson.build
>>> @@ -0,0 +1,6 @@
>>> +# SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel
>>> +Corporation
>>> +
>>> +drivers = ['ifpga_rawdev']
>>> +config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
>>> +driver_name_fmt = 'rte_@0@'
>>>
>>
>> Just a heads-up for Thomas/Ferruh: Either this or patches from Nipun [1]
>> would conflict here as drivers/raw/meson.build is being introduced by both.
>>
>> [1] http://dpdk.org/ml/archives/dev/2018-April/098827.html
>
> Thomas and Ferruh's patch has merged into mainline?
> We will rebase to latest master branch and send the V7 patches soon.
>
In the weekly call, it was decided that qdma patches are almost ready.
So, can you rebase your patches over that? You will have to remove the
drivers/raw/meson.build and add your entry into the one added by qdma
driver [1].
You might have to wait for a couple of days.
[1] http://dpdk.org/ml/archives/dev/2018-May/099836.html
> -----Original Message-----
> From: Shreyansh Jain [mailto:shreyansh.jain@nxp.com]
> Sent: Thursday, May 3, 2018 5:13 PM
> To: Zhang, Tianfei <tianfei.zhang@intel.com>; Xu, Rosen
> <rosen.xu@intel.com>; dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>
> Cc: Doherty, Declan <declan.doherty@intel.com>; Richardson, Bruce
> <bruce.richardson@intel.com>; Ananyev, Konstantin
> <konstantin.ananyev@intel.com>; Wu, Hao <hao.wu@intel.com>;
> gaetan.rivet@6wind.com
> Subject: Re: [dpdk-dev] [PATCH v6 4/5] iFPGA: add meson build
>
> On Wednesday 02 May 2018 07:06 PM, Zhang, Tianfei wrote:
> >
> >> -----Original Message-----
> >> From: Shreyansh Jain [mailto:shreyansh.jain@nxp.com]
> >> Sent: Wednesday, May 2, 2018 5:47 PM
> >> To: Xu, Rosen <rosen.xu@intel.com>; dev@dpdk.org; Yigit, Ferruh
> >> <ferruh.yigit@intel.com>
> >> Cc: Doherty, Declan <declan.doherty@intel.com>; Richardson, Bruce
> >> <bruce.richardson@intel.com>; Ananyev, Konstantin
> >> <konstantin.ananyev@intel.com>; Zhang, Tianfei
> >> <tianfei.zhang@intel.com>; Wu, Hao <hao.wu@intel.com>;
> >> gaetan.rivet@6wind.com
> >> Subject: Re: [dpdk-dev] [PATCH v6 4/5] iFPGA: add meson build
> >>
> >> On Thursday 26 April 2018 03:13 PM, Xu, Rosen wrote:
> >>> From: Figo Zhang <tianfei.zhang@intel.com>
> >>>
> >>> add meson build support for iFPGA driver.
> >>>
> >>> Signed-off-by: Figo Zhang <tianfei.zhang@intel.com>
> >>> ---
> >>> drivers/meson.build | 3 ++-
> >>> drivers/raw/ifpga_rawdev/base/meson.build | 34
> >> +++++++++++++++++++++++++++++++
> >>> drivers/raw/ifpga_rawdev/meson.build | 13 ++++++++++++
> >>> drivers/raw/meson.build | 6 ++++++
> >>> 4 files changed, 55 insertions(+), 1 deletion(-)
> >>> create mode 100644 drivers/raw/ifpga_rawdev/base/meson.build
> >>> create mode 100644 drivers/raw/ifpga_rawdev/meson.build
> >>> create mode 100644 drivers/raw/meson.build
> >>>
> >>> diff --git a/drivers/meson.build b/drivers/meson.build index
> >>> b146f09..b7fc0d6 100644
> >>> --- a/drivers/meson.build
> >>> +++ b/drivers/meson.build
> >>> @@ -7,7 +7,8 @@ driver_classes = ['common',
> >>> 'mempool', # depends on common and bus.
> >>> 'net', # depends on common, bus and mempool.
> >>> 'crypto', # depends on common, bus and mempool (net
> >> in future).
> >>> - 'event'] # depends on common, bus, mempool and net.
> >>> + 'event', # depends on common, bus, mempool and net.
> >>> + 'raw']
> >>>
> >>> foreach class:driver_classes
> >>> drivers = []
> >>
> >> [...]
> >>
> >>> diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build new
> >>> file mode 100644 index 0000000..410f908
> >>> --- /dev/null
> >>> +++ b/drivers/raw/meson.build
> >>> @@ -0,0 +1,6 @@
> >>> +# SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel
> >>> +Corporation
> >>> +
> >>> +drivers = ['ifpga_rawdev']
> >>> +config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
> >>> +driver_name_fmt = 'rte_@0@'
> >>>
> >>
> >> Just a heads-up for Thomas/Ferruh: Either this or patches from Nipun
> >> [1] would conflict here as drivers/raw/meson.build is being introduced by
> both.
> >>
> >> [1] http://dpdk.org/ml/archives/dev/2018-April/098827.html
> >
> > Thomas and Ferruh's patch has merged into mainline?
> > We will rebase to latest master branch and send the V7 patches soon.
> >
>
> In the weekly call, it was decided that qdma patches are almost ready.
> So, can you rebase your patches over that? You will have to remove the
> drivers/raw/meson.build and add your entry into the one added by qdma
> driver [1].
> You might have to wait for a couple of days.
>
> [1] http://dpdk.org/ml/archives/dev/2018-May/099836.html
Sure. By now we have prepare our v7 patches and will send this days, and fix some comments by some community guys.
When this patch has merged into mainline, we will rebase over it.
@@ -7,7 +7,8 @@ driver_classes = ['common',
'mempool', # depends on common and bus.
'net', # depends on common, bus and mempool.
'crypto', # depends on common, bus and mempool (net in future).
- 'event'] # depends on common, bus, mempool and net.
+ 'event', # depends on common, bus, mempool and net.
+ 'raw']
foreach class:driver_classes
drivers = []
new file mode 100644
@@ -0,0 +1,34 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+sources = [
+ 'ifpga_api.c',
+ 'ifpga_enumerate.c',
+ 'ifpga_feature_dev.c',
+ 'ifpga_fme.c',
+ 'ifpga_fme_iperf.c',
+ 'ifpga_fme_dperf.c',
+ 'ifpga_fme_error.c',
+ 'ifpga_port.c',
+ 'ifpga_port_error.c',
+ 'ifpga_fme_pr.c',
+ 'opae_hw_api.c',
+ 'opae_ifpga_hw_api.c',
+ 'opae_debug.c'
+]
+
+error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
+ '-Wno-format', '-Wno-unused-but-set-variable',
+ '-Wno-strict-aliasing'
+]
+c_args = cflags
+foreach flag: error_cflags
+ if cc.has_argument(flag)
+ c_args += flag
+ endif
+endforeach
+
+base_lib = static_library('ifpga_rawdev_base', sources,
+ dependencies: static_rte_eal,
+ c_args: c_args)
+base_objs = base_lib.extract_all_objects()
new file mode 100644
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+version = 1
+
+subdir('base')
+objs = [base_objs]
+
+deps += ['rawdev', 'pci', 'bus_pci', 'kvargs',
+ 'bus_vdev', 'bus_ifpga']
+sources = files('ifpga_rawdev.c')
+
+includes += include_directories('base')
new file mode 100644
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Intel Corporation
+
+drivers = ['ifpga_rawdev']
+config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
+driver_name_fmt = 'rte_@0@'