From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <tdu@semihalf.com> Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by dpdk.org (Postfix) with ESMTP id 5380428EE for <dev@dpdk.org>; Thu, 30 Nov 2017 14:32:38 +0100 (CET) Received: by mail-lf0-f68.google.com with SMTP id a12so7911568lfe.4 for <dev@dpdk.org>; Thu, 30 Nov 2017 05:32:38 -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=03D4HetB4Tm1z/D6jj2NaUDZqb2lLrYMZvQUBWmq9nA=; b=de5IrWPvE/I5eQGf4BizGtQHsakDUsR1ZYe2BXe9Uds5foNzPNezg5C8B3CiZYB8UX BjKfnZFZ07faO+lMEvM8NRAlhMu7WKr6Wln0FdshPfx/04tHutYKEqcD7eMn7CS6+Of1 pXsK6/5lLlwDuFXbxce40y7gN3R8ui5Xf0L5ju5o4xFKOIiX0TsqFNMO6v0w9CjfeFr5 tUlPZXaE8puYwR0EplROJsdnkoVLzGjHRzzQ8YFhDnV26vqj64rWuoniHc5u6h/chBz+ CES0a+P2g29WsQRdKt7IaXAh9p/noBCZgDhQ7bwp70mPHjPldBfgQp1q9ajRSsnAiWiM 17dQ== 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=03D4HetB4Tm1z/D6jj2NaUDZqb2lLrYMZvQUBWmq9nA=; b=ukwisHjWuoAwlF8JLno+UzjDHLDOvYSj9R3khe4vwefyfOgoQm2PcpG/6EGTAjH1QU YwAFaXP2SrEMAo0oDvgGUSAE5VNwKlhAydxepCtiVAWi4Fn/FDUSzDFUxycEnb3wnO9i p97kb3YmDjzB5wdoDRJLHKb/0FMj8nuDZMHEo3UMnAQDI75US8T+kTb/m1VCYzpIkkPQ UETNROujvtB5WgPit3sKs1kholL9mD5GKnJgnSgCBrsFnUJoJn5G7khHnn1js0QICKws 4dn9jMuWISF160wp2ynHoSDEivDQb7Hvjq+eIVkSXagmaU0suDh90JrLyRQZcgTWkzzD DMbw== X-Gm-Message-State: AJaThX6K+WBlwNanHdedA7GieW6kQxehZHoRfJuDq3ZhUbF7G54L022N prGEjcRfwIkaiPPpsMN3lpTrWoE5HP8= X-Google-Smtp-Source: AGs4zMbR+FGrGlwoyrQHuzv7XNHrwBoZwHvQtWcjOpKY9xXMGwhwGqJfcUpiL/r3C06cdSdyXOvyDQ== X-Received: by 10.46.82.89 with SMTP id g86mr3260020ljb.131.1512048757766; Thu, 30 Nov 2017 05:32:37 -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 x27sm717277lfb.23.2017.11.30.05.32.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Nov 2017 05:32:37 -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: Thu, 30 Nov 2017 14:32:17 +0100 Message-Id: <1512048743-23749-2-git-send-email-tdu@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512048743-23749-1-git-send-email-tdu@semihalf.com> References: <1512048743-23749-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 <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: Thu, 30 Nov 2017 13:32:38 -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> --- 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> #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