From patchwork Thu Apr 16 08:14: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: 6224761 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0D17CBF4A6 for ; Thu, 16 Apr 2015 08:14:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2DBD4202E9 for ; Thu, 16 Apr 2015 08:14:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B60420270 for ; Thu, 16 Apr 2015 08:14:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754318AbbDPIOz (ORCPT ); Thu, 16 Apr 2015 04:14:55 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:35428 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933893AbbDPIOg (ORCPT ); Thu, 16 Apr 2015 04:14:36 -0400 Received: by widdi4 with SMTP id di4so184439138wid.0 for ; Thu, 16 Apr 2015 01:14: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=il6k5GaQAxs3T3ZyeVjOEp1ewaaZnhbL9wnv7FHS4aU=; b=CfrXIzKHtWzRuDDkvMTZNNeJn8Y9gc/nmu2jcrNye1j9xlqtlqfbJdciZ9knyH2vN+ 9qk+6ZnwsejxxHXMNGqWB4hxdyp+LP91h6T5e+gH5sOH5BENjBnx3/F2IkCTW7T+vUkj Ez5z6xnOlp5Gz/zbbu0bpbBCfWbY3nwiDvcxGPjbRMDl2yRdaybWSuGnhCoctBo4GdiD +sxczHC5xAr2LrpOPTw1dr/7m4NtDVCZmbBOTPOpFdYD8P+6TVkLWlGljsJHJMIfDQE/ M7g1vHI9Fv6c/RM70apRa5CVOPiMMeP6fX/lK2Rd00mcHX4CtpK19AwxM1K493Zb+zSM WQ2Q== X-Gm-Message-State: ALoCoQm93CP9IC9mPGrWGN+pUnkWgWMFsIubLcxy0uaCvPrunUuO+awZQ+ZyBmMR6Is2XotkLSUj X-Received: by 10.180.107.38 with SMTP id gz6mr5378352wib.63.1429172075616; Thu, 16 Apr 2015 01:14:35 -0700 (PDT) Received: from [192.168.71.52] ([62.217.45.26]) by mx.google.com with ESMTPSA id g14sm5779653wjs.47.2015.04.16.01.14.33 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Apr 2015 01:14:34 -0700 (PDT) Message-ID: <552F6F69.40905@profitbricks.com> Date: Thu, 16 Apr 2015 10:14: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 , Hal Rosenstock , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org CC: 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 , hal@dev.mellanox.co.il, Michael Wang Subject: [PATCH v4 24/27] IB/Verbs: Use management helper cap_af_ib() References: <552F6CF2.4000606@profitbricks.com> In-Reply-To: <552F6CF2.4000606@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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 Introduce helper cap_af_ib() to help us check if the port of an IB device support Native Infiniband Address. Cc: Steve Wise Cc: Tom Talpey Cc: Jason Gunthorpe Cc: Doug Ledford Cc: Ira Weiny Cc: Sean Hefty Signed-off-by: Michael Wang --- 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 0ae88dc..d72a2a4 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -470,7 +470,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 60f7efb..87ab01b 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. *