From patchwork Thu Apr 16 08:13:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Wang X-Patchwork-Id: 6224711 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 EBDDEBF4A6 for ; Thu, 16 Apr 2015 08:14:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 18A8620108 for ; Thu, 16 Apr 2015 08:14:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25CC420270 for ; Thu, 16 Apr 2015 08:14:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933698AbbDPIOG (ORCPT ); Thu, 16 Apr 2015 04:14:06 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:36829 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753782AbbDPINn (ORCPT ); Thu, 16 Apr 2015 04:13:43 -0400 Received: by wgsk9 with SMTP id k9so71928153wgs.3 for ; Thu, 16 Apr 2015 01:13: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=+g7oGYZ5hXG8TW2dqzf/VlaojWJSoQo0fuZPnC+Sqbs=; b=ZljWXuEqcJDRi8sVadSIsK4FYhy9SvF1SHiOOFVudnVTbtBC3Wdd6m0Uw1UBYU/wcl Vm+MmIcEbUTZBN7G9udlhZibISlVeHGLiSIDkOmIb4iWKnhdeA8sE8KPZTygbe6ucs9Y e7Cx30bh9gtImcq7wG8DPm8yxC8CqD+6NcT8tiOZrDfsYSt736OlD8/Ak/WjKCPE411v hStUapm4Wa+BJyZLWlHUMyt7Tr5Ee96kTh2KCCcMrIIQc2F3WH7UEIoVOKUOPAxvyxw+ 5kntQ4haQ1PdalW9SVm+/pP8+onBP2zUHVTqLrE+aGdWaLrdZC+VDTka7wV14+BFsCgT JHTg== X-Gm-Message-State: ALoCoQkMZukP5TUF9qcOiWJ1Y6RsYHNO6njbzKwPEa5dQdfs6euZ8qdIUrXKWu6eOP6FomlbrgTp X-Received: by 10.194.23.39 with SMTP id j7mr59004995wjf.9.1429172021415; Thu, 16 Apr 2015 01:13:41 -0700 (PDT) Received: from [192.168.71.52] ([62.217.45.26]) by mx.google.com with ESMTPSA id e2sm9249190wjy.46.2015.04.16.01.13.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Apr 2015 01:13:40 -0700 (PDT) Message-ID: <552F6F33.4030002@profitbricks.com> Date: Thu, 16 Apr 2015 10:13:39 +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 22/27] IB/Verbs: Use management helper cap_ipoib() 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_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 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 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);