Skip to contentSkip to conversation

IB/hns: Move HNS RoCE user vendor structures

PATCH Applied Leon Romanovsky 3 participants 3 messages Oct 19, 2016 – Dec 3, 2016 2 messages not in the archive

Subsystems (2)
InfiniBand HiSilicon RoCE driver
lore
Share & tools
lore

Leon Romanovsky

author
#0 lore raw

PATCH 1/1 IB/hns: Move HNS RoCE user vendor structures

This patch moves HNS vendor's specific structures to common UAPI folder which will be visible to all consumers.

Signed-off-by Leon Romanovsky <[email protected]>
---
 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%)
drivers/infiniband/hw/hns/hns_roce_cq.c +1 -1
index 0973659..d8a1764 100644
@@ -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)
drivers/infiniband/hw/hns/hns_roce_main.c +1 -1
index 764e35a..354f100 100644
@@ -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"
 
 /**
drivers/infiniband/hw/hns/hns_roce_qp.c +1 -1
index e86dd8d..5d13b6b 100644
@@ -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)
include/uapi/rdma/Kbuild +1 -0
index f14ab7f..b54f10d 100644
@@ -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
include/uapi/rdma/hns-abi.h renamed from drivers/infiniband/hw/hns/hns_roce_user.h +5 -4
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
@@ -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 */
Signature · 6 lines
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 1476897187-15991-1-git-send-email-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org

#2 lore raw
Quoted 83 lines · 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 <[email protected]>
---
 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%)
drivers/infiniband/hw/hns/hns_roce_cq.c +1 -1
index 0973659..d8a1764 100644
@@ -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)
drivers/infiniband/hw/hns/hns_roce_main.c +1 -1
index 764e35a..354f100 100644
@@ -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"
 
 /**
drivers/infiniband/hw/hns/hns_roce_qp.c +1 -1
index e86dd8d..5d13b6b 100644
@@ -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)
include/uapi/rdma/Kbuild +1 -0
index f14ab7f..b54f10d 100644
@@ -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
include/uapi/rdma/hns-abi.h renamed from drivers/infiniband/hw/hns/hns_roce_user.h +4 -2
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
@@ -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;

include/uapi/rdma/hns-abi.h struct hns_roce_ib_create_qp { · line 54

Quoted 6 lines
include/uapi/rdma/hns-abi.h renamed from drivers/infiniband/hw/hns/hns_roce_user.h +1 -2
@@ -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!

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

Applied
#4 lore raw
Quoted 95 lines · oulijun
Quoted 94 lines · 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 <[email protected]>

---
 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%)

drivers/infiniband/hw/hns/hns_roce_cq.c +1 -1
index 0973659..d8a1764 100644
@@ -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)

drivers/infiniband/hw/hns/hns_roce_main.c +1 -1
index 764e35a..354f100 100644
@@ -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"


 /**

drivers/infiniband/hw/hns/hns_roce_qp.c +1 -1
index e86dd8d..5d13b6b 100644
@@ -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)

include/uapi/rdma/Kbuild +0 -0
index f14ab7f..b54f10d 100644
@@ -14,3 +14,4 @@ header-y += mlx5-abi.h

 header-y += mthca-abi.h
 header-y += nes-abi.h
 header-y += ocrdma-abi.h

include/uapi/rdma/Kbuild +1 -0
+header-y += hns-abi.h
include/uapi/rdma/hns-abi.h renamed from drivers/infiniband/hw/hns/hns_roce_user.h +0 -0
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
@@ -30,8 +30,10 @@
   * SOFTWARE.
   */

include/uapi/rdma/hns-abi.h renamed from drivers/infiniband/hw/hns/hns_roce_user.h +4 -2
-#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;

include/uapi/rdma/hns-abi.h renamed from drivers/infiniband/hw/hns/hns_roce_user.h +0 -0
@@ -49,5 +51,4 @@ struct hns_roce_ib_create_qp {
Quoted 9 lines

include/uapi/rdma/hns-abi.h struct hns_roce_ib_create_qp { · line 54

Quoted 7 lines
include/uapi/rdma/hns-abi.h renamed from drivers/infiniband/hw/hns/hns_roce_user.h +1 -2
  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.

Signature · 2 lines
Doug Ledford <[email protected]>
              GPG KeyID: 0E572FDD