From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jianbo Liu Subject: Re: [PATCH 1/7] net/mrvl: sync compilation with musdk-17.10 Date: Fri, 1 Dec 2017 11:29:07 +0800 Message-ID: <20171201032905.GA21389@arm.com> References: <1512048743-23749-1-git-send-email-tdu@semihalf.com> <1512048743-23749-2-git-send-email-tdu@semihalf.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: dev@dpdk.org, mw@semihalf.com, jck@semihalf.com, dima@marvell.com, nsamsono@marvell.com To: Tomasz Duszynski Return-path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0049.outbound.protection.outlook.com [104.47.2.49]) by dpdk.org (Postfix) with ESMTP id E4D662A62 for ; Fri, 1 Dec 2017 04:30:24 +0100 (CET) Content-Disposition: inline In-Reply-To: <1512048743-23749-2-git-send-email-tdu@semihalf.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 > --- > 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_ethde= v.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 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. > #include > #include > #include > @@ -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_ethde= v.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 > +#include > #include > #include > > -- > 2.7.4 > -- IMPORTANT NOTICE: The contents of this email and any attachments are confid= ential and may also be privileged. If you are not the intended recipient, p= lease notify the sender immediately and do not disclose the contents to any= other person, use it for any purpose, or store or copy the information in = any medium. Thank you.