Skip to content

Commit 8b184e4

Browse files
Konstantin Taranovrleon
authored andcommitted
RDMA/mana_ib: Enable RoCE on port 1
Set netdev and RoCEv2 flag to enable GID population on port 1. Use GIDs of the master netdev. As mc->ports[] stores slave devices, use a helper to get the master netdev. Signed-off-by: Konstantin Taranov <kotaranov@microsoft.com> Link: https://lore.kernel.org/r/1712738551-22075-5-git-send-email-kotaranov@linux.microsoft.com Signed-off-by: Leon Romanovsky <leon@kernel.org>
1 parent 4bda1d5 commit 8b184e4

File tree

2 files changed

+26
-4
lines changed

2 files changed

+26
-4
lines changed

drivers/infiniband/hw/mana/device.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ static int mana_ib_probe(struct auxiliary_device *adev,
5353
{
5454
struct mana_adev *madev = container_of(adev, struct mana_adev, adev);
5555
struct gdma_dev *mdev = madev->mdev;
56+
struct net_device *upper_ndev;
5657
struct mana_context *mc;
5758
struct mana_ib_dev *dev;
5859
int ret;
@@ -79,6 +80,20 @@ static int mana_ib_probe(struct auxiliary_device *adev,
7980
dev->ib_dev.num_comp_vectors = mdev->gdma_context->max_num_queues;
8081
dev->ib_dev.dev.parent = mdev->gdma_context->dev;
8182

83+
rcu_read_lock(); /* required to get upper dev */
84+
upper_ndev = netdev_master_upper_dev_get_rcu(mc->ports[0]);
85+
if (!upper_ndev) {
86+
rcu_read_unlock();
87+
ibdev_err(&dev->ib_dev, "Failed to get master netdev");
88+
goto free_ib_device;
89+
}
90+
ret = ib_device_set_netdev(&dev->ib_dev, upper_ndev, 1);
91+
rcu_read_unlock();
92+
if (ret) {
93+
ibdev_err(&dev->ib_dev, "Failed to set ib netdev, ret %d", ret);
94+
goto free_ib_device;
95+
}
96+
8297
ret = mana_gd_register_device(&mdev->gdma_context->mana_ib);
8398
if (ret) {
8499
ibdev_err(&dev->ib_dev, "Failed to register device, ret %d",

drivers/infiniband/hw/mana/main.c

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -525,11 +525,18 @@ int mana_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vma)
525525
int mana_ib_get_port_immutable(struct ib_device *ibdev, u32 port_num,
526526
struct ib_port_immutable *immutable)
527527
{
528-
/*
529-
* This version only support RAW_PACKET
530-
* other values need to be filled for other types
531-
*/
528+
struct ib_port_attr attr;
529+
int err;
530+
531+
err = ib_query_port(ibdev, port_num, &attr);
532+
if (err)
533+
return err;
534+
535+
immutable->pkey_tbl_len = attr.pkey_tbl_len;
536+
immutable->gid_tbl_len = attr.gid_tbl_len;
532537
immutable->core_cap_flags = RDMA_CORE_PORT_RAW_PACKET;
538+
if (port_num == 1)
539+
immutable->core_cap_flags |= RDMA_CORE_PORT_IBA_ROCE_UDP_ENCAP;
533540

534541
return 0;
535542
}

0 commit comments

Comments
 (0)