Re: [PATCH] IB/hns: Move HNS RoCE user vendor structures

[Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>]

[-- Attachment #1: Type: text/plain, Size: 3943 bytes --]

On Fri, 2016-10-21 at 10:35 +0800, oulijun wrote:
> 在 2016/10/20 1:13, Leon Romanovsky 写道:
> > 
> > This patch moves HNS vendor's specific structures to
> > common UAPI folder which will be visible to all consumers.
> > 
> > Signed-off-by: Leon Romanovsky <leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> > ---
> >  drivers/infiniband/hw/hns/hns_roce_cq.c                          |
> > 2 +-
> >  drivers/infiniband/hw/hns/hns_roce_main.c                        |
> > 2 +-
> >  drivers/infiniband/hw/hns/hns_roce_qp.c                          |
> > 2 +-
> >  include/uapi/rdma/Kbuild                                         |
> > 1 +
> >  .../hw/hns/hns_roce_user.h => include/uapi/rdma/hns-abi.h        | 
> > 9 +++++----
> >  5 files changed, 9 insertions(+), 7 deletions(-)
> >  rename drivers/infiniband/hw/hns/hns_roce_user.h =>
> > include/uapi/rdma/hns-abi.h (94%)
> > 
> > diff --git a/drivers/infiniband/hw/hns/hns_roce_cq.c
> > b/drivers/infiniband/hw/hns/hns_roce_cq.c
> > index 0973659..d8a1764 100644
> > --- a/drivers/infiniband/hw/hns/hns_roce_cq.c
> > +++ b/drivers/infiniband/hw/hns/hns_roce_cq.c
> > @@ -35,7 +35,7 @@
> >  #include "hns_roce_device.h"
> >  #include "hns_roce_cmd.h"
> >  #include "hns_roce_hem.h"
> > -#include "hns_roce_user.h"
> > +#include <rdma/hns-abi.h>
> >  #include "hns_roce_common.h"
> >  
> >  static void hns_roce_ib_cq_comp(struct hns_roce_cq *hr_cq)
> > diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c
> > b/drivers/infiniband/hw/hns/hns_roce_main.c
> > index 764e35a..354f100 100644
> > --- a/drivers/infiniband/hw/hns/hns_roce_main.c
> > +++ b/drivers/infiniband/hw/hns/hns_roce_main.c
> > @@ -37,7 +37,7 @@
> >  #include <rdma/ib_user_verbs.h>
> >  #include "hns_roce_common.h"
> >  #include "hns_roce_device.h"
> > -#include "hns_roce_user.h"
> > +#include <rdma/hns-abi.h>
> >  #include "hns_roce_hem.h"
> >  
> >  /**
> > diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c
> > b/drivers/infiniband/hw/hns/hns_roce_qp.c
> > index e86dd8d..5d13b6b 100644
> > --- a/drivers/infiniband/hw/hns/hns_roce_qp.c
> > +++ b/drivers/infiniband/hw/hns/hns_roce_qp.c
> > @@ -37,7 +37,7 @@
> >  #include "hns_roce_common.h"
> >  #include "hns_roce_device.h"
> >  #include "hns_roce_hem.h"
> > -#include "hns_roce_user.h"
> > +#include <rdma/hns-abi.h>
> >  
> >  #define SQP_NUM				(2 *
> > HNS_ROCE_MAX_PORTS)
> >  
> > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild
> > index f14ab7f..b54f10d 100644
> > --- a/include/uapi/rdma/Kbuild
> > +++ b/include/uapi/rdma/Kbuild
> > @@ -14,3 +14,4 @@ header-y += mlx5-abi.h
> >  header-y += mthca-abi.h
> >  header-y += nes-abi.h
> >  header-y += ocrdma-abi.h
> > +header-y += hns-abi.h
> > diff --git a/drivers/infiniband/hw/hns/hns_roce_user.h
> > b/include/uapi/rdma/hns-abi.h
> > similarity index 94%
> > rename from drivers/infiniband/hw/hns/hns_roce_user.h
> > rename to include/uapi/rdma/hns-abi.h
> > index a28f761..5d74019 100644
> > --- a/drivers/infiniband/hw/hns/hns_roce_user.h
> > +++ b/include/uapi/rdma/hns-abi.h
> > @@ -30,8 +30,10 @@
> >   * SOFTWARE.
> >   */
> >  
> > -#ifndef _HNS_ROCE_USER_H
> > -#define _HNS_ROCE_USER_H
> > +#ifndef HNS_ABI_USER_H
> > +#define HNS_ABI_USER_H
> > +
> > +#include <linux/types.h>
> >  
> >  struct hns_roce_ib_create_cq {
> >  	__u64   buf_addr;
> > @@ -49,5 +51,4 @@ struct hns_roce_ib_create_qp {
> >  struct hns_roce_ib_alloc_ucontext_resp {
> >  	__u32	qp_tab_size;
> >  };
> > -
> > -#endif /*_HNS_ROCE_USER_H */
> > +#endif /* HNS_ABI_USER_H */
> > 
> ok, thanks!
> 

Thanks, applied.

-- 
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
              GPG KeyID: 0E572FDD

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]