Skip to content

Commit 1a79c2b

Browse files
Konstantin Taranovrleon
authored andcommitted
RDMA/mana_ib: Create and destroy rnic adapter
Add functions for RNIC creation and destruction. If creation fails, the ib_probe fails as well. Signed-off-by: Konstantin Taranov <kotaranov@microsoft.com> Link: https://lore.kernel.org/r/1712738551-22075-3-git-send-email-kotaranov@linux.microsoft.com Signed-off-by: Leon Romanovsky <leon@kernel.org>
1 parent 98b889c commit 1a79c2b

File tree

3 files changed

+79
-1
lines changed

3 files changed

+79
-1
lines changed

drivers/infiniband/hw/mana/device.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,21 @@ static int mana_ib_probe(struct auxiliary_device *adev,
9898
goto deregister_device;
9999
}
100100

101+
ret = mana_ib_gd_create_rnic_adapter(dev);
102+
if (ret)
103+
goto destroy_eqs;
104+
101105
ret = ib_register_device(&dev->ib_dev, "mana_%d",
102106
mdev->gdma_context->dev);
103107
if (ret)
104-
goto destroy_eqs;
108+
goto destroy_rnic;
105109

106110
dev_set_drvdata(&adev->dev, dev);
107111

108112
return 0;
109113

114+
destroy_rnic:
115+
mana_ib_gd_destroy_rnic_adapter(dev);
110116
destroy_eqs:
111117
mana_ib_destroy_eqs(dev);
112118
deregister_device:
@@ -121,6 +127,7 @@ static void mana_ib_remove(struct auxiliary_device *adev)
121127
struct mana_ib_dev *dev = dev_get_drvdata(&adev->dev);
122128

123129
ib_unregister_device(&dev->ib_dev);
130+
mana_ib_gd_destroy_rnic_adapter(dev);
124131
mana_ib_destroy_eqs(dev);
125132
mana_gd_deregister_device(dev->gdma_dev);
126133
ib_dealloc_device(&dev->ib_dev);

drivers/infiniband/hw/mana/main.c

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -637,3 +637,46 @@ void mana_ib_destroy_eqs(struct mana_ib_dev *mdev)
637637
{
638638
mana_gd_destroy_queue(mdev_to_gc(mdev), mdev->fatal_err_eq);
639639
}
640+
641+
int mana_ib_gd_create_rnic_adapter(struct mana_ib_dev *mdev)
642+
{
643+
struct mana_rnic_create_adapter_resp resp = {};
644+
struct mana_rnic_create_adapter_req req = {};
645+
struct gdma_context *gc = mdev_to_gc(mdev);
646+
int err;
647+
648+
mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_ADAPTER, sizeof(req), sizeof(resp));
649+
req.hdr.req.msg_version = GDMA_MESSAGE_V2;
650+
req.hdr.dev_id = gc->mana_ib.dev_id;
651+
req.notify_eq_id = mdev->fatal_err_eq->id;
652+
653+
err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
654+
if (err) {
655+
ibdev_err(&mdev->ib_dev, "Failed to create RNIC adapter err %d", err);
656+
return err;
657+
}
658+
mdev->adapter_handle = resp.adapter;
659+
660+
return 0;
661+
}
662+
663+
int mana_ib_gd_destroy_rnic_adapter(struct mana_ib_dev *mdev)
664+
{
665+
struct mana_rnic_destroy_adapter_resp resp = {};
666+
struct mana_rnic_destroy_adapter_req req = {};
667+
struct gdma_context *gc;
668+
int err;
669+
670+
gc = mdev_to_gc(mdev);
671+
mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_ADAPTER, sizeof(req), sizeof(resp));
672+
req.hdr.dev_id = gc->mana_ib.dev_id;
673+
req.adapter = mdev->adapter_handle;
674+
675+
err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
676+
if (err) {
677+
ibdev_err(&mdev->ib_dev, "Failed to destroy RNIC adapter err %d", err);
678+
return err;
679+
}
680+
681+
return 0;
682+
}

drivers/infiniband/hw/mana/mana_ib.h

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ struct mana_ib_queue {
5454
struct mana_ib_dev {
5555
struct ib_device ib_dev;
5656
struct gdma_dev *gdma_dev;
57+
mana_handle_t adapter_handle;
5758
struct gdma_queue *fatal_err_eq;
5859
struct mana_ib_adapter_caps adapter_caps;
5960
};
@@ -113,6 +114,8 @@ struct mana_ib_rwq_ind_table {
113114

114115
enum mana_ib_command_code {
115116
MANA_IB_GET_ADAPTER_CAP = 0x30001,
117+
MANA_IB_CREATE_ADAPTER = 0x30002,
118+
MANA_IB_DESTROY_ADAPTER = 0x30003,
116119
};
117120

118121
struct mana_ib_query_adapter_caps_req {
@@ -141,6 +144,27 @@ struct mana_ib_query_adapter_caps_resp {
141144
u32 max_inline_data_size;
142145
}; /* HW Data */
143146

147+
struct mana_rnic_create_adapter_req {
148+
struct gdma_req_hdr hdr;
149+
u32 notify_eq_id;
150+
u32 reserved;
151+
u64 feature_flags;
152+
}; /*HW Data */
153+
154+
struct mana_rnic_create_adapter_resp {
155+
struct gdma_resp_hdr hdr;
156+
mana_handle_t adapter;
157+
}; /* HW Data */
158+
159+
struct mana_rnic_destroy_adapter_req {
160+
struct gdma_req_hdr hdr;
161+
mana_handle_t adapter;
162+
}; /*HW Data */
163+
164+
struct mana_rnic_destroy_adapter_resp {
165+
struct gdma_resp_hdr hdr;
166+
}; /* HW Data */
167+
144168
static inline struct gdma_context *mdev_to_gc(struct mana_ib_dev *mdev)
145169
{
146170
return mdev->gdma_dev->gdma_context;
@@ -238,4 +262,8 @@ int mana_ib_gd_query_adapter_caps(struct mana_ib_dev *mdev);
238262
int mana_ib_create_eqs(struct mana_ib_dev *mdev);
239263

240264
void mana_ib_destroy_eqs(struct mana_ib_dev *mdev);
265+
266+
int mana_ib_gd_create_rnic_adapter(struct mana_ib_dev *mdev);
267+
268+
int mana_ib_gd_destroy_rnic_adapter(struct mana_ib_dev *mdev);
241269
#endif

0 commit comments

Comments
 (0)