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 21756A04B5 for ; Mon, 2 Dec 2019 08:34:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EA0D42BD8; Mon, 2 Dec 2019 08:34:06 +0100 (CET) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by dpdk.org (Postfix) with ESMTP id 1DD292BD8; Mon, 2 Dec 2019 08:34:05 +0100 (CET) Received: by mail-io1-f67.google.com with SMTP id z26so35773729iot.8; Sun, 01 Dec 2019 23:34:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=iD0/p+2NBMferUIOEyBo8lWtHaxwV9zg/4Z4/LDLLP0=; b=Nv8vVgVQ7qJQmd694AWdZVLqM53pehbDRdOujJKOimg6GxLby41mQyEc/K4MMnHyCG o9ZA6R9soYH1WMYzE6hElEgVrCtfx8b1980HPj1OcsC/1L/nETxfimqtA05BsIGwzKzf WyjKYyGQ66heCcNyw2ymag78DRlB2zc22LohtJWqssOChgn7IMX0No4KKfK7b/ORNMe4 7oxiSCt8LtVvKLsQ2CIjwmak4nt8VVtd6YHh0tNItDLzzyn3OqOp6B4euOb6zH7gVAMr WnV1cjJ5Uy2E3Cl6WNQB1mwAx1jlWkHvh6jxH+OG0U7rVt7jOShBdVGWUpvF4nzhSR+x SUpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=iD0/p+2NBMferUIOEyBo8lWtHaxwV9zg/4Z4/LDLLP0=; b=KdREHPCe7ougeKUH61FEh67MClNzmvfAcFYF1MAaqH1NlIZwujoIpXyuV42rvVNDCe z2nkzTY3F35muEzVnvDIml+wiqWPy8KjGh8Q7oWQUlt4WBtGAvPt9sJ7TF1xtEhexSQp UjsNKVqI9QYwSeJdCNaM5IWI/3RW//BsidvT64swpDvRT7WBeSaj0Wf5YdPx6+u468uY +zqzfZT3+7z9jLm5bAH364uHeB070d0PxqvXLbJor8kCu4GMMcqXyOMBzawqYu17pNwO vTdrXKxs97NfiOf+eQ0p7BQj+TrQoIDt2QivuD5TNs6m2ouG18+sBcI7qmLZqnP10ytx r8Tg== X-Gm-Message-State: APjAAAXT/Wf3fAUNJovimjXhEL+YSirdWyyCFUO7IbcU41ZpcObAxiND QtIZ35F8WKjQNv7YvZ3z+5dXkFNM9WCzb/OWDbA= X-Google-Smtp-Source: APXvYqxqYKWSPYHVx7NIVvCXxclYiTOez6UadKV2JcbwlgiFAbONaW9BGUUw/ySfqjRB9LbutKqRtliMADtNcDQGrwY= X-Received: by 2002:a05:6638:a2c:: with SMTP id 12mr3817609jao.60.1575272044135; Sun, 01 Dec 2019 23:34:04 -0800 (PST) MIME-Version: 1.0 References: <20191129091100.4252-1-lironh@marvell.com> In-Reply-To: From: Jerin Jacob Date: Mon, 2 Dec 2019 16:33:48 +0900 Message-ID: To: Liron Himi Cc: Jerin Jacob Kollanukkaran , dpdk-dev , dpdk stable Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-stable] [EXT] Re: [dpdk-dev] [PATCH] config: update Marvell ARMADA X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On Mon, Dec 2, 2019 at 4:01 PM Liron Himi wrote: > > Hi Jerin, > > I have created a patch to MUSDK that fix this conflicts as you suggested. > This will be externally available in the next MUSDK release. > Once it will be out, we can simplify the armada-config, but until then if anyone want to build DPDK with MUSDK it either needs this patch or compile MUSDK as shared lib Good that it is fixed in the library. +1 for this patch as short terms solution till next MUSDK releases shows up. > > Regards, > Liron > > -----Original Message----- > From: Liron Himi > Sent: Monday, 2 December 2019 08:32 > To: Jerin Jacob > Cc: Jerin Jacob Kollanukkaran ; dpdk-dev ; dpdk stable ; Liron Himi > Subject: RE: [EXT] Re: [dpdk-dev] [PATCH] config: update Marvell ARMADA > > > > Regards, > Liron > > -----Original Message----- > From: Jerin Jacob > Sent: Monday, 2 December 2019 06:12 > To: Liron Himi > Cc: Jerin Jacob Kollanukkaran ; dpdk-dev ; dpdk stable > Subject: Re: [EXT] Re: [dpdk-dev] [PATCH] config: update Marvell ARMADA > > > > > ---------------------------------------------------------------------- > > On Fri, Nov 29, 2019 at 3:55 PM wrote: > > > > > > From: Liron Himi > > > > > > disable more NXP modules that conflict with MUSDK > > > > # Please share more details on the conflict. > > [L.H.] both components calls of_ APIs so when MUSDK is compiled statically it conflicts with NXP's code. > > If something implemented in the library, IMO, it should start with the library name to avoid namespace collision. > Are we implementing of_x calls in MUSDK? > [L.H.] yes. It is not the same implementation as in dpaa_of.c Could you share the error logs? > [L.H.] /home/userlab/work/combined_git/dataplane/musdk/usr/local/lib/libmusdk.a(libmusdk_la-of.o): In function `of_n_addr_cells': > /home/userlab/work/combined_git/dataplane/musdk/src/env/of.c:348: multiple definition of `of_n_addr_cells' > /home/userlab/work/combined_git/dataplane/dpdk-19.11/build/lib/librte_common_dpaax.a(dpaa_of.o):dpaa_of.c:(.text+0x13b8): first defined here > > > Note that the original armada config already had some NXP flags disabled, but in recent version NXP moved the of_ code to be depends on 'CONFIG_RTE_LIBRTE_COMMON_DPAAX' so needed to update it. > > OK > > > # What about meson build? "make" will be deprecated soon. > > [L.H.] only when compiling the MUSDK as static LIBs, we face this issue. In meson we need to compile MUSDK as shared LIBS. > > But nothing stopping us to compile MUSDK as static build with meson. Right? > [L.H.] right, but currently it will not work AFAIK there is no way to exclude modules from meson builds per configuration file (as we have with 'make' flow), right? > > > # This scheme won't work for distro build, Please spend the effort to analyze the conflict and fix the conflict. IMO, That would be the correct solution. > > > > > > > > > > Signed-off-by: Liron Himi > > > --- > > > config/defconfig_arm64-armada-linuxapp-gcc | 17 +++++++++++++++++ > > > 1 file changed, 17 insertions(+) > > > > > > diff --git a/config/defconfig_arm64-armada-linuxapp-gcc > > > b/config/defconfig_arm64-armada-linuxapp-gcc > > > index 059180284..c09751cf0 100644 > > > --- a/config/defconfig_arm64-armada-linuxapp-gcc > > > +++ b/config/defconfig_arm64-armada-linuxapp-gcc > > > @@ -19,6 +19,23 @@ CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=y > > > > > > # Disable NXP as it is conflict with MUSDK > > > CONFIG_RTE_LIBRTE_DPAA_BUS=n > > > +CONFIG_RTE_LIBRTE_COMMON_DPAAX=n > > > +CONFIG_RTE_LIBRTE_FSLMC_BUS=n > > > +CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n > > > +CONFIG_RTE_LIBRTE_DPAA2_PMD=n > > > +CONFIG_RTE_LIBRTE_DPAA_BUS=n > > > +CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n > > > +CONFIG_RTE_LIBRTE_DPAA_PMD=n > > > +CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=n > > > +CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n > > > +CONFIG_RTE_LIBRTE_PMD_CAAM_JR=n > > > +CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=n > > > +CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n > > > +CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=n > > > +CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n > > > +CONFIG_RTE_LIBRTE_PFE_PMD=n > > > +CONFIG_RTE_LIBRTE_ENETC_PMD=n > > > + > > > > > > # Doesn't support NUMA > > > CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n > > > -- > > > 2.23.0 > > >