From patchwork Fri Dec 1 15:19:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Duszynski X-Patchwork-Id: 31870 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8128F5593; Fri, 1 Dec 2017 16:20:08 +0100 (CET) Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by dpdk.org (Postfix) with ESMTP id 1D55C325C for ; Fri, 1 Dec 2017 16:20:06 +0100 (CET) Received: by mail-lf0-f67.google.com with SMTP id e137so12121180lfg.5 for ; Fri, 01 Dec 2017 07:20:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0Bryi/eeVsJBNXOMHZQm3tK96QY2YR28sUeykZfVkdY=; b=Hhsu+qG5j8mZcQaJlOV9GtqOymqcwXsMwwviaPMLZdNLvbIdUi2PzoJdB3R3M/HP6S r5OaiU8iZwSyS45sBcA96icu8Wa6NPAwkn6xOUbYbko6TQ349IIazaSiQOZ05bHYU89G lE8pQqurbyVV9sDihQyvVigwKgUI2xyIWCn7zDm15WjPPoxSBfXWT1UvRBqRU/tumi2k /lQgcyQ4TR8My3GSUmT62bVQC1uNq9LnhRdKi+Z0J2RLgb3/wMGSXFLlEXgCAACtmugJ 3TEl4UwRLZ2h034MkzHL5+QBLYYARGMatuD66I7MNSF9LfxhOmy0HAexLw2HX3iC9huM 7jrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0Bryi/eeVsJBNXOMHZQm3tK96QY2YR28sUeykZfVkdY=; b=dxik9nHhfDxvuKUZ+qRdREqOTaSEU5Z3a23M1T+O3qPJtgTvaicQZXQb0rXs+9ojQj tya8ZjMwUbGPEYnF905IVNtqGJBOEVzZ6mPKEEzUQgeI2txgpqm50IWQ26nmK5YCkWZN jgGEvrYkvtQZip63IJ5xwZmtGaMmj2PuSTBPEqrXjP8pGB5pNLgOV5yvaYLxnQvuFoUC zBRPNmaIU+kmPF7dwQFpjhfRoPh/ZQVKurkyVyKLjnu1Az33bq8I3tS7z+Cnt+gAQbCg amNlUTzSA+JfzbzZgCnNYHBNWDlykoWkUkjMjj71X2uN5Zd/8HjuWwN7zXPEwDEAzM4n iGkA== X-Gm-Message-State: AJaThX7Zrhcg11o3ZlRzu+BXGVvhrbdMYj22UKicxsRXGomQ7lq4PgZG Wr1LlShXbXwTnP4N3R8CZUR38BQ3Vx8= X-Google-Smtp-Source: AGs4zMa3JjxQ9qAdTumEHdEBB7lB2VibntdhDvqWAIfaH52SqUc3CvQLFP45eCZvGjzH9iZuKnzQyA== X-Received: by 10.46.116.1 with SMTP id p1mr3788315ljc.103.1512141606214; Fri, 01 Dec 2017 07:20:06 -0800 (PST) Received: from tdu.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id j1sm1177674lfe.66.2017.12.01.07.20.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Dec 2017 07:20:05 -0800 (PST) From: Tomasz Duszynski To: dev@dpdk.org Cc: mw@semihalf.com, jck@semihalf.com, dima@marvell.com, nsamsono@marvell.com, jianbo.liu@arm.com, Tomasz Duszynski Date: Fri, 1 Dec 2017 16:19:46 +0100 Message-Id: <1512141592-16695-2-git-send-email-tdu@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512141592-16695-1-git-send-email-tdu@semihalf.com> References: <1512048743-23749-1-git-send-email-tdu@semihalf.com> <1512141592-16695-1-git-send-email-tdu@semihalf.com> Subject: [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 | 8 ++------ drivers/net/mrvl/mrvl_ethdev.h | 5 +++++ 3 files changed, 9 insertions(+), 8 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..a1ae2c1 100644 --- a/drivers/net/mrvl/mrvl_ethdev.c +++ b/drivers/net/mrvl/mrvl_ethdev.c @@ -47,10 +47,6 @@ #undef container_of #endif -#include -#include -#include - #include #include #include @@ -690,7 +686,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 +720,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..8a647a5 100644 --- a/drivers/net/mrvl/mrvl_ethdev.h +++ b/drivers/net/mrvl/mrvl_ethdev.h @@ -36,7 +36,12 @@ #define _MRVL_ETHDEV_H_ #include + +#include +#include +#include #include +#include #include /** Maximum number of rx queues per port */