From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5315CA0548; Mon, 20 Sep 2021 12:15:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D188A40DF7; Mon, 20 Sep 2021 12:15:43 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 3327240DF5 for ; Mon, 20 Sep 2021 12:15:41 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10112"; a="210181434" X-IronPort-AV: E=Sophos;i="5.85,308,1624345200"; d="scan'208";a="210181434" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2021 03:15:40 -0700 X-IronPort-AV: E=Sophos;i="5.85,308,1624345200"; d="scan'208";a="556049841" Received: from bricha3-mobl.ger.corp.intel.com ([10.252.17.156]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-SHA; 20 Sep 2021 03:15:38 -0700 Date: Mon, 20 Sep 2021 11:15:35 +0100 From: Bruce Richardson To: Kevin Laatz Cc: dev@dpdk.org, fengchengwen@huawei.com, jerinj@marvell.com, conor.walsh@intel.com Message-ID: References: <20210827172048.558704-1-kevin.laatz@intel.com> <20210917152437.3270330-1-kevin.laatz@intel.com> <20210917152437.3270330-2-kevin.laatz@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210917152437.3270330-2-kevin.laatz@intel.com> Subject: Re: [dpdk-dev] [PATCH v5 01/16] raw/ioat: only build if dmadev not present X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Fri, Sep 17, 2021 at 03:24:22PM +0000, Kevin Laatz wrote: > From: Bruce Richardson > > Only build the rawdev IDXD/IOAT drivers if the dmadev drivers are not > present. > > A not is also added to the documentation to inform users of this change. typo: "note" It would also be worthwhile mentioning in the commit log that the order of dependencies is changed so that dmadev comes before rawdev. > > Signed-off-by: Bruce Richardson > Signed-off-by: Kevin Laatz > Reviewed-by: Conor Walsh > > --- > v4: > - Fix build issue > - Add note in raw documentation to outline this change > --- > doc/guides/rawdevs/ioat.rst | 7 +++++++ > drivers/meson.build | 2 +- > drivers/raw/ioat/meson.build | 23 ++++++++++++++++++++--- > 3 files changed, 28 insertions(+), 4 deletions(-) > > diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst > index a28e909935..4fc327f1a4 100644 > --- a/doc/guides/rawdevs/ioat.rst > +++ b/doc/guides/rawdevs/ioat.rst > @@ -34,6 +34,13 @@ Compilation > For builds using ``meson`` and ``ninja``, the driver will be built when the target platform is x86-based. > No additional compilation steps are necessary. > > +.. note:: > + Since the addition of the DMAdev library, the ``ioat`` and ``idxd`` parts of this driver > + will only be built if their ``DMAdev`` counterparts are not built. The following can be used > + to disable the ``DMAdev`` drivers, if the raw drivers are to be used instead:: > + Suggest where possible to split lines on punctuation. Put a line break after the "." at the end of the first sentence. Similarly if breaking lines, try and do so after commas. > + $ meson -Ddisable_drivers=dma/* > + > Device Setup > ------------- > > diff --git a/drivers/meson.build b/drivers/meson.build > index b7d680868a..27ff10a9fc 100644 > --- a/drivers/meson.build > +++ b/drivers/meson.build > @@ -10,6 +10,7 @@ subdirs = [ > 'common/qat', # depends on bus. > 'common/sfc_efx', # depends on bus. > 'mempool', # depends on common and bus. > + 'dma', # depends on common and bus. > 'net', # depends on common, bus, mempool > 'raw', # depends on common, bus and net. > 'crypto', # depends on common, bus and mempool (net in future). > @@ -18,7 +19,6 @@ subdirs = [ > 'vdpa', # depends on common, bus and mempool. > 'event', # depends on common, bus, mempool and net. > 'baseband', # depends on common and bus. > - 'dma', # depends on common and bus. > ] > As stated above, I think the reason for this change should be noted in the commit log. > if meson.is_cross_build() > diff --git a/drivers/raw/ioat/meson.build b/drivers/raw/ioat/meson.build > index 0e81cb5951..9be9d8cc65 100644 > --- a/drivers/raw/ioat/meson.build > +++ b/drivers/raw/ioat/meson.build > @@ -2,14 +2,31 @@ > # Copyright 2019 Intel Corporation > > build = dpdk_conf.has('RTE_ARCH_X86') > +# only use ioat rawdev driver if we don't have the equivalent dmadev ones > +if dpdk_conf.has('RTE_DMA_IDXD') and dpdk_conf.has('RTE_DMA_IOAT') > + build = false > + subdir_done() > +endif > + > reason = 'only supported on x86' > sources = files( > - 'idxd_bus.c', > - 'idxd_pci.c', > 'ioat_common.c', > - 'ioat_rawdev.c', > 'ioat_rawdev_test.c', > ) > + > +if not dpdk_conf.has('RTE_DMA_IDXD') > + sources += files( > + 'idxd_bus.c', > + 'idxd_pci.c', > + ) > +endif > + > +if not dpdk_conf.has('RTE_DMA_IOAT') > + sources += files ( > + 'ioat_rawdev.c', > + ) > +endif > + > deps += ['bus_pci', 'mbuf', 'rawdev'] > headers = files( > 'rte_ioat_rawdev.h', > -- > 2.30.2 >