Following 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 auto generated 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>
CFLAGS += -O3
CFLAGS += $(WERROR_FLAGS)
CFLAGS += -I$(LIBMUSDK_PATH)/include
CFLAGS += -O3
CFLAGS += $(WERROR_FLAGS)
CFLAGS += -I$(LIBMUSDK_PATH)/include
-CFLAGS += -DMVCONF_ARCH_DMA_ADDR_T_64BIT
+CFLAGS += -DMVCONF_TYPES_PUBLIC
+CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC
# library version
LIBABIVER := 1
# library version
LIBABIVER := 1
#ifdef container_of
#undef container_of
#endif
#ifdef container_of
#undef container_of
#endif
+#include "env/mv_autogen_comp_flags.h"
#include "drivers/mv_sam.h"
#include "drivers/mv_sam_cio.h"
#include "drivers/mv_sam_session.h"
#include "drivers/mv_sam.h"
#include "drivers/mv_sam_cio.h"
#include "drivers/mv_sam_session.h"
# external library dependencies
CFLAGS += -I$(LIBMUSDK_PATH)/include
# 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
CFLAGS += $(WERROR_FLAGS)
CFLAGS += -O3
LDLIBS += -L$(LIBMUSDK_PATH)/lib
#undef container_of
#endif
#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>
#include <fcntl.h>
#include <linux/ethtool.h>
#include <linux/sockios.h>
struct mrvl_priv *priv = dev->data->dev_private;
int ret;
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");
}
if (ret)
RTE_LOG(ERR, PMD, "Failed to enable promiscuous mode\n");
}
struct mrvl_priv *priv = dev->data->dev_private;
int ret;
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");
}
if (ret)
RTE_LOG(ERR, PMD, "Failed to disable promiscuous mode\n");
}
#define _MRVL_ETHDEV_H_
#include <rte_spinlock.h>
#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_cls.h>
+#include <drivers/mv_pp2_hif.h>
#include <drivers/mv_pp2_ppio.h>
/** Maximum number of rx queues per port */
#include <drivers/mv_pp2_ppio.h>
/** Maximum number of rx queues per port */