Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965656AbbDVAMC (ORCPT ); Tue, 21 Apr 2015 20:12:02 -0400 Received: from mga02.intel.com ([134.134.136.20]:64609 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964865AbbDVAL5 (ORCPT ); Tue, 21 Apr 2015 20:11:57 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,619,1422950400"; d="scan'208";a="717174085" Date: Tue, 21 Apr 2015 20:11:51 -0400 From: "ira.weiny" To: Michael Wang Cc: Roland Dreier , Sean Hefty , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, hal@dev.mellanox.co.il, Tom Tucker , Steve Wise , Hoang-Nam Nguyen , Christoph Raisch , Mike Marciniszyn , Eli Cohen , Faisal Latif , Jack Morgenstein , Or Gerlitz , Haggai Eran , Tom Talpey , Jason Gunthorpe , Doug Ledford Subject: Re: [PATCH v5 25/27] IB/Verbs: Use management helper cap_eth_ah() Message-ID: <20150422001150.GY15893@phlsvsds.ph.intel.com> References: <5534B8C9.506@profitbricks.com> <5534BC17.9030809@profitbricks.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5534BC17.9030809@profitbricks.com> User-Agent: Mutt/1.4.2.2i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3473 Lines: 95 On Mon, Apr 20, 2015 at 10:43:03AM +0200, Michael Wang wrote: > > Introduce helper cap_eth_ah() to help us check if the port of an > IB device support Ethernet Address Handler. > > 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/core/cma.c | 2 +- > drivers/infiniband/core/sa_query.c | 2 +- > drivers/infiniband/core/verbs.c | 2 +- > include/rdma/ib_verbs.h | 15 +++++++++++++++ > 4 files changed, 18 insertions(+), 3 deletions(-) > > diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c > index 9c1f5b72..b9f7ccc 100644 > --- a/drivers/infiniband/core/cma.c > +++ b/drivers/infiniband/core/cma.c > @@ -732,7 +732,7 @@ static int cma_ib_init_qp_attr(struct rdma_id_private *id_priv, > int ret; > u16 pkey; > > - if (rdma_tech_iboe(id_priv->id.device, id_priv->id.port_num)) > + if (cap_eth_ah(id_priv->id.device, id_priv->id.port_num)) > pkey = 0xffff; > else > pkey = ib_addr_get_pkey(dev_addr); > diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c > index f14a66f..063c17c 100644 > --- a/drivers/infiniband/core/sa_query.c > +++ b/drivers/infiniband/core/sa_query.c > @@ -540,7 +540,7 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num, > ah_attr->port_num = port_num; > ah_attr->static_rate = rec->rate; > > - force_grh = rdma_tech_iboe(device, port_num); > + force_grh = cap_eth_ah(device, port_num); > > if (rec->hop_limit > 1 || force_grh) { > ah_attr->ah_flags = IB_AH_GRH; > diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c > index 7264860..ee4b5cb 100644 > --- a/drivers/infiniband/core/verbs.c > +++ b/drivers/infiniband/core/verbs.c > @@ -202,7 +202,7 @@ int ib_init_ah_from_wc(struct ib_device *device, u8 port_num, struct ib_wc *wc, > int ret; > > memset(ah_attr, 0, sizeof *ah_attr); > - if (rdma_tech_iboe(device, port_num)) { > + if (cap_eth_ah(device, port_num)) { > if (!(wc->wc_flags & IB_WC_GRH)) > return -EPROTOTYPE; > > diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h > index 9cfab09..45050cb 100644 > --- a/include/rdma/ib_verbs.h > +++ b/include/rdma/ib_verbs.h > @@ -1894,6 +1894,21 @@ static inline int cap_af_ib(struct ib_device *device, u8 port_num) > } > > /** > + * cap_eth_ah - Check if the port of device has the capability > + * Ethernet Address Handler. > + * > + * @device: Device to be checked > + * @port_num: Port number of the device > + * > + * Return 0 when port of the device don't support > + * Ethernet Address Handler. > + */ > +static inline int cap_eth_ah(struct ib_device *device, u8 port_num) > +{ > + return rdma_tech_iboe(device, port_num); > +} > + > +/** > * cap_read_multi_sge - Check if the port of device has the capability > * RDMA Read Multiple Scatter-Gather Entries. > * > -- > 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/