From patchwork Thu Feb 6 15:41:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Cohen X-Patchwork-Id: 3596811 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 22D98BF418 for ; Thu, 6 Feb 2014 15:41:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 465E620145 for ; Thu, 6 Feb 2014 15:41:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99A1C200E1 for ; Thu, 6 Feb 2014 15:41:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751367AbaBFPlh (ORCPT ); Thu, 6 Feb 2014 10:41:37 -0500 Received: from mail-wg0-f52.google.com ([74.125.82.52]:47267 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751189AbaBFPlg (ORCPT ); Thu, 6 Feb 2014 10:41:36 -0500 Received: by mail-wg0-f52.google.com with SMTP id b13so1415693wgh.7 for ; Thu, 06 Feb 2014 07:41:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=GNUk3L54XpHNJNOfltFAm0Yq4SAc29ffr4JN1NOuio0=; b=gztUw3zkFJr+45R7hCcrQq9J3mapv9INq5dZQLrQwage/nnLD/hZhgLK1PaFMUytwA S5Dbd1GIuhGahnbCGIV7wjSx7+IeAg+AMYL5ptsZy2ZuHiPP4ViH6APPFqc3q53eOEYV zfoN2s+eNb6zbCAhNlLqcVeWfK21EHh+bgDpqhdTJpULV8efD6H5vWb5KUUxS+7gd0+N AM14cUxXNGlXLFaGxjXOYKFskW1MgOlxWe9PsliFMPeSQXkYZ1bQk3fm02GlRfWO2Dz6 47WPFi0Mlmmg7912rBjK1Of9qVyc13yQHgI6UsjA31nqrEbNFVjWVxjOtwWwL3ylVBrg kcgw== X-Gm-Message-State: ALoCoQm/gf+ESDkzIB0SKQD5IsvHwx/CdSw7Sm0cmDgcRfyegV1d83QT/cvgzTIP2Y3O2UKllvnL X-Received: by 10.180.38.41 with SMTP id d9mr7364650wik.9.1391701295483; Thu, 06 Feb 2014 07:41:35 -0800 (PST) Received: from localhost (out.voltaire.com. [193.47.165.251]) by mx.google.com with ESMTPSA id r1sm56463566wia.5.2014.02.06.07.41.34 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 06 Feb 2014 07:41:34 -0800 (PST) From: Eli Cohen To: roland@kernel.org Cc: linux-rdma@vger.kernel.org, ogerlitz@mellanox.com, Eli Cohen Subject: [PATCH] IB/mlx5: Clear block multicast capability Date: Thu, 6 Feb 2014 17:41:25 +0200 Message-Id: <1391701285-24622-1-git-send-email-eli@mellanox.com> X-Mailer: git-send-email 1.8.5.2 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently Connect-IB does not support block multicast so do not set IB_DEVICE_BLOCK_MULTICAST_LOOPBACK. Reported by: Or Gerlitz Signed-off-by: Eli Cohen --- drivers/infiniband/hw/mlx5/main.c | 3 +-- drivers/infiniband/hw/mlx5/qp.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index f4ef4a24d410..aa03e732b6a8 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -261,8 +261,7 @@ static int mlx5_ib_query_device(struct ib_device *ibdev, props->device_cap_flags = IB_DEVICE_CHANGE_PHY_PORT | IB_DEVICE_PORT_ACTIVE_EVENT | IB_DEVICE_SYS_IMAGE_GUID | - IB_DEVICE_RC_RNR_NAK_GEN | - IB_DEVICE_BLOCK_MULTICAST_LOOPBACK; + IB_DEVICE_RC_RNR_NAK_GEN; flags = dev->mdev.caps.flags; if (flags & MLX5_DEV_CAP_FLAG_BAD_PKEY_CNTR) props->device_cap_flags |= IB_DEVICE_BAD_PKEY_CNTR; diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index 091576a777e9..7dfe8a1c84cf 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c @@ -665,8 +665,8 @@ static int create_kernel_qp(struct mlx5_ib_dev *dev, int err; uuari = &dev->mdev.priv.uuari; - if (init_attr->create_flags & IB_QP_CREATE_BLOCK_MULTICAST_LOOPBACK) - qp->flags |= MLX5_IB_QP_BLOCK_MULTICAST_LOOPBACK; + if (init_attr->create_flags) + return -EINVAL; if (init_attr->qp_type == MLX5_IB_QPT_REG_UMR) lc = MLX5_IB_LATENCY_CLASS_FAST_PATH;