From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id F3811A04F0; Mon, 13 Jan 2020 13:45:21 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CD54E1D51F; Mon, 13 Jan 2020 13:45:21 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id EC6651C22D for ; Mon, 13 Jan 2020 13:45:19 +0100 (CET) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jan 2020 04:45:19 -0800 X-IronPort-AV: E=Sophos;i="5.69,429,1571727600"; d="scan'208";a="224993143" Received: from bricha3-mobl.ger.corp.intel.com ([10.237.221.26]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 13 Jan 2020 04:45:17 -0800 Date: Mon, 13 Jan 2020 12:45:14 +0000 From: Bruce Richardson To: Pablo de Lara Cc: akhil.goyal@nxp.com, declan.doherty@intel.com, dev@dpdk.org Message-ID: <20200113124514.GA1645@bricha3-MOBL.ger.corp.intel.com> References: <1576074044-250855-1-git-send-email-pablo.de.lara.guarch@intel.com> <1578915625-237451-1-git-send-email-pablo.de.lara.guarch@intel.com> <1578915625-237451-2-git-send-email-pablo.de.lara.guarch@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1578915625-237451-2-git-send-email-pablo.de.lara.guarch@intel.com> User-Agent: Mutt/1.12.1 (2019-06-15) Subject: Re: [dpdk-dev] [PATCH v2 1/3] crypto/zuc: use IPSec library X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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 Mon, Jan 13, 2020 at 11:40:23AM +0000, Pablo de Lara wrote: > Link against Intel IPSec Multi-buffer library, which > added support for ZUC-EEA3 and ZUC-EIA3 from version v0.53, > moving from libSSO ZUC library. > > Signed-off-by: Pablo de Lara > --- > devtools/test-build.sh | 6 ++-- > doc/guides/cryptodevs/zuc.rst | 52 ++++++++++++++++++++-------------- > doc/guides/rel_notes/release_20_02.rst | 7 +++++ > drivers/crypto/zuc/Makefile | 28 +++++++++++------- > drivers/crypto/zuc/meson.build | 24 ++++++++++++---- > drivers/crypto/zuc/rte_zuc_pmd.c | 51 ++++++++++++++++++++++++--------- > drivers/crypto/zuc/rte_zuc_pmd_ops.c | 2 ++ > drivers/crypto/zuc/zuc_pmd_private.h | 6 +++- > mk/rte.app.mk | 2 +- > 9 files changed, 120 insertions(+), 58 deletions(-) > > diff --git a/drivers/crypto/zuc/meson.build b/drivers/crypto/zuc/meson.build > index b231de0..b7098a3 100644 > --- a/drivers/crypto/zuc/meson.build > +++ b/drivers/crypto/zuc/meson.build > @@ -1,14 +1,26 @@ > # SPDX-License-Identifier: BSD-3-Clause > -# Copyright(c) 2018 Intel Corporation > +# Copyright(c) 2018-2019 Intel Corporation > > -lib = cc.find_library('sso_zuc', required: false) > -if not lib.found() or not cc.has_header('sso_zuc.h') > +IMB_required_ver = '0.53.0' > +lib = cc.find_library('IPSec_MB', required: false) > +if not lib.found() > build = false > - reason = 'missing dependency, "libsso_zuc"' > - subdir_done() > + reason = 'missing dependency, "libIPSec_MB"' > +else > + ext_deps += lib > + > + # version comes with quotes, so we split based on " and take the middle > + imb_ver = cc.get_define('IMB_VERSION_STR', > + prefix : '#include').split('"')[1] > + > + if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver)) > + message('IPSec_MB version >= @0@ is required, found version @1@'.format( > + IMB_required_ver, imb_ver)) > + build = false Rather than/As well as printing a message here, you also need to provide a reason when setting build = false, so the summary at the end can report why the driver is not being built. > + endif > + > endif > > allow_experimental_apis = true > -ext_deps += lib If you drop the line after the else above, you can keep this line and shrink the diff by 2 lines. :-) /Bruce