From patchwork Mon Apr 20 08:41:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Wang X-Patchwork-Id: 6240841 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 389D1BF4A6 for ; Mon, 20 Apr 2015 08:41:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4EB92201CD for ; Mon, 20 Apr 2015 08:41:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C7822035D for ; Mon, 20 Apr 2015 08:41:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754805AbbDTIln (ORCPT ); Mon, 20 Apr 2015 04:41:43 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:34625 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755264AbbDTIlm (ORCPT ); Mon, 20 Apr 2015 04:41:42 -0400 Received: by wicmx19 with SMTP id mx19so34294615wic.1 for ; Mon, 20 Apr 2015 01:41:41 -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=LgGfVq3UvWCYJR/KiJgker3pNAeSvgoxiyYgDlfN0Ds=; b=EaEe8O6RMeaoX2JIV8qO0VqE8dTio+zyNSokogl0iXztsA5VzqFos4SuqsoNoGB5C5 41gnmqcEwNmalOnHLWFI6PfjYp3SSQwkwcGAI9e4lqYmF3XXrO7YJUpE4lm4xI2utor5 bgwsfBMbGA4vP4O39aPEDohMN85JUb9h0nb43TP3SZ5V4SrBINgHiYPzjvhVF9ISANF6 cICp6uyTsi7J3NPWhLcwbBPWjyP+QowtYo6lUR13daUL5I9reN0/UEWPoC+6E9Lg9eLr 38WQfrPkcVnhemiePzKICzJBD9MYQg+pX5F07ynhmM75Xs8hy3foDLZ6hZA076eafKvq 5TrA== X-Gm-Message-State: ALoCoQlLRdf5OHUFBUxeReO2QoftllVXNnQ8CbH5e4HaHP+s+UepDwCE4qeXanMq02BnCfecehnQ X-Received: by 10.180.109.79 with SMTP id hq15mr22918295wib.93.1429519301270; Mon, 20 Apr 2015 01:41:41 -0700 (PDT) Received: from [192.168.71.52] ([62.217.45.26]) by mx.google.com with ESMTPSA id hl8sm26239704wjb.38.2015.04.20.01.41.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Apr 2015 01:41:40 -0700 (PDT) Message-ID: <5534BBC2.4010902@profitbricks.com> Date: Mon, 20 Apr 2015 10:41:38 +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 22/27] IB/Verbs: Use management helper cap_ipoib() 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_ipoib() to help us check if the port of an IB device support IP over Infiniband. 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/ulp/ipoib/ipoib_main.c | 2 +- include/rdma/ib_verbs.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index 60b379d..a9812df 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -1671,7 +1671,7 @@ static void ipoib_add_one(struct ib_device *device) } for (p = s; p <= e; ++p) { - if (!rdma_tech_ib(device, p)) + if (!cap_ipoib(device, p)) continue; dev = ipoib_add_port("ib%d", device, p); if (!IS_ERR(dev)) { diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 6e354df..d0ae08e 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1863,6 +1863,21 @@ static inline int cap_ib_mcast(struct ib_device *device, u8 port_num) return cap_ib_sa(device, port_num); } +/** + * cap_ipoib - Check if the port of device has the capability + * IP over Infiniband. + * + * @device: Device to be checked + * @port_num: Port number of the device + * + * Return 0 when port of the device don't support + * IP over Infiniband. + */ +static inline int cap_ipoib(struct ib_device *device, u8 port_num) +{ + return rdma_tech_ib(device, port_num); +} + int ib_query_gid(struct ib_device *device, u8 port_num, int index, union ib_gid *gid);