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

RDMA: Introduce and use rdma_device_to_ibdev() 



Introduce and use rdma_device_to_ibdev() API for those drivers which are
registering one sysfs group and also use in ib_core.

In subsequent patch, device->provider_ibdev one-to-one mapping is no
longer holds true during accessing sysfs entries.
Therefore, introduce an API rdma_device_to_ibdev() that provides such
information.

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 ea4baf7f

drivers/infiniband/core/device.c

+0 −2
Original line number Diff line number Diff line
@@ -296,8 +296,6 @@ struct ib_device *ib_alloc_device(size_t size) 
	device->dev.class = &ib_class;

	device_initialize(&device->dev);



	dev_set_drvdata(&device->dev, device);



	INIT_LIST_HEAD(&device->event_handler_list);

	spin_lock_init(&device->event_handler_lock);

	rwlock_init(&device->client_data_lock);

drivers/infiniband/core/sysfs.c

+6 −6
Original line number Diff line number Diff line
@@ -1187,7 +1187,7 @@ err_put: 
static ssize_t node_type_show(struct device *device,

			      struct device_attribute *attr, char *buf)

{

	struct ib_device *dev = container_of(device, struct ib_device, dev);

	struct ib_device *dev = rdma_device_to_ibdev(device);



	switch (dev->node_type) {

	case RDMA_NODE_IB_CA:	  return sprintf(buf, "%d: CA\n", dev->node_type);
@@ -1204,7 +1204,7 @@ static DEVICE_ATTR_RO(node_type); 
static ssize_t sys_image_guid_show(struct device *device,

				   struct device_attribute *dev_attr, char *buf)

{

	struct ib_device *dev = container_of(device, struct ib_device, dev);

	struct ib_device *dev = rdma_device_to_ibdev(device);



	return sprintf(buf, "%04x:%04x:%04x:%04x\n",

		       be16_to_cpu(((__be16 *) &dev->attrs.sys_image_guid)[0]),
@@ -1217,7 +1217,7 @@ static DEVICE_ATTR_RO(sys_image_guid); 
static ssize_t node_guid_show(struct device *device,

			      struct device_attribute *attr, char *buf)

{

	struct ib_device *dev = container_of(device, struct ib_device, dev);

	struct ib_device *dev = rdma_device_to_ibdev(device);



	return sprintf(buf, "%04x:%04x:%04x:%04x\n",

		       be16_to_cpu(((__be16 *) &dev->node_guid)[0]),
@@ -1230,7 +1230,7 @@ static DEVICE_ATTR_RO(node_guid); 
static ssize_t node_desc_show(struct device *device,

			      struct device_attribute *attr, char *buf)

{

	struct ib_device *dev = container_of(device, struct ib_device, dev);

	struct ib_device *dev = rdma_device_to_ibdev(device);



	return sprintf(buf, "%.64s\n", dev->node_desc);

}
@@ -1239,7 +1239,7 @@ static ssize_t node_desc_store(struct device *device, 
			       struct device_attribute *attr,

			       const char *buf, size_t count)

{

	struct ib_device *dev = container_of(device, struct ib_device, dev);

	struct ib_device *dev = rdma_device_to_ibdev(device);

	struct ib_device_modify desc = {};

	int ret;
@@ -1258,7 +1258,7 @@ static DEVICE_ATTR_RW(node_desc); 
static ssize_t fw_ver_show(struct device *device, struct device_attribute *attr,

			   char *buf)

{

	struct ib_device *dev = container_of(device, struct ib_device, dev);

	struct ib_device *dev = rdma_device_to_ibdev(device);



	ib_get_device_fw_str(dev, buf);

	strlcat(buf, "\n", IB_FW_VERSION_NAME_MAX);

drivers/infiniband/hw/bnxt_re/main.c

+4 −2
Original line number Diff line number Diff line
@@ -538,7 +538,8 @@ static struct bnxt_en_dev *bnxt_re_dev_probe(struct net_device *netdev) 
static ssize_t hw_rev_show(struct device *device, struct device_attribute *attr,

			   char *buf)

{

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(device, ibdev.dev);

	struct bnxt_re_dev *rdev =

		rdma_device_to_drv_device(device, struct bnxt_re_dev, ibdev);



	return scnprintf(buf, PAGE_SIZE, "0x%x\n", rdev->en_dev->pdev->vendor);

}
@@ -547,7 +548,8 @@ static DEVICE_ATTR_RO(hw_rev); 
static ssize_t hca_type_show(struct device *device,

			     struct device_attribute *attr, char *buf)

{

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(device, ibdev.dev);

	struct bnxt_re_dev *rdev =

		rdma_device_to_drv_device(device, struct bnxt_re_dev, ibdev);



	return scnprintf(buf, PAGE_SIZE, "%s\n", rdev->ibdev.node_desc);

}

drivers/infiniband/hw/cxgb3/iwch_provider.c

+8 −6
Original line number Diff line number Diff line
@@ -1130,8 +1130,9 @@ static int iwch_query_port(struct ib_device *ibdev, 
static ssize_t hw_rev_show(struct device *dev,

			   struct device_attribute *attr, char *buf)

{

	struct iwch_dev *iwch_dev = container_of(dev, struct iwch_dev,

						 ibdev.dev);

	struct iwch_dev *iwch_dev =

			rdma_device_to_drv_device(dev, struct iwch_dev, ibdev);



	pr_debug("%s dev 0x%p\n", __func__, dev);

	return sprintf(buf, "%d\n", iwch_dev->rdev.t3cdev_p->type);

}
@@ -1140,8 +1141,8 @@ static DEVICE_ATTR_RO(hw_rev); 
static ssize_t hca_type_show(struct device *dev,

			     struct device_attribute *attr, char *buf)

{

	struct iwch_dev *iwch_dev = container_of(dev, struct iwch_dev,

						 ibdev.dev);

	struct iwch_dev *iwch_dev =

			rdma_device_to_drv_device(dev, struct iwch_dev, ibdev);

	struct ethtool_drvinfo info;

	struct net_device *lldev = iwch_dev->rdev.t3cdev_p->lldev;
@@ -1154,8 +1155,9 @@ static DEVICE_ATTR_RO(hca_type); 
static ssize_t board_id_show(struct device *dev,

			     struct device_attribute *attr, char *buf)

{

	struct iwch_dev *iwch_dev = container_of(dev, struct iwch_dev,

						 ibdev.dev);

	struct iwch_dev *iwch_dev =

			rdma_device_to_drv_device(dev, struct iwch_dev, ibdev);



	pr_debug("%s dev 0x%p\n", __func__, dev);

	return sprintf(buf, "%x.%x\n", iwch_dev->rdev.rnic_info.pdev->vendor,

		       iwch_dev->rdev.rnic_info.pdev->device);

drivers/infiniband/hw/cxgb4/provider.c

+8 −6
Original line number Diff line number Diff line
@@ -376,8 +376,9 @@ static int c4iw_query_port(struct ib_device *ibdev, u8 port, 
static ssize_t hw_rev_show(struct device *dev,

			   struct device_attribute *attr, char *buf)

{

	struct c4iw_dev *c4iw_dev = container_of(dev, struct c4iw_dev,

						 ibdev.dev);

	struct c4iw_dev *c4iw_dev =

			rdma_device_to_drv_device(dev, struct c4iw_dev, ibdev);



	pr_debug("dev 0x%p\n", dev);

	return sprintf(buf, "%d\n",

		       CHELSIO_CHIP_RELEASE(c4iw_dev->rdev.lldi.adapter_type));
@@ -387,8 +388,8 @@ static DEVICE_ATTR_RO(hw_rev); 
static ssize_t hca_type_show(struct device *dev,

			     struct device_attribute *attr, char *buf)

{

	struct c4iw_dev *c4iw_dev = container_of(dev, struct c4iw_dev,

						 ibdev.dev);

	struct c4iw_dev *c4iw_dev =

			rdma_device_to_drv_device(dev, struct c4iw_dev, ibdev);

	struct ethtool_drvinfo info;

	struct net_device *lldev = c4iw_dev->rdev.lldi.ports[0];
@@ -401,8 +402,9 @@ static DEVICE_ATTR_RO(hca_type); 
static ssize_t board_id_show(struct device *dev, struct device_attribute *attr,

			     char *buf)

{

	struct c4iw_dev *c4iw_dev = container_of(dev, struct c4iw_dev,

						 ibdev.dev);

	struct c4iw_dev *c4iw_dev =

			rdma_device_to_drv_device(dev, struct c4iw_dev, ibdev);



	pr_debug("dev 0x%p\n", dev);

	return sprintf(buf, "%x.%x\n", c4iw_dev->rdev.lldi.pdev->vendor,

		       c4iw_dev->rdev.lldi.pdev->device);

CRA Git | Maintained and supported by SUSTech CRA and CCSE