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 324EFA034F; Wed, 13 May 2020 18:41:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B60901D66A; Wed, 13 May 2020 18:41:04 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 7BA611D669 for ; Wed, 13 May 2020 18:41:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589388063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=hA4Xr/Iu8mz023JuX+dCZxlWi+ulg6g82Ss43yLWiz0=; b=Qt3jMXFng+9ZbYTPrZwVQjLoW+42pyGk+48rh8o5Z3nWM9Cq5miWxQ1oge7Z5rrX53zBtO SgRkqQn/eLNlu8Av1HuFnhSlPobBdmPScXKY6YyA35Ro75w9ZrThr5ZwQ2sR9jPbxPP+3G S8XTYnK8scvwIArOB6NLI1Zfehitepw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-80-YvjieVARNA-Dv-baiubuBA-1; Wed, 13 May 2020 12:40:59 -0400 X-MC-Unique: YvjieVARNA-Dv-baiubuBA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E6169835B40; Wed, 13 May 2020 16:40:57 +0000 (UTC) Received: from [10.33.36.32] (unknown [10.33.36.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id E64FE605FC; Wed, 13 May 2020 16:40:52 +0000 (UTC) To: akhil.goyal@nxp.com, dev@dpdk.org Cc: hemant.agrawal@nxp.com, david.marchand@redhat.com, thomas@monjalon.net, stable@dpdk.org, Ray Kinsella References: <20200513135030.14291-1-akhil.goyal@nxp.com> From: Kevin Traynor Autocrypt: addr=ktraynor@redhat.com; keydata= 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 Message-ID: <0a3c0209-8438-2586-e300-4dbee671e563@redhat.com> Date: Wed, 13 May 2020 17:40:51 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200513135030.14291-1-akhil.goyal@nxp.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH] drivers/crypto: fix gcc 10 no-common errors 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 13/05/2020 14:50, akhil.goyal@nxp.com wrote: > From: Akhil Goyal > > gcc 10 defaults to -fno-common and as a result when linking > with crypto drivers: > > drivers/librte_pmd_dpaa_sec.a(crypto_dpaa_sec_dpaa_sec.c.o): > (.bss+0x4): multiple definition of `rta_sec_era'; > drivers/librte_pmd_caam_jr.a(crypto_caam_jr_caam_jr.c.o): > (.bss+0x0): first defined here > > drivers/librte_pmd_dpaa2_sec.a(crypto_dpaa2_sec_dpaa2_sec_dpseci.c.o): > (.data+0x0): multiple definition of `rta_sec_era'; > drivers/librte_pmd_caam_jr.a(crypto_caam_jr_caam_jr.c.o): > (.bss+0x0): first defined here > > This patch fixes the blunt workaround in the following commit. > > Fixes: 50b03f3b8eaf ("drivers/crypto: disable gcc 10 no-common errors") > > Bugzilla ID: 469 > Cc: stable@dpdk.org > > Signed-off-by: Akhil Goyal > --- > This patch is not tested on GCC 10. > @kevin Please verify on your setup if it is fixing the GCC 10 > compilation. > Passing with gcc 10 on my setup. Internal symbol part looks ok to me, but might be best to get review from Ray. Tested-by: Kevin Traynor > > drivers/common/dpaax/Makefile | 3 ++- > drivers/common/dpaax/caamflib.c | 16 ++++++++++++++++ > drivers/common/dpaax/meson.build | 4 +++- > .../common/dpaax/rte_common_dpaax_version.map | 4 ++++ > drivers/crypto/caam_jr/Makefile | 7 ------- > drivers/crypto/caam_jr/caam_jr.c | 2 -- > drivers/crypto/caam_jr/meson.build | 5 ----- > drivers/crypto/dpaa2_sec/Makefile | 7 ------- > drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 4 ++-- > drivers/crypto/dpaa2_sec/meson.build | 5 ----- > drivers/crypto/dpaa_sec/Makefile | 7 ------- > drivers/crypto/dpaa_sec/dpaa_sec.c | 2 -- > drivers/crypto/dpaa_sec/meson.build | 5 ----- > 13 files changed, 27 insertions(+), 44 deletions(-) > create mode 100644 drivers/common/dpaax/caamflib.c > > diff --git a/drivers/common/dpaax/Makefile b/drivers/common/dpaax/Makefile > index 15b0b38d0..2f4b924fd 100644 > --- a/drivers/common/dpaax/Makefile > +++ b/drivers/common/dpaax/Makefile > @@ -15,6 +15,7 @@ CFLAGS += -Wno-pointer-arith > CFLAGS += -Wno-cast-qual > > CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax > +CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib > > # versioning export map > EXPORT_MAP := rte_common_dpaax_version.map > @@ -22,7 +23,7 @@ EXPORT_MAP := rte_common_dpaax_version.map > # > # all source are stored in SRCS-y > # > -SRCS-y += dpaax_iova_table.c dpaa_of.c > +SRCS-y += dpaax_iova_table.c dpaa_of.c caamflib.c > > LDLIBS += -lrte_eal > > diff --git a/drivers/common/dpaax/caamflib.c b/drivers/common/dpaax/caamflib.c > new file mode 100644 > index 000000000..55e20281c > --- /dev/null > +++ b/drivers/common/dpaax/caamflib.c > @@ -0,0 +1,16 @@ > +/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) > + * > + * Copyright 2020 NXP > + * > + */ > + > +#include > + > +/* > + * SEC HW block revision. > + * > + * This *must not be confused with SEC version*: > + * - SEC HW block revision format is "v" > + * - SEC revision format is "x.y" > + */ > +enum rta_sec_era rta_sec_era; > diff --git a/drivers/common/dpaax/meson.build b/drivers/common/dpaax/meson.build > index ff2d1a507..0b8bf7bd5 100644 > --- a/drivers/common/dpaax/meson.build > +++ b/drivers/common/dpaax/meson.build > @@ -6,7 +6,9 @@ if not is_linux > reason = 'only supported on linux' > endif > > -sources = files('dpaax_iova_table.c', 'dpaa_of.c') > +sources = files('dpaax_iova_table.c', 'dpaa_of.c', 'caamflib.c') > + > +includes += include_directories('caamflib') > > cflags += ['-D_GNU_SOURCE'] > if cc.has_argument('-Wno-cast-qual') > diff --git a/drivers/common/dpaax/rte_common_dpaax_version.map b/drivers/common/dpaax/rte_common_dpaax_version.map > index f72eba761..837ce01af 100644 > --- a/drivers/common/dpaax/rte_common_dpaax_version.map > +++ b/drivers/common/dpaax/rte_common_dpaax_version.map > @@ -21,3 +21,7 @@ DPDK_20.0 { > > local: *; > }; > + > +INTERNAL { > + rta_sec_era; > +}; > diff --git a/drivers/crypto/caam_jr/Makefile b/drivers/crypto/caam_jr/Makefile > index 10848884c..89d323817 100644 > --- a/drivers/crypto/caam_jr/Makefile > +++ b/drivers/crypto/caam_jr/Makefile > @@ -14,13 +14,6 @@ CFLAGS += -D _GNU_SOURCE > CFLAGS += -O3 > CFLAGS += $(WERROR_FLAGS) > > -# FIXME: temporary solution for Bugzilla 469 > -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) > -ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1) > -CFLAGS += -fcommon > -endif > -endif > - > CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include > CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax > CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib/ > diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c > index 5a29dd169..45003ba25 100644 > --- a/drivers/crypto/caam_jr/caam_jr.c > +++ b/drivers/crypto/caam_jr/caam_jr.c > @@ -37,8 +37,6 @@ > static uint8_t cryptodev_driver_id; > int caam_jr_logtype; > > -enum rta_sec_era rta_sec_era; > - > /* Lists the states possible for the SEC user space driver. */ > enum sec_driver_state_e { > SEC_DRIVER_STATE_IDLE, /* Driver not initialized */ > diff --git a/drivers/crypto/caam_jr/meson.build b/drivers/crypto/caam_jr/meson.build > index 551b13632..f8b5250a9 100644 > --- a/drivers/crypto/caam_jr/meson.build > +++ b/drivers/crypto/caam_jr/meson.build > @@ -12,11 +12,6 @@ sources = files('caam_jr_capabilities.c', > 'caam_jr_uio.c', > 'caam_jr.c') > > -# FIXME: temporary solution for Bugzilla 469 > -if (toolchain == 'gcc' and cc.version().version_compare('>=10.0.0')) > - cflags += '-fcommon' > -endif > - > includes += include_directories('../../bus/dpaa/include/') > includes += include_directories('../../common/dpaax/') > includes += include_directories('../../common/dpaax/caamflib/') > diff --git a/drivers/crypto/dpaa2_sec/Makefile b/drivers/crypto/dpaa2_sec/Makefile > index 8ce637db6..a0a279557 100644 > --- a/drivers/crypto/dpaa2_sec/Makefile > +++ b/drivers/crypto/dpaa2_sec/Makefile > @@ -19,13 +19,6 @@ CFLAGS += -Wno-implicit-fallthrough > endif > endif > > -# FIXME: temporary solution for Bugzilla 469 > -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) > -ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1) > -CFLAGS += -fcommon > -endif > -endif > - > CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax > CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib > CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/ > diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c > index fe34e644c..6459a025b 100644 > --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c > +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c > @@ -56,8 +56,6 @@ > #define SEC_FLC_DHR_OUTBOUND -114 > #define SEC_FLC_DHR_INBOUND 0 > > -enum rta_sec_era rta_sec_era = RTA_SEC_ERA_8; > - > static uint8_t cryptodev_driver_id; > > int dpaa2_logtype_sec; > @@ -3870,6 +3868,8 @@ cryptodev_dpaa2_sec_probe(struct rte_dpaa2_driver *dpaa2_drv __rte_unused, > > if (dpaa2_svr_family == SVR_LX2160A) > rta_set_sec_era(RTA_SEC_ERA_10); > + else > + rta_set_sec_era(RTA_SEC_ERA_8); > > DPAA2_SEC_INFO("2-SEC ERA is %d", rta_get_sec_era()); > > diff --git a/drivers/crypto/dpaa2_sec/meson.build b/drivers/crypto/dpaa2_sec/meson.build > index 505ad9414..cb1c2d049 100644 > --- a/drivers/crypto/dpaa2_sec/meson.build > +++ b/drivers/crypto/dpaa2_sec/meson.build > @@ -10,9 +10,4 @@ deps += ['security', 'mempool_dpaa2'] > sources = files('dpaa2_sec_dpseci.c', > 'mc/dpseci.c') > > -# FIXME: temporary solution for Bugzilla 469 > -if (toolchain == 'gcc' and cc.version().version_compare('>=10.0.0')) > - cflags += '-fcommon' > -endif > - > includes += include_directories('mc', '../../common/dpaax', '../../common/dpaax/caamflib') > diff --git a/drivers/crypto/dpaa_sec/Makefile b/drivers/crypto/dpaa_sec/Makefile > index 6cf392cb3..ea266962a 100644 > --- a/drivers/crypto/dpaa_sec/Makefile > +++ b/drivers/crypto/dpaa_sec/Makefile > @@ -13,13 +13,6 @@ LIB = librte_pmd_dpaa_sec.a > CFLAGS += -O3 > CFLAGS += $(WERROR_FLAGS) > > -# FIXME: temporary solution for Bugzilla 469 > -ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) > -ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1) > -CFLAGS += -fcommon > -endif > -endif > - > CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa > CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include > CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman > diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c > index 25dcbd259..a9bfb8685 100644 > --- a/drivers/crypto/dpaa_sec/dpaa_sec.c > +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c > @@ -43,8 +43,6 @@ > #include > #include > > -enum rta_sec_era rta_sec_era; > - > int dpaa_logtype_sec; > > static uint8_t cryptodev_driver_id; > diff --git a/drivers/crypto/dpaa_sec/meson.build b/drivers/crypto/dpaa_sec/meson.build > index f5e660457..7d422d8d5 100644 > --- a/drivers/crypto/dpaa_sec/meson.build > +++ b/drivers/crypto/dpaa_sec/meson.build > @@ -9,11 +9,6 @@ endif > deps += ['bus_dpaa', 'mempool_dpaa', 'security'] > sources = files('dpaa_sec.c') > > -# FIXME: temporary solution for Bugzilla 469 > -if (toolchain == 'gcc' and cc.version().version_compare('>=10.0.0')) > - cflags += '-fcommon' > -endif > - > includes += include_directories('../../bus/dpaa/include') > includes += include_directories('../../common/dpaax') > includes += include_directories('../../common/dpaax/caamflib/') >