From patchwork Mon Apr 13 12:33:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Wang X-Patchwork-Id: 6208141 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 55BE89F1AC for ; Mon, 13 Apr 2015 12:33:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 75F152026F for ; Mon, 13 Apr 2015 12:33:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84308202E6 for ; Mon, 13 Apr 2015 12:33:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754458AbbDMMdz (ORCPT ); Mon, 13 Apr 2015 08:33:55 -0400 Received: from mail-wg0-f54.google.com ([74.125.82.54]:36273 "EHLO mail-wg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754449AbbDMMdw (ORCPT ); Mon, 13 Apr 2015 08:33:52 -0400 Received: by wgsk9 with SMTP id k9so79053111wgs.3 for ; Mon, 13 Apr 2015 05:33:51 -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=wMviKOAqOt3S8h5j242xNQVbJ36Q6rlyR1z0OsmWFwo=; b=DhToBAt+fniKKcihRmFmnWau9zAMVSY0AXQ77i1hCImYjBFZJ3Mq9rDdH/d9oDfdBS Mf2YzH9BUF99V8lOlR+fe2/P95Bb/PlHbs/gH1btTorvut3g9wapIOLVozUnpLgs1fHu 3+4xvZ3vKcYImQDEcu7HE7QGKgI7fCoa1r3vh0OGbyys5Gi2xe0VMkVng3Z4e5dhfZ2N Bo2EvvCwZONIQjw/0exWXtSP+e3HiTo05clDlDBSTw/D8pEm/RXU7EcbLcFlq6ddih0w ivo0qujWzaY7f16Zik+vMGplxuBv1T0Lo8xs9vR0SCZqeC+2WOitFprhtHhLrXTBLLY/ ENMA== X-Gm-Message-State: ALoCoQn1Y/6zcF3Jzm+N/SAKh+bHLexsjh/L7oYiIAsOwbc1rNpKUhy/Azciqb62F+K82FXg5LrW X-Received: by 10.195.13.104 with SMTP id ex8mr27078974wjd.12.1428928431015; Mon, 13 Apr 2015 05:33:51 -0700 (PDT) Received: from [192.168.71.52] ([62.217.45.26]) by mx.google.com with ESMTPSA id mc20sm11315516wic.15.2015.04.13.05.33.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Apr 2015 05:33:50 -0700 (PDT) Message-ID: <552BB7AC.2010402@profitbricks.com> Date: Mon, 13 Apr 2015 14:33:48 +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 22/28] IB/Verbs: Use management helper cap_ipoib() 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_ipoib() to help us check if the port of an IB device support IP over Infiniband. 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/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 97372b1..150768f 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 b2cee8d..ac62b3a 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);