From aad569e4377c77b94cc75f9ab206448f9318787d Mon Sep 17 00:00:00 2001 From: Olga Shern Date: Tue, 30 Jun 2015 11:27:49 +0200 Subject: [PATCH] mlx4: make sure experimental device query is implemented HAVE_EXP_QUERY_DEVICE is used to check whether ibv_exp_query_device() can be used. RSS and inline receive features depend on it. Signed-off-by: Olga Shern Signed-off-by: Adrien Mazarguil --- drivers/net/mlx4/Makefile | 4 ++++ drivers/net/mlx4/mlx4.c | 17 ++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile index 97b364aa27..ce1f2b0121 100644 --- a/drivers/net/mlx4/Makefile +++ b/drivers/net/mlx4/Makefile @@ -112,6 +112,10 @@ mlx4_autoconf.h: $(RTE_SDK)/scripts/auto-config-h.sh SEND_RAW_WR_SUPPORT \ infiniband/verbs.h \ type 'struct ibv_send_wr_raw' $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ + HAVE_EXP_QUERY_DEVICE \ + infiniband/verbs.h \ + type 'struct ibv_exp_device_attr' $(AUTOCONF_OUTPUT) mlx4.o: mlx4_autoconf.h diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index ad37e01bee..bd2056966d 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -4458,17 +4458,18 @@ mlx4_pci_devinit(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) struct ibv_pd *pd = NULL; struct priv *priv = NULL; struct rte_eth_dev *eth_dev; -#if defined(INLINE_RECV) || defined(RSS_SUPPORT) +#ifdef HAVE_EXP_QUERY_DEVICE struct ibv_exp_device_attr exp_device_attr; -#endif +#endif /* HAVE_EXP_QUERY_DEVICE */ struct ether_addr mac; union ibv_gid temp_gid; +#ifdef HAVE_EXP_QUERY_DEVICE + exp_device_attr.comp_mask = IBV_EXP_DEVICE_ATTR_EXP_CAP_FLAGS; #ifdef RSS_SUPPORT - exp_device_attr.comp_mask = - (IBV_EXP_DEVICE_ATTR_EXP_CAP_FLAGS | - IBV_EXP_DEVICE_ATTR_RSS_TBL_SZ); + exp_device_attr.comp_mask |= IBV_EXP_DEVICE_ATTR_RSS_TBL_SZ; #endif /* RSS_SUPPORT */ +#endif /* HAVE_EXP_QUERY_DEVICE */ DEBUG("using port %u (%08" PRIx32 ")", port, test); @@ -4513,11 +4514,12 @@ mlx4_pci_devinit(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) priv->port = port; priv->pd = pd; priv->mtu = ETHER_MTU; -#ifdef RSS_SUPPORT +#ifdef HAVE_EXP_QUERY_DEVICE if (ibv_exp_query_device(ctx, &exp_device_attr)) { - INFO("experimental ibv_exp_query_device"); + ERROR("ibv_exp_query_device() failed"); goto port_error; } +#ifdef RSS_SUPPORT if ((exp_device_attr.exp_device_cap_flags & IBV_EXP_DEVICE_QPG) && (exp_device_attr.exp_device_cap_flags & @@ -4569,6 +4571,7 @@ mlx4_pci_devinit(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) priv->inl_recv_size); } #endif /* INLINE_RECV */ +#endif /* HAVE_EXP_QUERY_DEVICE */ (void)mlx4_getenv_int; priv->vf = vf; -- 2.20.1