From patchwork Mon Apr 20 08:42:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Wang X-Patchwork-Id: 6240881 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DF1989F1BE for ; Mon, 20 Apr 2015 08:42:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E49EE201CD for ; Mon, 20 Apr 2015 08:42:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0130220361 for ; Mon, 20 Apr 2015 08:42:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754606AbbDTImh (ORCPT ); Mon, 20 Apr 2015 04:42:37 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:37734 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754576AbbDTImg (ORCPT ); Mon, 20 Apr 2015 04:42:36 -0400 Received: by widdi4 with SMTP id di4so82573856wid.0 for ; Mon, 20 Apr 2015 01:42:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=/2a5g9F/MhrSkmsY0yRfENJGzC7lTBGPsmZk5LKkkcc=; b=XgjqwQ/cCaeE70VKa1gMH/Gh/dL36lrk0lLiyiT6g2bepTL6jpbUZjUm9RmAbaDS4n zQmHVY1V76yLy8xlmDyOerHHSOrKYGBuHwP3wDX7bDz4ny2nO2n2hlQHHBtBaO0bmJAg qwuKdJrvprMTGBA7DuxkHx0zqkM7D2A8UaZxuj8CxgTiULngrIZVdO8CfA3sftaz9Nsf bKhy02nLS1mQ38kQzo14J8ebmBc4Ju9EKC/Ty+6sNeI0VwX6ULOU/0AdN5mZ9ycxZ8PJ ILTQS7WYFkIRt5m2rmDUaIFx2q/Ag4qArBNwFpWIFciIMCCUlaI3H4Mj0K2EVhz3dL9h x7hA== X-Gm-Message-State: ALoCoQlAYUD+Fq3KBCxZ14rJk5zuNluCJtepBmGs62/Kb4uW+gP57INefmxrKN+0Kb0w7FYDFJLi X-Received: by 10.194.90.47 with SMTP id bt15mr29444220wjb.41.1429519355715; Mon, 20 Apr 2015 01:42:35 -0700 (PDT) Received: from [192.168.71.52] ([62.217.45.26]) by mx.google.com with ESMTPSA id r9sm5916324wjo.26.2015.04.20.01.42.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Apr 2015 01:42:35 -0700 (PDT) Message-ID: <5534BBF9.80703@profitbricks.com> Date: Mon, 20 Apr 2015 10:42:33 +0200 From: Michael Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Roland Dreier , Sean Hefty , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, hal@dev.mellanox.co.il CC: Michael Wang , Tom Tucker , Steve Wise , Hoang-Nam Nguyen , Christoph Raisch , Mike Marciniszyn , Eli Cohen , Faisal Latif , Jack Morgenstein , Or Gerlitz , Haggai Eran , Ira Weiny , Tom Talpey , Jason Gunthorpe , Doug Ledford Subject: [PATCH v5 24/27] IB/Verbs: Use management helper cap_af_ib() References: <5534B8C9.506@profitbricks.com> In-Reply-To: <5534B8C9.506@profitbricks.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY, URIBL_BLACK 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 Introduce helper cap_af_ib() to help us check if the port of an IB device support Native Infiniband Address. Cc: Hal Rosenstock Cc: Steve Wise Cc: Tom Talpey Cc: Jason Gunthorpe Cc: Doug Ledford Cc: Ira Weiny Cc: Sean Hefty Signed-off-by: Michael Wang Reviewed-by: Ira Weiny --- drivers/infiniband/core/cma.c | 2 +- include/rdma/ib_verbs.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 05d148e..9c1f5b72 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -469,7 +469,7 @@ static int cma_resolve_ib_dev(struct rdma_id_private *id_priv) list_for_each_entry(cur_dev, &dev_list, list) { for (p = 1; p <= cur_dev->device->phys_port_cnt; ++p) { - if (!rdma_ib_or_iboe(cur_dev->device, p)) + if (!cap_af_ib(cur_dev->device, p)) continue; if (ib_find_cached_pkey(cur_dev->device, p, pkey, &index)) diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 074f66d..9cfab09 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1879,6 +1879,21 @@ static inline int cap_ipoib(struct ib_device *device, u8 port_num) } /** + * cap_af_ib - Check if the port of device has the capability + * Native Infiniband Address. + * + * @device: Device to be checked + * @port_num: Port number of the device + * + * Return 0 when port of the device don't support + * Native Infiniband Address. + */ +static inline int cap_af_ib(struct ib_device *device, u8 port_num) +{ + return rdma_ib_or_iboe(device, port_num); +} + +/** * cap_read_multi_sge - Check if the port of device has the capability * RDMA Read Multiple Scatter-Gather Entries. *