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 <hal@xxxxxxxxxxxxxxxxxx>
> Cc: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
> Cc: Tom Talpey <tom@xxxxxxxxxx>
> Cc: Jason Gunthorpe <jgunthorpe@xxxxxxxxxxxxxxxxxxxx>
> Cc: Doug Ledford <dledford@xxxxxxxxxx>
> Cc: Ira Weiny <ira.weiny@xxxxxxxxx>
> Cc: Sean Hefty <sean.hefty@xxxxxxxxx>
> Signed-off-by: Michael Wang <yun.wang@xxxxxxxxxxxxxxxx>
Reviewed-by: Ira Weiny <ira.weiny@xxxxxxxxx>
> ---
> 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-rdma" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
