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 E57A8293B for <dev@dpdk.org>; Tue, 5 Dec 2017 10:39:36 +0100 (CET) Received: by mail-lf0-f67.google.com with SMTP id i2so22437383lfe.9 for <dev@dpdk.org>; Tue, 05 Dec 2017 01:39:36 -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=3CItkGMiUE6MHWEwcgu/LUSSPXlO8i+zv8kd/Wz301I=; b=Pk0pRpV8clLEVZ5UNJJFb4koAH3fSYGEWpySDvwCnImsmud2G3HMSCLQUTFNvCjsct 05gB05AV+enpcVXrPUmn5nSI7v/v6xn2s5zvQND5IC6CJF5Gu2isJ5vEWvdN+s80xr8f KKmqz9KHGUcEojHmJNaViCo+LzYdh1ib901DOGiktlIx+AcvsuCO+XoaAdQ5vOQSaRP2 Fu7yrV0lsSeavl0j8XfmVdrMaKrc5ih2c/zhbJp2d6BbNHXZWQxgaxS6gFRvmbjle1+Q NvVKhvEnMslgJpzm4cVP78X4pXU5sP4S4TNEU6IRf+BFciqxaMBnNDkWg/uAO1sIjrWp rf2g== 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=3CItkGMiUE6MHWEwcgu/LUSSPXlO8i+zv8kd/Wz301I=; b=Oo3zWARLqUgZtXvIsxO6Q/1uRUDjruhOb0fqlMfINQxPJKHNN5Zj180EfEgAscCvBm HKaGoS330X7x2kM/DU6/2zBQLeXrkkN0bmFGNmIM4siGq/v+V4V3QrQv0DkCOuCH+zXN S+vAPRLEeJ3wsT02Tj9o10WfuTKGE/JL7oEKyu989ECEQ2OhNh/zKxYR0HelBejN7FRJ H7F4cBQsQMa1jIm64DnXoRSO4RPct+LSgy8Py82caWjHhIs/n/Kdr4d86LLAYO3aootm 4UtMpmGb/wfjXb2lSB6J8TSLBc6UDET3vqzaGxnkon2g2iKN4FnkNACWcW/eWnZkyTMP e4Xg== X-Gm-Message-State: AJaThX6eAZB1Xhba1tnTNByZVOxzw0Xseda4bEwZopWI5XGEMUYE6GlK thYcDTH9R0VnbpmhQ//+6DgN5F0/I+Y= X-Google-Smtp-Source: AGs4zMaMREnRHTYBbXyAuB77n3ZwwYQ/5dNS+ECJ6LRNfyq7fjSyN9FRt/ese1APlzurPLMMFf06Lg== X-Received: by 10.46.34.196 with SMTP id i187mr10050763lji.106.1512466776233; Tue, 05 Dec 2017 01:39:36 -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 p5sm3334975ljc.7.2017.12.05.01.39.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Dec 2017 01:39:35 -0800 (PST) From: Tomasz Duszynski <tdu@semihalf.com> To: dev@dpdk.org Cc: mw@semihalf.com, jck@semihalf.com, dima@marvell.com, nsamsono@marvell.com, jianbo.liu@arm.com, Tomasz Duszynski <tdu@semihalf.com> Date: Tue, 5 Dec 2017 10:39:16 +0100 Message-Id: <1512466762-1982-2-git-send-email-tdu@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512466762-1982-1-git-send-email-tdu@semihalf.com> References: <1512141592-16695-1-git-send-email-tdu@semihalf.com> <1512466762-1982-1-git-send-email-tdu@semihalf.com> Subject: [dpdk-dev] [PATCH v3 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: Tue, 05 Dec 2017 09:39:37 -0000 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> Acked-by: Jianbo Liu <jianbo.liu@arm.com> --- 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 <drivers/mv_pp2.h> -#include <drivers/mv_pp2_bpool.h> -#include <drivers/mv_pp2_hif.h> - #include <fcntl.h> #include <linux/ethtool.h> #include <linux/sockios.h> @@ -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 <rte_spinlock.h> + +#include <env/mv_autogen_comp_flags.h> +#include <drivers/mv_pp2.h> +#include <drivers/mv_pp2_bpool.h> #include <drivers/mv_pp2_cls.h> +#include <drivers/mv_pp2_hif.h> #include <drivers/mv_pp2_ppio.h> /** Maximum number of rx queues per port */ -- 2.7.4