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

Commit a31a2a3b authored by Adit Ranadive's avatar Adit Ranadive Committed by Doug Ledford
Browse files

RDMA/vmw_pvrdma: Update device query parameters and port caps 



Added support for two device caps - max_sge_rd, max_fast_reg_page_list_len
and the IP_BASED_GIDS port cap flag.

Reviewed-by: default avatarJorgen Hansen <jhansen@vmware.com>
Reviewed-by: default avatarBryan Tan <bryantan@vmware.com>
Reviewed-by: default avatarAditya Sarwade <asarwade@vmware.com>
Signed-off-by: default avatarAdit Ranadive <aditr@vmware.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 05297b66

drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h

+8 −1
Original line number Diff line number Diff line
@@ -149,6 +149,13 @@ 
	((_dev->dsr->caps.mode == PVRDMA_DEVICE_MODE_ROCE) &&		\

	 (PVRDMA_IS_VERSION17(_dev) || PVRDMA_IS_VERSION18(_dev)))



/*

 * Get capability values based on device version.

 */



#define PVRDMA_GET_CAP(_dev, _old_val, _val) \

	((PVRDMA_IS_VERSION18(_dev)) ? _val : _old_val)



enum pvrdma_pci_resource {

	PVRDMA_PCI_RESOURCE_MSIX,	/* BAR0: MSI-X, MMIO. */

	PVRDMA_PCI_RESOURCE_REG,	/* BAR1: Registers, MMIO. */
@@ -251,7 +258,7 @@ struct pvrdma_device_caps { 
	u8  atomic_ops;				/* PVRDMA_ATOMIC_OP_* bits */

	u8  bmme_flags;				/* FRWR Mem Mgmt Extensions */

	u8  gid_types;				/* PVRDMA_GID_TYPE_FLAG_ */

	u8  reserved[4];

	u32 max_fast_reg_page_list_len;

};



struct pvrdma_ring_page_info {

drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c

+9 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ int pvrdma_query_device(struct ib_device *ibdev, 
	props->max_qp_wr = dev->dsr->caps.max_qp_wr;

	props->device_cap_flags = dev->dsr->caps.device_cap_flags;

	props->max_sge = dev->dsr->caps.max_sge;

	props->max_sge_rd = PVRDMA_GET_CAP(dev, dev->dsr->caps.max_sge,

					   dev->dsr->caps.max_sge_rd);

	props->max_cq = dev->dsr->caps.max_cq;

	props->max_cqe = dev->dsr->caps.max_cqe;

	props->max_mr = dev->dsr->caps.max_mr;
@@ -101,8 +103,14 @@ int pvrdma_query_device(struct ib_device *ibdev, 
	    (dev->dsr->caps.bmme_flags & PVRDMA_BMME_FLAG_REMOTE_INV) &&

	    (dev->dsr->caps.bmme_flags & PVRDMA_BMME_FLAG_FAST_REG_WR)) {

		props->device_cap_flags |= IB_DEVICE_MEM_MGT_EXTENSIONS;

		props->max_fast_reg_page_list_len = PVRDMA_GET_CAP(dev,

				PVRDMA_MAX_FAST_REG_PAGES,

				dev->dsr->caps.max_fast_reg_page_list_len);

	}



	props->device_cap_flags |= IB_DEVICE_PORT_ACTIVE_EVENT |

				   IB_DEVICE_RC_RNR_NAK_GEN;



	return 0;

}
@@ -143,6 +151,7 @@ int pvrdma_query_port(struct ib_device *ibdev, u8 port, 
	props->gid_tbl_len = resp->attrs.gid_tbl_len;

	props->port_cap_flags =

		pvrdma_port_cap_flags_to_ib(resp->attrs.port_cap_flags);

	props->port_cap_flags |= IB_PORT_CM_SUP | IB_PORT_IP_BASED_GIDS;

	props->max_msg_sz = resp->attrs.max_msg_sz;

	props->bad_pkey_cntr = resp->attrs.bad_pkey_cntr;

	props->qkey_viol_cntr = resp->attrs.qkey_viol_cntr;