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

Commit 15453e85 authored by Ira Weiny's avatar Ira Weiny Committed by Doug Ledford
Browse files

IB/usnic: Support device FW version string 



And remove sysfs file in favor of the common core.

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent bd395005

drivers/infiniband/hw/usnic/usnic_ib_main.c

+16 −0
Original line number Diff line number Diff line
@@ -331,6 +331,21 @@ static int usnic_port_immutable(struct ib_device *ibdev, u8 port_num, 
	return 0;

}



static void usnic_get_dev_fw_str(struct ib_device *device,

				 char *str,

				 size_t str_len)

{

	struct usnic_ib_dev *us_ibdev =

		container_of(device, struct usnic_ib_dev, ib_dev);

	struct ethtool_drvinfo info;



	mutex_lock(&us_ibdev->usdev_lock);

	us_ibdev->netdev->ethtool_ops->get_drvinfo(us_ibdev->netdev, &info);

	mutex_unlock(&us_ibdev->usdev_lock);



	snprintf(str, str_len, "%s", info.fw_version);

}



/* Start of PF discovery section */

static void *usnic_ib_device_add(struct pci_dev *dev)

{
@@ -414,6 +429,7 @@ static void *usnic_ib_device_add(struct pci_dev *dev) 
	us_ibdev->ib_dev.req_notify_cq = usnic_ib_req_notify_cq;

	us_ibdev->ib_dev.get_dma_mr = usnic_ib_get_dma_mr;

	us_ibdev->ib_dev.get_port_immutable = usnic_port_immutable;

	us_ibdev->ib_dev.get_dev_fw_str     = usnic_get_dev_fw_str;





	if (ib_register_device(&us_ibdev->ib_dev, NULL))

drivers/infiniband/hw/usnic/usnic_ib_sysfs.c

+0 −17
Original line number Diff line number Diff line
@@ -45,21 +45,6 @@ 
#include "usnic_ib_verbs.h"

#include "usnic_log.h"



static ssize_t usnic_ib_show_fw_ver(struct device *device,

					struct device_attribute *attr,

					char *buf)

{

	struct usnic_ib_dev *us_ibdev =

		container_of(device, struct usnic_ib_dev, ib_dev.dev);

	struct ethtool_drvinfo info;



	mutex_lock(&us_ibdev->usdev_lock);

	us_ibdev->netdev->ethtool_ops->get_drvinfo(us_ibdev->netdev, &info);

	mutex_unlock(&us_ibdev->usdev_lock);



	return scnprintf(buf, PAGE_SIZE, "%s\n", info.fw_version);

}



static ssize_t usnic_ib_show_board(struct device *device,

					struct device_attribute *attr,

					char *buf)
@@ -192,7 +177,6 @@ usnic_ib_show_cq_per_vf(struct device *device, struct device_attribute *attr, 
			us_ibdev->vf_res_cnt[USNIC_VNIC_RES_TYPE_CQ]);

}



static DEVICE_ATTR(fw_ver, S_IRUGO, usnic_ib_show_fw_ver, NULL);

static DEVICE_ATTR(board_id, S_IRUGO, usnic_ib_show_board, NULL);

static DEVICE_ATTR(config, S_IRUGO, usnic_ib_show_config, NULL);

static DEVICE_ATTR(iface, S_IRUGO, usnic_ib_show_iface, NULL);
@@ -201,7 +185,6 @@ static DEVICE_ATTR(qp_per_vf, S_IRUGO, usnic_ib_show_qp_per_vf, NULL); 
static DEVICE_ATTR(cq_per_vf, S_IRUGO, usnic_ib_show_cq_per_vf, NULL);



static struct device_attribute *usnic_class_attributes[] = {

	&dev_attr_fw_ver,

	&dev_attr_board_id,

	&dev_attr_config,

	&dev_attr_iface,