Commit 3574cfdc authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Leon Romanovsky

RDMA/mana: Remove redefinition of basic u64 type

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

Link: https://lore.kernel.org/r/3c1e821279e6a165d058655d2343722d6650e776.1668160486.git.leonro@nvidia.comAcked-by: default avatarLong Li <longli@microsoft.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
parent 0266a177
...@@ -73,8 +73,7 @@ static int mana_ib_gd_create_mr(struct mana_ib_dev *dev, struct mana_ib_mr *mr, ...@@ -73,8 +73,7 @@ static int mana_ib_gd_create_mr(struct mana_ib_dev *dev, struct mana_ib_mr *mr,
return 0; return 0;
} }
static int mana_ib_gd_destroy_mr(struct mana_ib_dev *dev, static int mana_ib_gd_destroy_mr(struct mana_ib_dev *dev, u64 mr_handle)
gdma_obj_handle_t mr_handle)
{ {
struct gdma_destroy_mr_response resp = {}; struct gdma_destroy_mr_response resp = {};
struct gdma_destroy_mr_request req = {}; 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, ...@@ -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 mana_ib_pd *pd = container_of(ibpd, struct mana_ib_pd, ibpd);
struct gdma_create_mr_params mr_params = {}; struct gdma_create_mr_params mr_params = {};
struct ib_device *ibdev = ibpd->device; struct ib_device *ibdev = ibpd->device;
gdma_obj_handle_t dma_region_handle;
struct mana_ib_dev *dev; struct mana_ib_dev *dev;
struct mana_ib_mr *mr; struct mana_ib_mr *mr;
u64 dma_region_handle;
int err; int err;
dev = container_of(ibdev, struct mana_ib_dev, ib_dev); dev = container_of(ibdev, struct mana_ib_dev, ib_dev);
......
...@@ -671,8 +671,7 @@ int mana_gd_create_hwc_queue(struct gdma_dev *gd, ...@@ -671,8 +671,7 @@ int mana_gd_create_hwc_queue(struct gdma_dev *gd,
return err; return err;
} }
int mana_gd_destroy_dma_region(struct gdma_context *gc, int mana_gd_destroy_dma_region(struct gdma_context *gc, u64 dma_region_handle)
gdma_obj_handle_t dma_region_handle)
{ {
struct gdma_destroy_dma_region_req req = {}; struct gdma_destroy_dma_region_req req = {};
struct gdma_general_resp resp = {}; struct gdma_general_resp resp = {};
......
...@@ -65,8 +65,6 @@ enum { ...@@ -65,8 +65,6 @@ enum {
GDMA_DEVICE_MANA = 2, GDMA_DEVICE_MANA = 2,
}; };
typedef u64 gdma_obj_handle_t;
struct gdma_resource { struct gdma_resource {
/* Protect the bitmap */ /* Protect the bitmap */
spinlock_t lock; spinlock_t lock;
...@@ -200,7 +198,7 @@ struct gdma_mem_info { ...@@ -200,7 +198,7 @@ struct gdma_mem_info {
u64 length; u64 length;
/* Allocated by the PF driver */ /* Allocated by the PF driver */
gdma_obj_handle_t dma_region_handle; u64 dma_region_handle;
}; };
#define REGISTER_ATB_MST_MKEY_LOWER_SIZE 8 #define REGISTER_ATB_MST_MKEY_LOWER_SIZE 8
...@@ -624,7 +622,7 @@ struct gdma_create_queue_req { ...@@ -624,7 +622,7 @@ struct gdma_create_queue_req {
u32 reserved1; u32 reserved1;
u32 pdid; u32 pdid;
u32 doolbell_id; u32 doolbell_id;
gdma_obj_handle_t gdma_region; u64 gdma_region;
u32 reserved2; u32 reserved2;
u32 queue_size; u32 queue_size;
u32 log2_throttle_limit; u32 log2_throttle_limit;
...@@ -699,14 +697,14 @@ struct gdma_create_dma_region_req { ...@@ -699,14 +697,14 @@ struct gdma_create_dma_region_req {
struct gdma_create_dma_region_resp { struct gdma_create_dma_region_resp {
struct gdma_resp_hdr hdr; struct gdma_resp_hdr hdr;
gdma_obj_handle_t dma_region_handle; u64 dma_region_handle;
}; /* HW DATA */ }; /* HW DATA */
/* GDMA_DMA_REGION_ADD_PAGES */ /* GDMA_DMA_REGION_ADD_PAGES */
struct gdma_dma_region_add_pages_req { struct gdma_dma_region_add_pages_req {
struct gdma_req_hdr hdr; struct gdma_req_hdr hdr;
gdma_obj_handle_t dma_region_handle; u64 dma_region_handle;
u32 page_addr_list_len; u32 page_addr_list_len;
u32 reserved3; u32 reserved3;
...@@ -718,7 +716,7 @@ struct gdma_dma_region_add_pages_req { ...@@ -718,7 +716,7 @@ struct gdma_dma_region_add_pages_req {
struct gdma_destroy_dma_region_req { struct gdma_destroy_dma_region_req {
struct gdma_req_hdr hdr; struct gdma_req_hdr hdr;
gdma_obj_handle_t dma_region_handle; u64 dma_region_handle;
}; /* HW DATA */ }; /* HW DATA */
enum gdma_pd_flags { enum gdma_pd_flags {
...@@ -733,14 +731,14 @@ struct gdma_create_pd_req { ...@@ -733,14 +731,14 @@ struct gdma_create_pd_req {
struct gdma_create_pd_resp { struct gdma_create_pd_resp {
struct gdma_resp_hdr hdr; struct gdma_resp_hdr hdr;
gdma_obj_handle_t pd_handle; u64 pd_handle;
u32 pd_id; u32 pd_id;
u32 reserved; u32 reserved;
};/* HW DATA */ };/* HW DATA */
struct gdma_destroy_pd_req { struct gdma_destroy_pd_req {
struct gdma_req_hdr hdr; struct gdma_req_hdr hdr;
gdma_obj_handle_t pd_handle; u64 pd_handle;
};/* HW DATA */ };/* HW DATA */
struct gdma_destory_pd_resp { struct gdma_destory_pd_resp {
...@@ -756,11 +754,11 @@ enum gdma_mr_type { ...@@ -756,11 +754,11 @@ enum gdma_mr_type {
}; };
struct gdma_create_mr_params { struct gdma_create_mr_params {
gdma_obj_handle_t pd_handle; u64 pd_handle;
enum gdma_mr_type mr_type; enum gdma_mr_type mr_type;
union { union {
struct { struct {
gdma_obj_handle_t dma_region_handle; u64 dma_region_handle;
u64 virtual_address; u64 virtual_address;
enum gdma_mr_access_flags access_flags; enum gdma_mr_access_flags access_flags;
} gva; } gva;
...@@ -769,13 +767,13 @@ struct gdma_create_mr_params { ...@@ -769,13 +767,13 @@ struct gdma_create_mr_params {
struct gdma_create_mr_request { struct gdma_create_mr_request {
struct gdma_req_hdr hdr; struct gdma_req_hdr hdr;
gdma_obj_handle_t pd_handle; u64 pd_handle;
enum gdma_mr_type mr_type; enum gdma_mr_type mr_type;
u32 reserved_1; u32 reserved_1;
union { union {
struct { struct {
gdma_obj_handle_t dma_region_handle; u64 dma_region_handle;
u64 virtual_address; u64 virtual_address;
enum gdma_mr_access_flags access_flags; enum gdma_mr_access_flags access_flags;
} gva; } gva;
...@@ -786,14 +784,14 @@ struct gdma_create_mr_request { ...@@ -786,14 +784,14 @@ struct gdma_create_mr_request {
struct gdma_create_mr_response { struct gdma_create_mr_response {
struct gdma_resp_hdr hdr; struct gdma_resp_hdr hdr;
gdma_obj_handle_t mr_handle; u64 mr_handle;
u32 lkey; u32 lkey;
u32 rkey; u32 rkey;
};/* HW DATA */ };/* HW DATA */
struct gdma_destroy_mr_request { struct gdma_destroy_mr_request {
struct gdma_req_hdr hdr; struct gdma_req_hdr hdr;
gdma_obj_handle_t mr_handle; u64 mr_handle;
};/* HW DATA */ };/* HW DATA */
struct gdma_destroy_mr_response { struct gdma_destroy_mr_response {
...@@ -827,7 +825,6 @@ void mana_gd_free_memory(struct gdma_mem_info *gmi); ...@@ -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, int mana_gd_send_request(struct gdma_context *gc, u32 req_len, const void *req,
u32 resp_len, void *resp); u32 resp_len, void *resp);
int mana_gd_destroy_dma_region(struct gdma_context *gc, int mana_gd_destroy_dma_region(struct gdma_context *gc, u64 dma_region_handle);
gdma_obj_handle_t dma_region_handle);
#endif /* _GDMA_H */ #endif /* _GDMA_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment