Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4df9a7c authored by Parav Pandit's avatar Parav Pandit Committed by Jason Gunthorpe
Browse files

RDMA: Use GID from the ib_gid_attr during the add_gid() callback 



Now that ib_gid_attr contains the GID, make use of that in the add_gid()
callback functions for the provider drivers to simplify the add_gid()
implementations.

Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent b150c386

drivers/infiniband/core/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static int add_roce_gid(struct ib_gid_table_entry *entry) 
		return -EINVAL;

	}

	if (rdma_cap_roce_gid_table(attr->device, attr->port_num)) {

		ret = attr->device->add_gid(&attr->gid, attr, &entry->context);

		ret = attr->device->add_gid(attr, &entry->context);

		if (ret) {

			pr_err("%s GID add failed device=%s port=%d index=%d\n",

			       __func__, attr->device->name, attr->port_num,

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+2 −3
Original line number Diff line number Diff line
@@ -364,8 +364,7 @@ int bnxt_re_del_gid(const struct ib_gid_attr *attr, void **context) 
	return rc;

}



int bnxt_re_add_gid(const union ib_gid *gid,

		    const struct ib_gid_attr *attr, void **context)

int bnxt_re_add_gid(const struct ib_gid_attr *attr, void **context)

{

	int rc;

	u32 tbl_idx = 0;
@@ -377,7 +376,7 @@ int bnxt_re_add_gid(const union ib_gid *gid, 
	if ((attr->ndev) && is_vlan_dev(attr->ndev))

		vlan_id = vlan_dev_vlan_id(attr->ndev);



	rc = bnxt_qplib_add_sgid(sgid_tbl, (struct bnxt_qplib_gid *)gid,

	rc = bnxt_qplib_add_sgid(sgid_tbl, (struct bnxt_qplib_gid *)&attr->gid,

				 rdev->qplib_res.netdev->dev_addr,

				 vlan_id, true, &tbl_idx);

	if (rc == -EALREADY) {

drivers/infiniband/hw/bnxt_re/ib_verbs.h

+1 −2
Original line number Diff line number Diff line
@@ -158,8 +158,7 @@ void bnxt_re_query_fw_str(struct ib_device *ibdev, char *str); 
int bnxt_re_query_pkey(struct ib_device *ibdev, u8 port_num,

		       u16 index, u16 *pkey);

int bnxt_re_del_gid(const struct ib_gid_attr *attr, void **context);

int bnxt_re_add_gid(const union ib_gid *gid,

		    const struct ib_gid_attr *attr, void **context);

int bnxt_re_add_gid(const struct ib_gid_attr *attr, void **context);

int bnxt_re_query_gid(struct ib_device *ibdev, u8 port_num,

		      int index, union ib_gid *gid);

enum rdma_link_layer bnxt_re_get_link_layer(struct ib_device *ibdev,

drivers/infiniband/hw/hns/hns_roce_device.h

+1 −1
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ struct hns_roce_hw { 
			 u16 token, int event);

	int (*chk_mbox)(struct hns_roce_dev *hr_dev, unsigned long timeout);

	int (*set_gid)(struct hns_roce_dev *hr_dev, u8 port, int gid_index,

		       union ib_gid *gid, const struct ib_gid_attr *attr);

		       const union ib_gid *gid, const struct ib_gid_attr *attr);

	int (*set_mac)(struct hns_roce_dev *hr_dev, u8 phy_port, u8 *addr);

	void (*set_mtu)(struct hns_roce_dev *hr_dev, u8 phy_port,

			enum ib_mtu mtu);

drivers/infiniband/hw/hns/hns_roce_hw_v1.c

+1 −1
Original line number Diff line number Diff line
@@ -1728,7 +1728,7 @@ static int hns_roce_v1_chk_mbox(struct hns_roce_dev *hr_dev, 
}



static int hns_roce_v1_set_gid(struct hns_roce_dev *hr_dev, u8 port,

			       int gid_index, union ib_gid *gid,

			       int gid_index, const union ib_gid *gid,

			       const struct ib_gid_attr *attr)

{

	u32 *p = NULL;