From: Jianbo Liu <jianbo.liu@arm.com>
To: Tomasz Duszynski <tdu@semihalf.com>
Cc: dev@dpdk.org, mw@semihalf.com, jck@semihalf.com,
dima@marvell.com, nsamsono@marvell.com
Subject: Re: [dpdk-dev] [PATCH 1/7] net/mrvl: sync compilation with musdk-17.10
Date: Fri, 1 Dec 2017 11:29:07 +0800 [thread overview]
Message-ID: <20171201032905.GA21389@arm.com> (raw)
In-Reply-To: <1512048743-23749-2-git-send-email-tdu@semihalf.com>
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 := rte_pmd_mrvl_version.map
>
> # external library dependencies
> CFLAGS += -I$(LIBMUSDK_PATH)/include
> -CFLAGS += -DMVCONF_ARCH_DMA_ADDR_T_64BIT
> -CFLAGS += -DCONF_PP2_BPOOL_COOKIE_SIZE=32
> +CFLAGS += -DMVCONF_TYPES_PUBLIC
> +CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC
> CFLAGS += $(WERROR_FLAGS)
> CFLAGS += -O3
> LDLIBS += -L$(LIBMUSDK_PATH)/lib
> diff --git a/drivers/net/mrvl/mrvl_ethdev.c b/drivers/net/mrvl/mrvl_ethdev.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.
> #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 = dev->data->dev_private;
> int ret;
>
> - ret = pp2_ppio_set_uc_promisc(priv->ppio, 1);
> + ret = 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 = dev->data->dev_private;
> int ret;
>
> - ret = pp2_ppio_set_uc_promisc(priv->ppio, 0);
> + ret = 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_ethdev.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 confidential and may also be privileged. If you are not the intended recipient, please 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.
next prev parent reply other threads:[~2017-12-01 3:30 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-30 13:32 [dpdk-dev] [PATCH 0/7] Sync with MUSDK-17.10 Tomasz Duszynski
2017-11-30 13:32 ` [dpdk-dev] [PATCH 1/7] net/mrvl: sync compilation with musdk-17.10 Tomasz Duszynski
2017-12-01 3:29 ` Jianbo Liu [this message]
2017-12-01 9:03 ` Tomasz Duszynski
2017-11-30 13:32 ` [dpdk-dev] [PATCH 2/7] net/mrvl: query link status using library API Tomasz Duszynski
2017-11-30 13:32 ` [dpdk-dev] [PATCH 3/7] net/mrvl: do not enable port after setting MAC address Tomasz Duszynski
2017-11-30 13:32 ` [dpdk-dev] [PATCH 4/7] net/mrvl: check if ppio is initialized Tomasz Duszynski
2017-11-30 13:32 ` [dpdk-dev] [PATCH 5/7] net/mrvl: add extra error logs Tomasz Duszynski
2017-12-01 3:32 ` Jianbo Liu
2017-12-01 8:26 ` Tomasz Duszynski
2017-11-30 13:32 ` [dpdk-dev] [PATCH 6/7] devtools/test-build: add MRVL NET PMD to test-build Tomasz Duszynski
2017-11-30 13:32 ` [dpdk-dev] [PATCH 7/7] net/mrvl: update MRVL NET PMD documentation Tomasz Duszynski
2017-12-01 15:19 ` [dpdk-dev] [PATCH 0/7] Sync with MUSDK-17.10 Tomasz Duszynski
2017-12-01 15:19 ` [dpdk-dev] [PATCH 1/7] net/mrvl: sync compilation with musdk-17.10 Tomasz Duszynski
2017-12-01 15:19 ` [dpdk-dev] [PATCH 2/7] net/mrvl: query link status using library API Tomasz Duszynski
2017-12-01 15:19 ` [dpdk-dev] [PATCH 3/7] net/mrvl: do not enable port after setting MAC address Tomasz Duszynski
2017-12-01 15:19 ` [dpdk-dev] [PATCH 4/7] net/mrvl: check if ppio is initialized Tomasz Duszynski
2017-12-01 15:19 ` [dpdk-dev] [PATCH 5/7] net/mrvl: add extra error logs Tomasz Duszynski
2017-12-01 15:19 ` [dpdk-dev] [PATCH 6/7] devtools/test-build: add MRVL NET PMD to test-build Tomasz Duszynski
2017-12-05 0:48 ` Ferruh Yigit
2017-12-05 8:38 ` Tomasz Duszynski
2017-12-01 15:19 ` [dpdk-dev] [PATCH 7/7] net/mrvl: update MRVL NET PMD documentation Tomasz Duszynski
2017-12-04 2:25 ` [dpdk-dev] [PATCH 0/7] Sync with MUSDK-17.10 Jianbo Liu
2017-12-05 9:39 ` [dpdk-dev] [PATCH v3 " Tomasz Duszynski
2017-12-05 9:39 ` [dpdk-dev] [PATCH v3 1/7] net/mrvl: sync compilation with musdk-17.10 Tomasz Duszynski
2017-12-05 9:39 ` [dpdk-dev] [PATCH v3 2/7] net/mrvl: query link status using library API Tomasz Duszynski
2017-12-05 9:39 ` [dpdk-dev] [PATCH v3 3/7] net/mrvl: do not enable port after setting MAC address Tomasz Duszynski
2017-12-05 9:39 ` [dpdk-dev] [PATCH v3 4/7] net/mrvl: check if ppio is initialized Tomasz Duszynski
2017-12-05 9:39 ` [dpdk-dev] [PATCH v3 5/7] net/mrvl: add extra error logs Tomasz Duszynski
2017-12-05 9:39 ` [dpdk-dev] [PATCH v3 6/7] devtools/test-build: add MRVL NET PMD to test-build Tomasz Duszynski
2017-12-05 9:39 ` [dpdk-dev] [PATCH v3 7/7] net/mrvl: update MRVL NET PMD documentation Tomasz Duszynski
2017-12-07 1:13 ` [dpdk-dev] [PATCH v3 0/7] Sync with MUSDK-17.10 Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171201032905.GA21389@arm.com \
--to=jianbo.liu@arm.com \
--cc=dev@dpdk.org \
--cc=dima@marvell.com \
--cc=jck@semihalf.com \
--cc=mw@semihalf.com \
--cc=nsamsono@marvell.com \
--cc=tdu@semihalf.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).