From patchwork Mon Apr 13 12:35:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Wang X-Patchwork-Id: 6208231 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 C750F9F1AC for ; Mon, 13 Apr 2015 12:35:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E5B86202F8 for ; Mon, 13 Apr 2015 12:35:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 014A3202E9 for ; Mon, 13 Apr 2015 12:35:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754504AbbDMMfU (ORCPT ); Mon, 13 Apr 2015 08:35:20 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:38755 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754498AbbDMMfR (ORCPT ); Mon, 13 Apr 2015 08:35:17 -0400 Received: by wiun10 with SMTP id n10so64676360wiu.1 for ; Mon, 13 Apr 2015 05:35:16 -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=bgO1wLORfpSqgg03gUh90OlLkSfHoILyBcX2LH2laRw=; b=mxGUBrEjh0z5/9zbhVGKuv33YCfr+JUpIi2RADtvt/ASPdA52UOuZUoJGYu6JLt7Q/ 0LgB/HZGhg8hI9ziF8iokxGeWLqxHLJwdiq7wZ9ZY9/IsVKijZhcxqq/Xa4wr8sKy/Cf 7j7iwdkWW/YkRVXSEB/ZLyU8ad5L1wd8lT3UuBiaoUlvWjutqq8zds5dxxsBZT8zwYhy 4y5MreHqV2m/t4Jwa91Ibulsmv1VRb0RhP3Vl3JbLaIV/OdSlQEF6LUYs+gMJq7inXIB dO81BoX70clYRuXJPAQWimUy/Q1w28m9y96eWN2kWtMIOu7lMz5u93a+Oq8D2mn7DGkh aR1g== X-Gm-Message-State: ALoCoQkoEZddnycWM2QVmZbA0PmyfsPEpjusin+OoSCmJBg2RGJ9K6M3BPwV4msrguz4XNljOMrU X-Received: by 10.180.214.99 with SMTP id nz3mr21538699wic.82.1428928516084; Mon, 13 Apr 2015 05:35:16 -0700 (PDT) Received: from [192.168.71.52] ([62.217.45.26]) by mx.google.com with ESMTPSA id gj7sm12632994wib.4.2015.04.13.05.35.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Apr 2015 05:35:15 -0700 (PDT) Message-ID: <552BB801.2010506@profitbricks.com> Date: Mon, 13 Apr 2015 14:35:13 +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 , Michael Wang Subject: [PATCH v3 25/28] IB/Verbs: Use management helper cap_af_ib() References: <552BB470.4090407@profitbricks.com> In-Reply-To: <552BB470.4090407@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: 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 65e41f4..7f5815d 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 29ddd14..dfe33f3 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. *