| Message ID | 55157AEB.7020705@profitbricks.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Mar 27, 2015 at 04:44:43PM +0100, Michael Wang wrote: > > Introduce helper cap_smi() to help us check if the port of an > IB device support Subnet Management Interface. This and most of the others should be qualified with 'cap_ib_smi' since we already know we will need 'cap_opa_smi' someday Jason -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Make sense to me if opa smi will be handled differently, will be changed in next version :-) Regards, Michael Wang On Fri, Mar 27, 2015 at 5:32 PM, Jason Gunthorpe <jgunthorpe@obsidianresearch.com> wrote: > On Fri, Mar 27, 2015 at 04:44:43PM +0100, Michael Wang wrote: >> >> Introduce helper cap_smi() to help us check if the port of an >> IB device support Subnet Management Interface. > > This and most of the others should be qualified with 'cap_ib_smi' > since we already know we will need 'cap_opa_smi' someday > > Jason -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/infiniband/core/agent.c b/drivers/infiniband/core/agent.c index 27f1bec..187514a 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_port_ll_is_ib(device, port_num)) { + if (cap_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 896b749..c5d1ebb5b 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_port_ll_is_ib(device, port_num); + has_smi = cap_smi(device, port_num); if (has_smi) cq_size *= 2; diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c index 4736fc7..09874d0 100644 --- a/drivers/infiniband/hw/mlx4/mad.c +++ b/drivers/infiniband/hw/mlx4/mad.c @@ -1753,7 +1753,7 @@ static int create_pv_resources(struct ib_device *ibdev, int slave, int port, ctx->state = DEMUX_PV_STATE_STARTING; /* have QP0 only if link layer is IB */ - if (rdma_port_ll_is_ib(ibdev, ctx->port)) + if (cap_smi(ibdev, ctx->port)) ctx->has_smi = 1; if (ctx->has_smi) { diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 7b2bfe8..3d06178 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1796,6 +1796,21 @@ static inline int has_mad(struct ib_device *device) return rdma_transport_is_ib(device); } +/** + * cap_smi - Check if the port of device has the capability + * 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 + * Subnet Management Interface. + */ +static inline int cap_smi(struct ib_device *device, u8 port_num) +{ + return rdma_port_ll_is_ib(device, port_num); +} + int ib_query_gid(struct ib_device *device, u8 port_num, int index, union ib_gid *gid);
Introduce helper cap_smi() to help us check if the port of an IB device support Subnet Management Interface. Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Cc: Doug Ledford <dledford@redhat.com> Cc: Ira Weiny <ira.weiny@intel.com> Cc: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Michael Wang <yun.wang@profitbricks.com> --- drivers/infiniband/core/agent.c | 2 +- drivers/infiniband/core/mad.c | 2 +- drivers/infiniband/hw/mlx4/mad.c | 2 +- include/rdma/ib_verbs.h | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-)