1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h
index b5e96030531..0f7a55d35ea 100644
--- a/drivers/infiniband/hw/ehca/ehca_classes.h
+++ b/drivers/infiniband/hw/ehca/ehca_classes.h
@@ -53,6 +53,7 @@ struct ehca_pd;
 struct ehca_av;
 
 #include <linux/wait.h>
+#include <linux/mutex.h>
 
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_user_verbs.h>
@@ -99,10 +100,10 @@ struct ehca_sport {
         struct ehca_sma_attr saved_attr;
 };
 
-#define HCA_CAP_MR_PGSIZE_4K  1
-#define HCA_CAP_MR_PGSIZE_64K 2
-#define HCA_CAP_MR_PGSIZE_1M  4
-#define HCA_CAP_MR_PGSIZE_16M 8
+#define HCA_CAP_MR_PGSIZE_4K  0x80000000
+#define HCA_CAP_MR_PGSIZE_64K 0x40000000
+#define HCA_CAP_MR_PGSIZE_1M  0x20000000
+#define HCA_CAP_MR_PGSIZE_16M 0x10000000
 
 struct ehca_shca {
         struct ib_device ib_device;
@@ -337,6 +338,8 @@ struct ehca_create_cq_resp {
         u32 cq_number;
         u32 token;
         struct ipzu_queue_resp ipz_queue;
+        u32 fw_handle_ofs;
+        u32 dummy;
 };
 
 struct ehca_create_qp_resp {
@@ -347,7 +350,8 @@ struct ehca_create_qp_resp {
         u32 qkey;
         /* qp_num assigned by ehca: sqp0/1 may have got different numbers */
         u32 real_qp_num;
-        u32 dummy; /* padding for 8 byte alignment */
+        u32 fw_handle_ofs;
+        u32 dummy;
         struct ipzu_queue_resp ipz_squeue;
         struct ipzu_queue_resp ipz_rqueue;
 };