On Mon, Apr 20, 2015 at 10:39:37AM +0200, Michael Wang wrote: > > Introduce helper cap_ib_smi() to help us check if the port of an > IB device support Infiniband Subnet Management Interface. > > Cc: Hal Rosenstock <h...@dev.mellanox.co.il> > Cc: Steve Wise <sw...@opengridcomputing.com> > Cc: Tom Talpey <t...@talpey.com> > Cc: Jason Gunthorpe <jguntho...@obsidianresearch.com> > Cc: Doug Ledford <dledf...@redhat.com> > Cc: Ira Weiny <ira.we...@intel.com> > Cc: Sean Hefty <sean.he...@intel.com> > Signed-off-by: Michael Wang <yun.w...@profitbricks.com>
Reviewed-by: Ira Weiny <ira.we...@intel.com> > --- > drivers/infiniband/core/agent.c | 2 +- > drivers/infiniband/core/mad.c | 2 +- > include/rdma/ib_verbs.h | 15 +++++++++++++++ > 3 files changed, 17 insertions(+), 2 deletions(-) > > diff --git a/drivers/infiniband/core/agent.c b/drivers/infiniband/core/agent.c > index ffdef4d..61471ee 100644 > --- a/drivers/infiniband/core/agent.c > +++ b/drivers/infiniband/core/agent.c > @@ -156,7 +156,7 @@ int ib_agent_port_open(struct ib_device *device, int > port_num) > goto error1; > } > > - if (rdma_tech_ib(device, port_num)) { > + if (cap_ib_smi(device, port_num)) { > /* Obtain send only MAD agent for SMI QP */ > port_priv->agent[0] = ib_register_mad_agent(device, port_num, > IB_QPT_SMI, NULL, 0, > diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c > index 4315aeb..ee3a05e 100644 > --- a/drivers/infiniband/core/mad.c > +++ b/drivers/infiniband/core/mad.c > @@ -2938,7 +2938,7 @@ static int ib_mad_port_open(struct ib_device *device, > init_mad_qp(port_priv, &port_priv->qp_info[1]); > > cq_size = mad_sendq_size + mad_recvq_size; > - has_smi = rdma_tech_ib(device, port_num); > + has_smi = cap_ib_smi(device, port_num); > if (has_smi) > cq_size *= 2; > > diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h > index 624e963..873b9a6 100644 > --- a/include/rdma/ib_verbs.h > +++ b/include/rdma/ib_verbs.h > @@ -1788,6 +1788,21 @@ static inline int cap_ib_mad(struct ib_device *device, > u8 port_num) > return rdma_ib_or_iboe(device, port_num); > } > > +/** > + * cap_ib_smi - Check if the port of device has the capability Infiniband > + * Subnet Management Interface. > + * > + * @device: Device to be checked > + * @port_num: Port number of the device > + * > + * Return 0 when port of the device don't support Infiniband > + * Subnet Management Interface. > + */ > +static inline int cap_ib_smi(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); > > -- > 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/