From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <tdu@semihalf.com> Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by dpdk.org (Postfix) with ESMTP id E7B4C2B9E for <dev@dpdk.org>; Fri, 1 Dec 2017 10:03:08 +0100 (CET) Received: by mail-lf0-f67.google.com with SMTP id t197so10911277lfe.7 for <dev@dpdk.org>; Fri, 01 Dec 2017 01:03:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=3CUIAjSeoGXLCnxoSTsyiVUOjclk9NbDkZj9pJ7GKYc=; b=woI6XWN6J4m1gTyi5X9bD8vo9+NjYE7c96gi3iEikR1a2/6Sw3G5azpysg20lvFeuW +a0BC5vsGBWVtS6wvrOcoAd21x7d3LZ6gqNF0Pc+El57vBXqHKNapJtJrlWIAWXtUBin yicIrubb4CfExtmfvz8Tsyq3oP8plJ6qm9NfHGuV98tPAK0V77y68x5SqLNJeG7CP9st 304CIXnKTNm6LOev/l2TwIbQ+xaUega3z3AeZ+GLfpbq937ob5JlwWbcI2GVJ96SW9X8 7qRuejstch19497on5El7DitXMqfX1XlLZ25iTNpzOx3tDKLMfLqnXEs/C2RHjhmEjYo XwZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=3CUIAjSeoGXLCnxoSTsyiVUOjclk9NbDkZj9pJ7GKYc=; b=iQnHa0IPpglBlPsdcYQWCJ6lJKGdFikAvRLnk2lBXCSbF2Bj0UGwvuN0kM3TncpoP7 +9LdsSRJKIjvVKAYFrVUx9Wtf27Ru6oVUFLfbu4kG9aMuBtJv7nJ4OxNCZws0akWbFSS 6tPjeQFK2ype6IYarPOpmUyZl9ADTrRtQSuaHhxaUEMeHxrhRL0pE+5+inIhLeaN2Wvx WD8lVmb58bzgWc/RvHl/Zcdg50/AVuCJ0OSAJ1E6rwHICySlB3xURGPHx5ysO/LkCqjR 1N40/UwXMJFgQTe/d1MCdCq6HOMcjDT30ZSsjvNffiK89+y8QD5AucEqBAOXS+lUvN1L xhOA== X-Gm-Message-State: AJaThX5C0JsB2TrCSsl6mZ5FgZeOoqKVlk3I3jzDZlpbMR4h50jDQQGG lpM1p7NmNMz0VkJTB0S4WWM5lg== X-Google-Smtp-Source: AGs4zMZ+PwmrOXVfGKbKpp6luUKl16Od7Lq4Fdl4gJk9/K7xs2cVpi1JBburdJn0XE2GYcbgCG5f0w== X-Received: by 10.46.87.9 with SMTP id l9mr4380361ljb.176.1512118988554; Fri, 01 Dec 2017 01:03:08 -0800 (PST) Received: from localhost (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id b15sm1051616lfb.41.2017.12.01.01.03.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Dec 2017 01:03:07 -0800 (PST) Date: Fri, 1 Dec 2017 10:03:06 +0100 From: Tomasz Duszynski <tdu@semihalf.com> To: Jianbo Liu <jianbo.liu@arm.com> Cc: Tomasz Duszynski <tdu@semihalf.com>, dev@dpdk.org, mw@semihalf.com, jck@semihalf.com, dima@marvell.com, nsamsono@marvell.com Message-ID: <20171201090306.GB4421@tdu> References: <1512048743-23749-1-git-send-email-tdu@semihalf.com> <1512048743-23749-2-git-send-email-tdu@semihalf.com> <20171201032905.GA21389@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20171201032905.GA21389@arm.com> User-Agent: Mutt/1.5.23.1 (2014-03-12) Subject: Re: [dpdk-dev] [PATCH 1/7] net/mrvl: sync compilation with musdk-17.10 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions <dev.dpdk.org> List-Unsubscribe: <http://dpdk.org/ml/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://dpdk.org/ml/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <http://dpdk.org/ml/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> X-List-Received-Date: Fri, 01 Dec 2017 09:03:09 -0000 On Fri, Dec 01, 2017 at 11:29:07AM +0800, Jianbo Liu wrote: > The 11/30/2017 14:32, Tomasz Duszynski wrote: > > Followig changes are needed to switch to musdk-17.10: > > > > - With a new version of the musdk library it's no longer necessary to > > explicitly define MVCONF_ARCH_DMA_ADDR_T_64BIT and > > CONF_PP2_BPOOL_COOKIE_SIZE. > > > > Proper defines are autogenerated by ./configure script based on > > passed options and available after mv_autogen_comp_flags.h inclusion. > > > > - API used to set promiscuous mode was renamed. Thus in order to > > compile against the latest library new API must be used. > > > > Signed-off-by: Tomasz Duszynski <tdu@semihalf.com> > > --- > > drivers/net/mrvl/Makefile | 4 ++-- > > drivers/net/mrvl/mrvl_ethdev.c | 5 +++-- > > drivers/net/mrvl/mrvl_ethdev.h | 1 + > > 3 files changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/net/mrvl/Makefile b/drivers/net/mrvl/Makefile > > index 815c3ba..f75e53c 100644 > > --- a/drivers/net/mrvl/Makefile > > +++ b/drivers/net/mrvl/Makefile > > @@ -51,8 +51,8 @@ EXPORT_MAP :=3D rte_pmd_mrvl_version.map > > > > # external library dependencies > > CFLAGS +=3D -I$(LIBMUSDK_PATH)/include > > -CFLAGS +=3D -DMVCONF_ARCH_DMA_ADDR_T_64BIT > > -CFLAGS +=3D -DCONF_PP2_BPOOL_COOKIE_SIZE=3D32 > > +CFLAGS +=3D -DMVCONF_TYPES_PUBLIC > > +CFLAGS +=3D -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC > > CFLAGS +=3D $(WERROR_FLAGS) > > CFLAGS +=3D -O3 > > LDLIBS +=3D -L$(LIBMUSDK_PATH)/lib > > diff --git a/drivers/net/mrvl/mrvl_ethdev.c b/drivers/net/mrvl/mrvl_eth= dev.c > > index 2936165..4fac797 100644 > > --- a/drivers/net/mrvl/mrvl_ethdev.c > > +++ b/drivers/net/mrvl/mrvl_ethdev.c > > @@ -47,6 +47,7 @@ > > #undef container_of > > #endif > > > > +#include <env/mv_autogen_comp_flags.h> > > Is it needed as you also included this file in mrvl_ethdev.h? > I think you can move all the MUSDK headers to mrvl_ethdev.h to avoid the > duplication. It's needed here as well because it needs to be included before other MUSDK includes. So either mrvl_ethdev.h can be moved a little bit or all MUSDK related headers can go to mrvl_ethdev.h as you suggest. The latter option seems to be better choice though. > > > #include <drivers/mv_pp2.h> > > #include <drivers/mv_pp2_bpool.h> > > #include <drivers/mv_pp2_hif.h> > > @@ -690,7 +691,7 @@ mrvl_promiscuous_enable(struct rte_eth_dev *dev) > > struct mrvl_priv *priv =3D dev->data->dev_private; > > int ret; > > > > - ret =3D pp2_ppio_set_uc_promisc(priv->ppio, 1); > > + ret =3D pp2_ppio_set_promisc(priv->ppio, 1); > > if (ret) > > RTE_LOG(ERR, PMD, "Failed to enable promiscuous mode\n"); > > } > > @@ -724,7 +725,7 @@ mrvl_promiscuous_disable(struct rte_eth_dev *dev) > > struct mrvl_priv *priv =3D dev->data->dev_private; > > int ret; > > > > - ret =3D pp2_ppio_set_uc_promisc(priv->ppio, 0); > > + ret =3D pp2_ppio_set_promisc(priv->ppio, 0); > > if (ret) > > RTE_LOG(ERR, PMD, "Failed to disable promiscuous mode\n"); > > } > > diff --git a/drivers/net/mrvl/mrvl_ethdev.h b/drivers/net/mrvl/mrvl_eth= dev.h > > index 2a4ab5a..252e7a3 100644 > > --- a/drivers/net/mrvl/mrvl_ethdev.h > > +++ b/drivers/net/mrvl/mrvl_ethdev.h > > @@ -36,6 +36,7 @@ > > #define _MRVL_ETHDEV_H_ > > > > #include <rte_spinlock.h> > > +#include <env/mv_autogen_comp_flags.h> > > #include <drivers/mv_pp2_cls.h> > > #include <drivers/mv_pp2_ppio.h> > > > > -- > > 2.7.4 > > > > -- > IMPORTANT NOTICE: The contents of this email and any attachments are conf= idential and may also be privileged. If you are not the intended recipient,= please notify the sender immediately and do not disclose the contents to a= ny other person, use it for any purpose, or store or copy the information i= n any medium. Thank you. -- - Tomasz Duszy=C5=84ski