From patchwork Tue Apr 28 15:10:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Wang X-Patchwork-Id: 6290161 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 700AEBEEE5 for ; Tue, 28 Apr 2015 15:11:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 89DB020218 for ; Tue, 28 Apr 2015 15:11:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9CCE720222 for ; Tue, 28 Apr 2015 15:11:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965974AbbD1PLS (ORCPT ); Tue, 28 Apr 2015 11:11:18 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:32776 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965984AbbD1PLO (ORCPT ); Tue, 28 Apr 2015 11:11:14 -0400 Received: by wgin8 with SMTP id n8so154931633wgi.0 for ; Tue, 28 Apr 2015 08:11:13 -0700 (PDT) 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:in-reply-to :references; bh=J1gm4W23t9KjgEcx+Z85jmsWkqZHRMEe6qLG9J7fK/k=; b=S1GzrD2xQDK9vRJjUd/PlbEA6yBhvRb8b7xS6Ctw+6zKnzT2veucHCumz4oOtcOQ/7 zw+kt6k116+vW8z7kT4OmUcZa/eVnloasENTZp/vScd57TqtaGb/kvZNUkll+9fJo6T1 0I/bRnX+qm9X3aS9YSbVOE7yUzoea9l1QlE9GVIh9rKGggRQzjj9SCK4LTD6VFO3uoyR LZKVGu3b61QVSdB4BRMIZ2Pxek94+lGsVCqewy8DoBqeRQERlCDRHq7iwqaCpaxVCV97 lcXpeT9owmrBkz9ZEQ4I5KzckEKqMy8HZ8lz3nk7q8Fd5cliCrZvzdcyOb7xlUFF5gFW V3Lg== X-Gm-Message-State: ALoCoQmocLg+doZo7UZff2QzbbSyhcuSzcU+71WLV8mBApMC65VSR37FTyvEah6eaa6jl0AMH6Oz X-Received: by 10.194.208.229 with SMTP id mh5mr33202964wjc.108.1430233873091; Tue, 28 Apr 2015 08:11:13 -0700 (PDT) Received: from ubuntu.pb.local ([62.217.45.26]) by mx.google.com with ESMTPSA id be3sm16820459wib.21.2015.04.28.08.11.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Apr 2015 08:11:12 -0700 (PDT) From: Michael Wang To: Roland Dreier , Sean Hefty , Hal Rosenstock , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Michael Wang , Steve Wise , Tom Talpey , Jason Gunthorpe , Doug Ledford , Ira Weiny , Tom Tucker , Hoang-Nam Nguyen , Christoph Raisch , Mike Marciniszyn , Eli Cohen , Faisal Latif , Jack Morgenstein , Or Gerlitz , Haggai Eran , Devesh Sharma , Liran Liss , Dave Goodell Subject: [PATCH v7 22/23] IB/Verbs: Use management helper cap_af_ib() Date: Tue, 28 Apr 2015 17:10:22 +0200 Message-Id: <1430233823-7075-23-git-send-email-yun.wang@profitbricks.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1430233823-7075-1-git-send-email-yun.wang@profitbricks.com> References: <1430233823-7075-1-git-send-email-yun.wang@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: 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 --- 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 c06ca60..c3dbcdd 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -448,7 +448,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 cca0293..c045be1 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1865,6 +1865,21 @@ static inline int cap_ib_mcast(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. *