lkml.org 
[lkml]   [2015]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v5 16/27] IB/Verbs: Use management helper cap_ib_mad()
On Mon, Apr 20, 2015 at 10:39:12AM +0200, Michael Wang wrote:
>
> Introduce helper cap_ib_mad() to help us check if the port of an
> IB device support Infiniband Management Datagrams.
>
> Cc: Hal Rosenstock <hal@dev.mellanox.co.il>
> Cc: Steve Wise <swise@opengridcomputing.com>
> Cc: Tom Talpey <tom@talpey.com>
> 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>

Reviewed-by: Ira Weiny <ira.weiny@intel.com>

> ---
> drivers/infiniband/core/mad.c | 6 +++---
> drivers/infiniband/core/user_mad.c | 6 +++---
> include/rdma/ib_verbs.h | 15 +++++++++++++++
> 3 files changed, 21 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
> index 1822932..4315aeb 100644
> --- a/drivers/infiniband/core/mad.c
> +++ b/drivers/infiniband/core/mad.c
> @@ -3066,7 +3066,7 @@ static void ib_mad_init_device(struct ib_device *device)
> }
>
> for (i = start; i <= end; i++) {
> - if (!rdma_ib_or_iboe(device, i))
> + if (!cap_ib_mad(device, i))
> continue;
>
> if (ib_mad_port_open(device, i)) {
> @@ -3087,7 +3087,7 @@ error_agent:
>
> error:
> while (--i >= start) {
> - if (!rdma_ib_or_iboe(device, i))
> + if (!cap_ib_mad(device, i))
> continue;
>
> if (ib_agent_port_close(device, i))
> @@ -3111,7 +3111,7 @@ static void ib_mad_remove_device(struct ib_device *device)
> }
>
> for (i = start; i <= end; i++) {
> - if (!rdma_ib_or_iboe(device, i))
> + if (!cap_ib_mad(device, i))
> continue;
>
> if (ib_agent_port_close(device, i))
> diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
> index 71fc8ba..b52884b 100644
> --- a/drivers/infiniband/core/user_mad.c
> +++ b/drivers/infiniband/core/user_mad.c
> @@ -1294,7 +1294,7 @@ static void ib_umad_add_one(struct ib_device *device)
> umad_dev->end_port = e;
>
> for (i = s; i <= e; ++i) {
> - if (!rdma_ib_or_iboe(device, i))
> + if (!cap_ib_mad(device, i))
> continue;
>
> umad_dev->port[i - s].umad_dev = umad_dev;
> @@ -1317,7 +1317,7 @@ static void ib_umad_add_one(struct ib_device *device)
>
> err:
> while (--i >= s) {
> - if (!rdma_ib_or_iboe(device, i))
> + if (!cap_ib_mad(device, i))
> continue;
>
> ib_umad_kill_port(&umad_dev->port[i - s]);
> @@ -1335,7 +1335,7 @@ static void ib_umad_remove_one(struct ib_device *device)
> return;
>
> for (i = 0; i <= umad_dev->end_port - umad_dev->start_port; ++i) {
> - if (rdma_ib_or_iboe(device, i))
> + if (cap_ib_mad(device, i))
> ib_umad_kill_port(&umad_dev->port[i]);
> }
>
> diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
> index a12e876..624e963 100644
> --- a/include/rdma/ib_verbs.h
> +++ b/include/rdma/ib_verbs.h
> @@ -1773,6 +1773,21 @@ static inline int rdma_ib_or_iboe(struct ib_device *device, u8 port_num)
> return (tp == RDMA_TRANSPORT_IB || tp == RDMA_TRANSPORT_IBOE);
> }
>
> +/**
> + * cap_ib_mad - Check if the port of device has the capability Infiniband
> + * Management Datagrams.
> + *
> + * @device: Device to be checked
> + * @port_num: Port number of the device
> + *
> + * Return 0 when port of the device don't support Infiniband
> + * Management Datagrams.
> + */
> +static inline int cap_ib_mad(struct ib_device *device, u8 port_num)
> +{
> + return rdma_ib_or_iboe(device, port_num);
> +}
> +
> int ib_query_gid(struct ib_device *device,
> u8 port_num, int index, union ib_gid *gid);
>
> --
> 2.1.0


\
 
 \ /
  Last update: 2015-04-22 02:21    [W:0.483 / U:4.424 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site