From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by dpdk.org (Postfix) with ESMTP id 0D06F9115 for ; Fri, 1 Sep 2017 10:07:50 +0200 (CEST) Received: by mail-wm0-f44.google.com with SMTP id 187so3715754wmn.1 for ; Fri, 01 Sep 2017 01:07:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CeO0F92JzlJfIyX2UF35pVPclN1MBhlfFWgw+ZkLnME=; b=bWu1F38Z/KYmvTUDlzlZUe3JvOyLQ+GUikTwssbYwBjX65aeHG+eJ+bIUJvEGmpxGe uZD9//G8FPLrWvkV67YHVIzI+hJK8/u9sdQty4urVQmGxrl0xFGMQ0hkQJwM7VtFDbk4 7CKLaeKqzgWMYBdxuG8kNTcdp12w//nbLBT7YMkDfWjGIbFsOoI+UwnC11GBJ4kW9HxI 3MKGIV0La1tcVHTT2/BgwrJHHhscOdPmhKCZXbt/eUwyuivC6bsHPOBqa+QVO3WbTtFM jWcNgniOo69qf0vxwdTotH0m90eOCU+KDUaEh149ky0Xtbxrzyfm2KfOrbBEqIkG6fwU OIaA== 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=CeO0F92JzlJfIyX2UF35pVPclN1MBhlfFWgw+ZkLnME=; b=ZEOTi8ZVjbdPZ7RtaYQhPH4hPyfmvwyIrNb6aV7NpTMXGBGjmj11N0fc1N8fZR93OP 2k3weDO+qDXax0sz8j8HGvzNTewgO5Ym4kffEUnRHBEX6wgrYqiGvYH7qlhtBIOnTnGR rP4MghiS9Wd65ll1X6p7pTSTVxOcAuztfwnFr4qIfGKADVXVmGyr/vDHVFkgatqAnOaN /3AZESUkXGEYD+0WOAwdijH3RKB6y2ZNUYM5WUam4Of5NFw1ZT5Y/ewACjcy7Z3wfuP0 3dRwHQvJtuLcdkmbTVvrvoA3frvSSzg8/dxQAILh2q0p1JCZmc9t2ORq2Bgfk9zkJ+Oj wSMg== X-Gm-Message-State: AHPjjUgGB982jbRGHI28oxQgEdKs8C6Bpk4iZpc6Zrzno9jQeg0GuaPU oeMIMKoM9VPG6XhmHT0= X-Google-Smtp-Source: ADKCNb7+89VSK0AnCOhSt2xgJXlhIQjGEz1QoXBnClbyEkWa2A7StPW7RGzQWN5xMHqZL7j+mhKwDA== X-Received: by 10.28.88.3 with SMTP id m3mr130072wmb.134.1504253269551; Fri, 01 Sep 2017 01:07:49 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id o2sm1368383wmg.32.2017.09.01.01.07.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Sep 2017 01:07:48 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Cc: Moti Haimovsky Date: Fri, 1 Sep 2017 10:06:36 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 21/51] net/mlx4: use standard QP attributes 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: , X-List-Received-Date: Fri, 01 Sep 2017 08:07:50 -0000 The Verbs API used to set QP attributes is deprecated. Revert to the standard API since it actually supports the remaining ones. Signed-off-by: Moti Haimovsky Signed-off-by: Adrien Mazarguil --- drivers/net/mlx4/mlx4.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 30c70ee..682307f 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -1178,7 +1178,7 @@ txq_setup(struct rte_eth_dev *dev, struct txq *txq, uint16_t desc, struct ibv_exp_qp_init_attr init; struct ibv_exp_res_domain_init_attr rd; struct ibv_exp_cq_init_attr cq; - struct ibv_exp_qp_attr mod; + struct ibv_qp_attr mod; } attr; enum ibv_exp_query_intf_status status; int ret = 0; @@ -1251,14 +1251,13 @@ txq_setup(struct rte_eth_dev *dev, struct txq *txq, uint16_t desc, } /* ibv_create_qp() updates this value. */ tmpl.max_inline = attr.init.cap.max_inline_data; - attr.mod = (struct ibv_exp_qp_attr){ + attr.mod = (struct ibv_qp_attr){ /* Move the QP to this state. */ .qp_state = IBV_QPS_INIT, /* Primary port number. */ .port_num = priv->port }; - ret = ibv_exp_modify_qp(tmpl.qp, &attr.mod, - (IBV_EXP_QP_STATE | IBV_EXP_QP_PORT)); + ret = ibv_modify_qp(tmpl.qp, &attr.mod, IBV_QP_STATE | IBV_QP_PORT); if (ret) { ERROR("%p: QP state to IBV_QPS_INIT failed: %s", (void *)dev, strerror(ret)); @@ -1270,17 +1269,17 @@ txq_setup(struct rte_eth_dev *dev, struct txq *txq, uint16_t desc, (void *)dev, strerror(ret)); goto error; } - attr.mod = (struct ibv_exp_qp_attr){ + attr.mod = (struct ibv_qp_attr){ .qp_state = IBV_QPS_RTR }; - ret = ibv_exp_modify_qp(tmpl.qp, &attr.mod, IBV_EXP_QP_STATE); + ret = ibv_modify_qp(tmpl.qp, &attr.mod, IBV_QP_STATE); if (ret) { ERROR("%p: QP state to IBV_QPS_RTR failed: %s", (void *)dev, strerror(ret)); goto error; } attr.mod.qp_state = IBV_QPS_RTS; - ret = ibv_exp_modify_qp(tmpl.qp, &attr.mod, IBV_EXP_QP_STATE); + ret = ibv_modify_qp(tmpl.qp, &attr.mod, IBV_QP_STATE); if (ret) { ERROR("%p: QP state to IBV_QPS_RTS failed: %s", (void *)dev, strerror(ret)); @@ -1947,7 +1946,7 @@ rxq_setup(struct rte_eth_dev *dev, struct rxq *rxq, uint16_t desc, .mp = mp, .socket = socket }; - struct ibv_exp_qp_attr mod; + struct ibv_qp_attr mod; union { struct ibv_exp_query_intf_params params; struct ibv_exp_cq_init_attr cq; @@ -2035,15 +2034,13 @@ rxq_setup(struct rte_eth_dev *dev, struct rxq *rxq, uint16_t desc, (void *)dev, strerror(ret)); goto error; } - mod = (struct ibv_exp_qp_attr){ + mod = (struct ibv_qp_attr){ /* Move the QP to this state. */ .qp_state = IBV_QPS_INIT, /* Primary port number. */ .port_num = priv->port }; - ret = ibv_exp_modify_qp(tmpl.qp, &mod, - IBV_EXP_QP_STATE | - IBV_EXP_QP_PORT); + ret = ibv_modify_qp(tmpl.qp, &mod, IBV_QP_STATE | IBV_QP_PORT); if (ret) { ERROR("%p: QP state to IBV_QPS_INIT failed: %s", (void *)dev, strerror(ret)); @@ -2063,10 +2060,10 @@ rxq_setup(struct rte_eth_dev *dev, struct rxq *rxq, uint16_t desc, strerror(ret)); goto error; } - mod = (struct ibv_exp_qp_attr){ + mod = (struct ibv_qp_attr){ .qp_state = IBV_QPS_RTR }; - ret = ibv_exp_modify_qp(tmpl.qp, &mod, IBV_EXP_QP_STATE); + ret = ibv_modify_qp(tmpl.qp, &mod, IBV_QP_STATE); if (ret) { ERROR("%p: QP state to IBV_QPS_RTR failed: %s", (void *)dev, strerror(ret)); -- 2.1.4