[rdma-next] RDMA/mana: Remove redefinition of basic u64 type

Commit Message

Leon Romanovsky Nov. 11, 2022, 9:55 a.m. UTC

From: Leon Romanovsky <[e-mail]>

gdma_obj_handle_t is no more than redefinition of basic
u64 type. Remove such obfuscation.

Signed-off-by: Leon Romanovsky <[e-mail]>
---
 drivers/infiniband/hw/mana/mr.c               |  5 ++-
 .../net/ethernet/microsoft/mana/gdma_main.c   |  3 +-
 include/net/mana/gdma.h                       | 31 +++++++++----------
 3 files changed, 17 insertions(+), 22 deletions(-)

Comments

Ajay Sharma Nov. 12, 2022, 4:26 a.m. UTC | #1

Agreed. This was just to keep in sync with the naming conventions on the firmware side. 

> -----Original Message-----
> From: Leon Romanovsky <[e-mail]>
> Sent: Friday, November 11, 2022 3:55 AM
> To: Jason Gunthorpe <[e-mail]>
> Cc: Leon Romanovsky <[e-mail]>; Ajay Sharma
> <[e-mail]>; David S. Miller <[e-mail]>;
> Dexuan Cui <[e-mail]>; Eric Dumazet <[e-mail]>;
> Haiyang Zhang <[e-mail]>; Jakub Kicinski <[e-mail]>;
> KY Srinivasan <[e-mail]>; [e-mail]; linux-
> [e-mail]; Long Li <[e-mail]>;
> [e-mail]; Paolo Abeni <[e-mail]>; Stephen
> Hemminger <[e-mail]>; Wei Liu <[e-mail]>
> Subject: [EXTERNAL] [PATCH rdma-next] RDMA/mana: Remove redefinition of
> basic u64 type
> 
> From: Leon Romanovsky <[e-mail]>
> 
> gdma_obj_handle_t is no more than redefinition of basic
> u64 type. Remove such obfuscation.
> 
> Signed-off-by: Leon Romanovsky <[e-mail]>
> ---
>  drivers/infiniband/hw/mana/mr.c               |  5 ++-
>  .../net/ethernet/microsoft/mana/gdma_main.c   |  3 +-
>  include/net/mana/gdma.h                       | 31 +++++++++----------
>  3 files changed, 17 insertions(+), 22 deletions(-)
> 
> diff --git a/drivers/infiniband/hw/mana/mr.c
> b/drivers/infiniband/hw/mana/mr.c index a56236cdd9ee..351207c60eb6
> 100644
> --- a/drivers/infiniband/hw/mana/mr.c
> +++ b/drivers/infiniband/hw/mana/mr.c
> @@ -73,8 +73,7 @@ static int mana_ib_gd_create_mr(struct mana_ib_dev
> *dev, struct mana_ib_mr *mr,
>  	return 0;
>  }
> 
> -static int mana_ib_gd_destroy_mr(struct mana_ib_dev *dev,
> -				 gdma_obj_handle_t mr_handle)
> +static int mana_ib_gd_destroy_mr(struct mana_ib_dev *dev, u64
> +mr_handle)
>  {
>  	struct gdma_destroy_mr_response resp = {};
>  	struct gdma_destroy_mr_request req = {}; @@ -108,9 +107,9 @@
> struct ib_mr *mana_ib_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length,
>  	struct mana_ib_pd *pd = container_of(ibpd, struct mana_ib_pd, ibpd);
>  	struct gdma_create_mr_params mr_params = {};
>  	struct ib_device *ibdev = ibpd->device;
> -	gdma_obj_handle_t dma_region_handle;
>  	struct mana_ib_dev *dev;
>  	struct mana_ib_mr *mr;
> +	u64 dma_region_handle;
>  	int err;
> 
>  	dev = container_of(ibdev, struct mana_ib_dev, ib_dev); diff --git
> a/drivers/net/ethernet/microsoft/mana/gdma_main.c
> b/drivers/net/ethernet/microsoft/mana/gdma_main.c
> index 46a7d1e6ece9..69224ff8efb6 100644
> --- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
> +++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
> @@ -671,8 +671,7 @@ int mana_gd_create_hwc_queue(struct gdma_dev
> *gd,
>  	return err;
>  }
> 
> -int mana_gd_destroy_dma_region(struct gdma_context *gc,
> -			       gdma_obj_handle_t dma_region_handle)
> +int mana_gd_destroy_dma_region(struct gdma_context *gc, u64
> +dma_region_handle)
>  {
>  	struct gdma_destroy_dma_region_req req = {};
>  	struct gdma_general_resp resp = {};
> diff --git a/include/net/mana/gdma.h b/include/net/mana/gdma.h index
> 221adc96340c..a9fdae14d24c 100644
> --- a/include/net/mana/gdma.h
> +++ b/include/net/mana/gdma.h
> @@ -65,8 +65,6 @@ enum {
>  	GDMA_DEVICE_MANA	= 2,
>  };
> 
> -typedef u64 gdma_obj_handle_t;
> -
>  struct gdma_resource {
>  	/* Protect the bitmap */
>  	spinlock_t lock;
> @@ -200,7 +198,7 @@ struct gdma_mem_info {
>  	u64 length;
> 
>  	/* Allocated by the PF driver */
> -	gdma_obj_handle_t dma_region_handle;
> +	u64 dma_region_handle;
>  };
> 
>  #define REGISTER_ATB_MST_MKEY_LOWER_SIZE 8 @@ -624,7 +622,7 @@
> struct gdma_create_queue_req {
>  	u32 reserved1;
>  	u32 pdid;
>  	u32 doolbell_id;
> -	gdma_obj_handle_t gdma_region;
> +	u64 gdma_region;
>  	u32 reserved2;
>  	u32 queue_size;
>  	u32 log2_throttle_limit;
> @@ -699,14 +697,14 @@ struct gdma_create_dma_region_req {
> 
>  struct gdma_create_dma_region_resp {
>  	struct gdma_resp_hdr hdr;
> -	gdma_obj_handle_t dma_region_handle;
> +	u64 dma_region_handle;
>  }; /* HW DATA */
> 
>  /* GDMA_DMA_REGION_ADD_PAGES */
>  struct gdma_dma_region_add_pages_req {
>  	struct gdma_req_hdr hdr;
> 
> -	gdma_obj_handle_t dma_region_handle;
> +	u64 dma_region_handle;
> 
>  	u32 page_addr_list_len;
>  	u32 reserved3;
> @@ -718,7 +716,7 @@ struct gdma_dma_region_add_pages_req {  struct
> gdma_destroy_dma_region_req {
>  	struct gdma_req_hdr hdr;
> 
> -	gdma_obj_handle_t dma_region_handle;
> +	u64 dma_region_handle;
>  }; /* HW DATA */
> 
>  enum gdma_pd_flags {
> @@ -733,14 +731,14 @@ struct gdma_create_pd_req {
> 
>  struct gdma_create_pd_resp {
>  	struct gdma_resp_hdr hdr;
> -	gdma_obj_handle_t pd_handle;
> +	u64 pd_handle;
>  	u32 pd_id;
>  	u32 reserved;
>  };/* HW DATA */
> 
>  struct gdma_destroy_pd_req {
>  	struct gdma_req_hdr hdr;
> -	gdma_obj_handle_t pd_handle;
> +	u64 pd_handle;
>  };/* HW DATA */
> 
>  struct gdma_destory_pd_resp {
> @@ -756,11 +754,11 @@ enum gdma_mr_type {  };
> 
>  struct gdma_create_mr_params {
> -	gdma_obj_handle_t pd_handle;
> +	u64 pd_handle;
>  	enum gdma_mr_type mr_type;
>  	union {
>  		struct {
> -			gdma_obj_handle_t dma_region_handle;
> +			u64 dma_region_handle;
>  			u64 virtual_address;
>  			enum gdma_mr_access_flags access_flags;
>  		} gva;
> @@ -769,13 +767,13 @@ struct gdma_create_mr_params {
> 
>  struct gdma_create_mr_request {
>  	struct gdma_req_hdr hdr;
> -	gdma_obj_handle_t pd_handle;
> +	u64 pd_handle;
>  	enum gdma_mr_type mr_type;
>  	u32 reserved_1;
> 
>  	union {
>  		struct {
> -			gdma_obj_handle_t dma_region_handle;
> +			u64 dma_region_handle;
>  			u64 virtual_address;
>  			enum gdma_mr_access_flags access_flags;
>  		} gva;
> @@ -786,14 +784,14 @@ struct gdma_create_mr_request {
> 
>  struct gdma_create_mr_response {
>  	struct gdma_resp_hdr hdr;
> -	gdma_obj_handle_t mr_handle;
> +	u64 mr_handle;
>  	u32 lkey;
>  	u32 rkey;
>  };/* HW DATA */
> 
>  struct gdma_destroy_mr_request {
>  	struct gdma_req_hdr hdr;
> -	gdma_obj_handle_t mr_handle;
> +	u64 mr_handle;
>  };/* HW DATA */
> 
>  struct gdma_destroy_mr_response {
> @@ -827,7 +825,6 @@ void mana_gd_free_memory(struct gdma_mem_info
> *gmi);  int mana_gd_send_request(struct gdma_context *gc, u32 req_len,
> const void *req,
>  			 u32 resp_len, void *resp);
> 
> -int mana_gd_destroy_dma_region(struct gdma_context *gc,
> -			       gdma_obj_handle_t dma_region_handle);
> +int mana_gd_destroy_dma_region(struct gdma_context *gc, u64
> +dma_region_handle);
> 
>  #endif /* _GDMA_H */
> --
> 2.38.1

Long Li Nov. 13, 2022, 7:29 p.m. UTC | #2

> From: Ajay Sharma <[e-mail]>
> Sent: Friday, November 11, 2022 8:27 PM
> To: Leon Romanovsky <[e-mail]>; Jason Gunthorpe <[e-mail]>
> Cc: Leon Romanovsky <[e-mail]>; David S. Miller
> <[e-mail]>; Dexuan Cui <[e-mail]>; Eric Dumazet
> <[e-mail]>; Haiyang Zhang <[e-mail]>; Jakub
> Kicinski <[e-mail]>; KY Srinivasan <[e-mail]>; linux-
> [e-mail]; [e-mail]; Long Li
> <[e-mail]>; [e-mail]; Paolo Abeni
> <[e-mail]>; Stephen Hemminger <[e-mail]>; Wei
> Liu <[e-mail]>; Ajay Sharma <[e-mail]>
> Subject: RE: [EXTERNAL] [PATCH rdma-next] RDMA/mana: Remove redefinition
> of basic u64 type
> 
> Agreed. This was just to keep in sync with the naming conventions on the
> firmware side.
> 
> > -----Original Message-----
> > From: Leon Romanovsky <[e-mail]>
> > Sent: Friday, November 11, 2022 3:55 AM
> > To: Jason Gunthorpe <[e-mail]>
> > Cc: Leon Romanovsky <[e-mail]>; Ajay Sharma
> > <[e-mail]>; David S. Miller <[e-mail]>;
> > Dexuan Cui <[e-mail]>; Eric Dumazet <[e-mail]>;
> > Haiyang Zhang <[e-mail]>; Jakub Kicinski
> > <[e-mail]>; KY Srinivasan <[e-mail]>;
> > [e-mail]; linux- [e-mail]; Long Li
> > <[e-mail]>; [e-mail]; Paolo Abeni
> > <[e-mail]>; Stephen Hemminger <[e-mail]>;
> Wei
> > Liu <[e-mail]>
> > Subject: [EXTERNAL] [PATCH rdma-next] RDMA/mana: Remove redefinition
> > of basic u64 type
> >
> > From: Leon Romanovsky <[e-mail]>
> >
> > gdma_obj_handle_t is no more than redefinition of basic
> > u64 type. Remove such obfuscation.
> >
> > Signed-off-by: Leon Romanovsky <[e-mail]>

Thank you.

Acked-by: Long Li <[e-mail]>

> > ---
> >  drivers/infiniband/hw/mana/mr.c               |  5 ++-
> >  .../net/ethernet/microsoft/mana/gdma_main.c   |  3 +-
> >  include/net/mana/gdma.h                       | 31 +++++++++----------
> >  3 files changed, 17 insertions(+), 22 deletions(-)
> >
> > diff --git a/drivers/infiniband/hw/mana/mr.c
> > b/drivers/infiniband/hw/mana/mr.c index a56236cdd9ee..351207c60eb6
> > 100644
> > --- a/drivers/infiniband/hw/mana/mr.c
> > +++ b/drivers/infiniband/hw/mana/mr.c
> > @@ -73,8 +73,7 @@ static int mana_ib_gd_create_mr(struct mana_ib_dev
> > *dev, struct mana_ib_mr *mr,
> >  	return 0;
> >  }
> >
> > -static int mana_ib_gd_destroy_mr(struct mana_ib_dev *dev,
> > -				 gdma_obj_handle_t mr_handle)
> > +static int mana_ib_gd_destroy_mr(struct mana_ib_dev *dev, u64
> > +mr_handle)
> >  {
> >  	struct gdma_destroy_mr_response resp = {};
> >  	struct gdma_destroy_mr_request req = {}; @@ -108,9 +107,9 @@
> struct
> > ib_mr *mana_ib_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length,
> >  	struct mana_ib_pd *pd = container_of(ibpd, struct mana_ib_pd, ibpd);
> >  	struct gdma_create_mr_params mr_params = {};
> >  	struct ib_device *ibdev = ibpd->device;
> > -	gdma_obj_handle_t dma_region_handle;
> >  	struct mana_ib_dev *dev;
> >  	struct mana_ib_mr *mr;
> > +	u64 dma_region_handle;
> >  	int err;
> >
> >  	dev = container_of(ibdev, struct mana_ib_dev, ib_dev); diff --git
> > a/drivers/net/ethernet/microsoft/mana/gdma_main.c
> > b/drivers/net/ethernet/microsoft/mana/gdma_main.c
> > index 46a7d1e6ece9..69224ff8efb6 100644
> > --- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
> > +++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
> > @@ -671,8 +671,7 @@ int mana_gd_create_hwc_queue(struct gdma_dev *gd,
> >  	return err;
> >  }
> >
> > -int mana_gd_destroy_dma_region(struct gdma_context *gc,
> > -			       gdma_obj_handle_t dma_region_handle)
> > +int mana_gd_destroy_dma_region(struct gdma_context *gc, u64
> > +dma_region_handle)
> >  {
> >  	struct gdma_destroy_dma_region_req req = {};
> >  	struct gdma_general_resp resp = {};
> > diff --git a/include/net/mana/gdma.h b/include/net/mana/gdma.h index
> > 221adc96340c..a9fdae14d24c 100644
> > --- a/include/net/mana/gdma.h
> > +++ b/include/net/mana/gdma.h
> > @@ -65,8 +65,6 @@ enum {
> >  	GDMA_DEVICE_MANA	= 2,
> >  };
> >
> > -typedef u64 gdma_obj_handle_t;
> > -
> >  struct gdma_resource {
> >  	/* Protect the bitmap */
> >  	spinlock_t lock;
> > @@ -200,7 +198,7 @@ struct gdma_mem_info {
> >  	u64 length;
> >
> >  	/* Allocated by the PF driver */
> > -	gdma_obj_handle_t dma_region_handle;
> > +	u64 dma_region_handle;
> >  };
> >
> >  #define REGISTER_ATB_MST_MKEY_LOWER_SIZE 8 @@ -624,7 +622,7 @@
> struct
> > gdma_create_queue_req {
> >  	u32 reserved1;
> >  	u32 pdid;
> >  	u32 doolbell_id;
> > -	gdma_obj_handle_t gdma_region;
> > +	u64 gdma_region;
> >  	u32 reserved2;
> >  	u32 queue_size;
> >  	u32 log2_throttle_limit;
> > @@ -699,14 +697,14 @@ struct gdma_create_dma_region_req {
> >
> >  struct gdma_create_dma_region_resp {
> >  	struct gdma_resp_hdr hdr;
> > -	gdma_obj_handle_t dma_region_handle;
> > +	u64 dma_region_handle;
> >  }; /* HW DATA */
> >
> >  /* GDMA_DMA_REGION_ADD_PAGES */
> >  struct gdma_dma_region_add_pages_req {
> >  	struct gdma_req_hdr hdr;
> >
> > -	gdma_obj_handle_t dma_region_handle;
> > +	u64 dma_region_handle;
> >
> >  	u32 page_addr_list_len;
> >  	u32 reserved3;
> > @@ -718,7 +716,7 @@ struct gdma_dma_region_add_pages_req {  struct
> > gdma_destroy_dma_region_req {
> >  	struct gdma_req_hdr hdr;
> >
> > -	gdma_obj_handle_t dma_region_handle;
> > +	u64 dma_region_handle;
> >  }; /* HW DATA */
> >
> >  enum gdma_pd_flags {
> > @@ -733,14 +731,14 @@ struct gdma_create_pd_req {
> >
> >  struct gdma_create_pd_resp {
> >  	struct gdma_resp_hdr hdr;
> > -	gdma_obj_handle_t pd_handle;
> > +	u64 pd_handle;
> >  	u32 pd_id;
> >  	u32 reserved;
> >  };/* HW DATA */
> >
> >  struct gdma_destroy_pd_req {
> >  	struct gdma_req_hdr hdr;
> > -	gdma_obj_handle_t pd_handle;
> > +	u64 pd_handle;
> >  };/* HW DATA */
> >
> >  struct gdma_destory_pd_resp {
> > @@ -756,11 +754,11 @@ enum gdma_mr_type {  };
> >
> >  struct gdma_create_mr_params {
> > -	gdma_obj_handle_t pd_handle;
> > +	u64 pd_handle;
> >  	enum gdma_mr_type mr_type;
> >  	union {
> >  		struct {
> > -			gdma_obj_handle_t dma_region_handle;
> > +			u64 dma_region_handle;
> >  			u64 virtual_address;
> >  			enum gdma_mr_access_flags access_flags;
> >  		} gva;
> > @@ -769,13 +767,13 @@ struct gdma_create_mr_params {
> >
> >  struct gdma_create_mr_request {
> >  	struct gdma_req_hdr hdr;
> > -	gdma_obj_handle_t pd_handle;
> > +	u64 pd_handle;
> >  	enum gdma_mr_type mr_type;
> >  	u32 reserved_1;
> >
> >  	union {
> >  		struct {
> > -			gdma_obj_handle_t dma_region_handle;
> > +			u64 dma_region_handle;
> >  			u64 virtual_address;
> >  			enum gdma_mr_access_flags access_flags;
> >  		} gva;
> > @@ -786,14 +784,14 @@ struct gdma_create_mr_request {
> >
> >  struct gdma_create_mr_response {
> >  	struct gdma_resp_hdr hdr;
> > -	gdma_obj_handle_t mr_handle;
> > +	u64 mr_handle;
> >  	u32 lkey;
> >  	u32 rkey;
> >  };/* HW DATA */
> >
> >  struct gdma_destroy_mr_request {
> >  	struct gdma_req_hdr hdr;
> > -	gdma_obj_handle_t mr_handle;
> > +	u64 mr_handle;
> >  };/* HW DATA */
> >
> >  struct gdma_destroy_mr_response {
> > @@ -827,7 +825,6 @@ void mana_gd_free_memory(struct gdma_mem_info
> > *gmi);  int mana_gd_send_request(struct gdma_context *gc, u32 req_len,
> > const void *req,
> >  			 u32 resp_len, void *resp);
> >
> > -int mana_gd_destroy_dma_region(struct gdma_context *gc,
> > -			       gdma_obj_handle_t dma_region_handle);
> > +int mana_gd_destroy_dma_region(struct gdma_context *gc, u64
> > +dma_region_handle);
> >
> >  #endif /* _GDMA_H */
> > --
> > 2.38.1

Leon Romanovsky Nov. 14, 2022, 8:19 a.m. UTC | #3

On Fri, 11 Nov 2022 11:55:29 +0200, Leon Romanovsky wrote:
> From: Leon Romanovsky <[e-mail]>
> 
> gdma_obj_handle_t is no more than redefinition of basic
> u64 type. Remove such obfuscation.
> 
> 

Applied, thanks!

[1/1] RDMA/mana: Remove redefinition of basic u64 type
      https://git.kernel.org/rdma/rdma/c/3574cfdca28543

Best regards,

Patch

diff --git a/drivers/infiniband/hw/mana/mr.c b/drivers/infiniband/hw/mana/mr.c
index a56236cdd9ee..351207c60eb6 100644
--- a/drivers/infiniband/hw/mana/mr.c
+++ b/drivers/infiniband/hw/mana/mr.c
@@ -73,8 +73,7 @@  static int mana_ib_gd_create_mr(struct mana_ib_dev *dev, struct mana_ib_mr *mr,
 	return 0;
 }
 
-static int mana_ib_gd_destroy_mr(struct mana_ib_dev *dev,
-				 gdma_obj_handle_t mr_handle)
+static int mana_ib_gd_destroy_mr(struct mana_ib_dev *dev, u64 mr_handle)
 {
 	struct gdma_destroy_mr_response resp = {};
 	struct gdma_destroy_mr_request req = {};
@@ -108,9 +107,9 @@  struct ib_mr *mana_ib_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length,
 	struct mana_ib_pd *pd = container_of(ibpd, struct mana_ib_pd, ibpd);
 	struct gdma_create_mr_params mr_params = {};
 	struct ib_device *ibdev = ibpd->device;
-	gdma_obj_handle_t dma_region_handle;
 	struct mana_ib_dev *dev;
 	struct mana_ib_mr *mr;
+	u64 dma_region_handle;
 	int err;
 
 	dev = container_of(ibdev, struct mana_ib_dev, ib_dev);
diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c
index 46a7d1e6ece9..69224ff8efb6 100644
--- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
+++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
@@ -671,8 +671,7 @@  int mana_gd_create_hwc_queue(struct gdma_dev *gd,
 	return err;
 }
 
-int mana_gd_destroy_dma_region(struct gdma_context *gc,
-			       gdma_obj_handle_t dma_region_handle)
+int mana_gd_destroy_dma_region(struct gdma_context *gc, u64 dma_region_handle)
 {
 	struct gdma_destroy_dma_region_req req = {};
 	struct gdma_general_resp resp = {};
diff --git a/include/net/mana/gdma.h b/include/net/mana/gdma.h
index 221adc96340c..a9fdae14d24c 100644
--- a/include/net/mana/gdma.h
+++ b/include/net/mana/gdma.h
@@ -65,8 +65,6 @@  enum {
 	GDMA_DEVICE_MANA	= 2,
 };
 
-typedef u64 gdma_obj_handle_t;
-
 struct gdma_resource {
 	/* Protect the bitmap */
 	spinlock_t lock;
@@ -200,7 +198,7 @@  struct gdma_mem_info {
 	u64 length;
 
 	/* Allocated by the PF driver */
-	gdma_obj_handle_t dma_region_handle;
+	u64 dma_region_handle;
 };
 
 #define REGISTER_ATB_MST_MKEY_LOWER_SIZE 8
@@ -624,7 +622,7 @@  struct gdma_create_queue_req {
 	u32 reserved1;
 	u32 pdid;
 	u32 doolbell_id;
-	gdma_obj_handle_t gdma_region;
+	u64 gdma_region;
 	u32 reserved2;
 	u32 queue_size;
 	u32 log2_throttle_limit;
@@ -699,14 +697,14 @@  struct gdma_create_dma_region_req {
 
 struct gdma_create_dma_region_resp {
 	struct gdma_resp_hdr hdr;
-	gdma_obj_handle_t dma_region_handle;
+	u64 dma_region_handle;
 }; /* HW DATA */
 
 /* GDMA_DMA_REGION_ADD_PAGES */
 struct gdma_dma_region_add_pages_req {
 	struct gdma_req_hdr hdr;
 
-	gdma_obj_handle_t dma_region_handle;
+	u64 dma_region_handle;
 
 	u32 page_addr_list_len;
 	u32 reserved3;
@@ -718,7 +716,7 @@  struct gdma_dma_region_add_pages_req {
 struct gdma_destroy_dma_region_req {
 	struct gdma_req_hdr hdr;
 
-	gdma_obj_handle_t dma_region_handle;
+	u64 dma_region_handle;
 }; /* HW DATA */
 
 enum gdma_pd_flags {
@@ -733,14 +731,14 @@  struct gdma_create_pd_req {
 
 struct gdma_create_pd_resp {
 	struct gdma_resp_hdr hdr;
-	gdma_obj_handle_t pd_handle;
+	u64 pd_handle;
 	u32 pd_id;
 	u32 reserved;
 };/* HW DATA */
 
 struct gdma_destroy_pd_req {
 	struct gdma_req_hdr hdr;
-	gdma_obj_handle_t pd_handle;
+	u64 pd_handle;
 };/* HW DATA */
 
 struct gdma_destory_pd_resp {
@@ -756,11 +754,11 @@  enum gdma_mr_type {
 };
 
 struct gdma_create_mr_params {
-	gdma_obj_handle_t pd_handle;
+	u64 pd_handle;
 	enum gdma_mr_type mr_type;
 	union {
 		struct {
-			gdma_obj_handle_t dma_region_handle;
+			u64 dma_region_handle;
 			u64 virtual_address;
 			enum gdma_mr_access_flags access_flags;
 		} gva;
@@ -769,13 +767,13 @@  struct gdma_create_mr_params {
 
 struct gdma_create_mr_request {
 	struct gdma_req_hdr hdr;
-	gdma_obj_handle_t pd_handle;
+	u64 pd_handle;
 	enum gdma_mr_type mr_type;
 	u32 reserved_1;
 
 	union {
 		struct {
-			gdma_obj_handle_t dma_region_handle;
+			u64 dma_region_handle;
 			u64 virtual_address;
 			enum gdma_mr_access_flags access_flags;
 		} gva;
@@ -786,14 +784,14 @@  struct gdma_create_mr_request {
 
 struct gdma_create_mr_response {
 	struct gdma_resp_hdr hdr;
-	gdma_obj_handle_t mr_handle;
+	u64 mr_handle;
 	u32 lkey;
 	u32 rkey;
 };/* HW DATA */
 
 struct gdma_destroy_mr_request {
 	struct gdma_req_hdr hdr;
-	gdma_obj_handle_t mr_handle;
+	u64 mr_handle;
 };/* HW DATA */
 
 struct gdma_destroy_mr_response {
@@ -827,7 +825,6 @@  void mana_gd_free_memory(struct gdma_mem_info *gmi);
 int mana_gd_send_request(struct gdma_context *gc, u32 req_len, const void *req,
 			 u32 resp_len, void *resp);
 
-int mana_gd_destroy_dma_region(struct gdma_context *gc,
-			       gdma_obj_handle_t dma_region_handle);
+int mana_gd_destroy_dma_region(struct gdma_context *gc, u64 dma_region_handle);
 
 #endif /* _GDMA_H */