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

Commit e3670b81 authored by Guenter Roeck's avatar Guenter Roeck Committed by Jeff Kirsher
Browse files

igb: Convert to use devm_hwmon_device_register_with_groups 



Simplify the code. Attach hwmon sysfs attributes to hwmon device
instead of pci device. Avoid race conditions caused by attributes
being created after registration and provide mandatory 'name'
attribute by using new hwmon API.

Other cleanup:

Instead of allocating memory for hwmon attributes, move attributes
and all other hwmon related data into struct hwmon_buff and allocate
the entire structure using devm_kzalloc.

Check return value from calls to igb_add_hwmon_attr() one by one instead
of logically combining them all together.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 56cec249

drivers/net/ethernet/intel/igb/igb.h

+5 −3
Original line number Original line Diff line number Diff line
@@ -337,8 +337,10 @@ struct hwmon_attr { 
	};

	};





struct hwmon_buff {

struct hwmon_buff {

	struct device *device;

	struct attribute_group group;

	struct hwmon_attr *hwmon_list;

	const struct attribute_group *groups[2];

	struct attribute *attrs[E1000_MAX_SENSORS * 4 + 1];

	struct hwmon_attr hwmon_list[E1000_MAX_SENSORS * 4];

	unsigned int n_hwmon;

	unsigned int n_hwmon;

	};

	};

#endif

#endif
@@ -440,7 +442,7 @@ struct igb_adapter { 




	char fw_version[32];

	char fw_version[32];

#ifdef CONFIG_IGB_HWMON

#ifdef CONFIG_IGB_HWMON

	struct hwmon_buff igb_hwmon_buff;

	struct hwmon_buff *igb_hwmon_buff;

	bool ets;

	bool ets;

#endif

#endif

	struct i2c_algo_bit_data i2c_algo;

	struct i2c_algo_bit_data i2c_algo;

drivers/net/ethernet/intel/igb/igb_hwmon.c

+48 −52
Original line number Original line Diff line number Diff line
@@ -117,8 +117,8 @@ static int igb_add_hwmon_attr(struct igb_adapter *adapter, 
	unsigned int n_attr;

	unsigned int n_attr;

	struct hwmon_attr *igb_attr;

	struct hwmon_attr *igb_attr;





	n_attr = adapter->igb_hwmon_buff.n_hwmon;

	n_attr = adapter->igb_hwmon_buff->n_hwmon;

	igb_attr = &adapter->igb_hwmon_buff.hwmon_list[n_attr];

	igb_attr = &adapter->igb_hwmon_buff->hwmon_list[n_attr];





	switch (type) {

	switch (type) {

	case IGB_HWMON_TYPE_LOC:

	case IGB_HWMON_TYPE_LOC:
@@ -154,30 +154,16 @@ static int igb_add_hwmon_attr(struct igb_adapter *adapter, 
	igb_attr->dev_attr.attr.mode = S_IRUGO;

	igb_attr->dev_attr.attr.mode = S_IRUGO;

	igb_attr->dev_attr.attr.name = igb_attr->name;

	igb_attr->dev_attr.attr.name = igb_attr->name;

	sysfs_attr_init(&igb_attr->dev_attr.attr);

	sysfs_attr_init(&igb_attr->dev_attr.attr);

	rc = device_create_file(&adapter->pdev->dev,

				&igb_attr->dev_attr);

	if (rc == 0)

		++adapter->igb_hwmon_buff.n_hwmon;





	return rc;

	adapter->igb_hwmon_buff->attrs[n_attr] = &igb_attr->dev_attr.attr;

}



static void igb_sysfs_del_adapter(struct igb_adapter *adapter)

{

	int i;





	if (adapter == NULL)

	++adapter->igb_hwmon_buff->n_hwmon;

		return;





	for (i = 0; i < adapter->igb_hwmon_buff.n_hwmon; i++) {

	return 0;

		device_remove_file(&adapter->pdev->dev,

			   &adapter->igb_hwmon_buff.hwmon_list[i].dev_attr);

}

}





	kfree(adapter->igb_hwmon_buff.hwmon_list);

static void igb_sysfs_del_adapter(struct igb_adapter *adapter)



{

	if (adapter->igb_hwmon_buff.device)

		hwmon_device_unregister(adapter->igb_hwmon_buff.device);

}

}





/* called from igb_main.c */

/* called from igb_main.c */
@@ -189,11 +175,11 @@ void igb_sysfs_exit(struct igb_adapter *adapter) 
/* called from igb_main.c */

/* called from igb_main.c */

int igb_sysfs_init(struct igb_adapter *adapter)

int igb_sysfs_init(struct igb_adapter *adapter)

{

{

	struct hwmon_buff *igb_hwmon = &adapter->igb_hwmon_buff;

	struct hwmon_buff *igb_hwmon;

	struct i2c_client *client;

	struct device *hwmon_dev;

	unsigned int i;

	unsigned int i;

	int n_attrs;

	int rc = 0;

	int rc = 0;

	struct i2c_client *client = NULL;





	/* If this method isn't defined we don't support thermals */

	/* If this method isn't defined we don't support thermals */

	if (adapter->hw.mac.ops.init_thermal_sensor_thresh == NULL)

	if (adapter->hw.mac.ops.init_thermal_sensor_thresh == NULL)
@@ -204,31 +190,13 @@ int igb_sysfs_init(struct igb_adapter *adapter) 
	if (rc)

	if (rc)

		goto exit;

		goto exit;





	/* init i2c_client */

	igb_hwmon = devm_kzalloc(&adapter->pdev->dev, sizeof(*igb_hwmon),

	client = i2c_new_device(&adapter->i2c_adap, &i350_sensor_info);

	if (client == NULL) {

		dev_info(&adapter->pdev->dev,

			"Failed to create new i2c device..\n");

		goto exit;

	}

	adapter->i2c_client = client;



	/* Allocation space for max attributes

	 * max num sensors * values (loc, temp, max, caution)

	 */

	n_attrs = E1000_MAX_SENSORS * 4;

	igb_hwmon->hwmon_list = kcalloc(n_attrs, sizeof(struct hwmon_attr),

				 GFP_KERNEL);

				 GFP_KERNEL);

	if (!igb_hwmon->hwmon_list) {

	if (!igb_hwmon) {

		rc = -ENOMEM;

		rc = -ENOMEM;

		goto err;

		goto exit;

	}



	igb_hwmon->device = hwmon_device_register(&adapter->pdev->dev);

	if (IS_ERR(igb_hwmon->device)) {

		rc = PTR_ERR(igb_hwmon->device);

		goto err;

	}

	}

	adapter->igb_hwmon_buff = igb_hwmon;





	for (i = 0; i < E1000_MAX_SENSORS; i++) {

	for (i = 0; i < E1000_MAX_SENSORS; i++) {
@@ -240,10 +208,38 @@ int igb_sysfs_init(struct igb_adapter *adapter) 




		/* Bail if any hwmon attr struct fails to initialize */

		/* Bail if any hwmon attr struct fails to initialize */

		rc = igb_add_hwmon_attr(adapter, i, IGB_HWMON_TYPE_CAUTION);

		rc = igb_add_hwmon_attr(adapter, i, IGB_HWMON_TYPE_CAUTION);

		rc |= igb_add_hwmon_attr(adapter, i, IGB_HWMON_TYPE_LOC);

		rc |= igb_add_hwmon_attr(adapter, i, IGB_HWMON_TYPE_TEMP);

		rc |= igb_add_hwmon_attr(adapter, i, IGB_HWMON_TYPE_MAX);

		if (rc)

		if (rc)

			goto exit;

		rc = igb_add_hwmon_attr(adapter, i, IGB_HWMON_TYPE_LOC);

		if (rc)

			goto exit;

		rc = igb_add_hwmon_attr(adapter, i, IGB_HWMON_TYPE_TEMP);

		if (rc)

			goto exit;

		rc = igb_add_hwmon_attr(adapter, i, IGB_HWMON_TYPE_MAX);

		if (rc)

			goto exit;

	}



	/* init i2c_client */

	client = i2c_new_device(&adapter->i2c_adap, &i350_sensor_info);

	if (client == NULL) {

		dev_info(&adapter->pdev->dev,

			 "Failed to create new i2c device.\n");

		rc = -ENODEV;

		goto exit;

	}

	adapter->i2c_client = client;



	igb_hwmon->groups[0] = &igb_hwmon->group;

	igb_hwmon->group.attrs = igb_hwmon->attrs;



	hwmon_dev = devm_hwmon_device_register_with_groups(&adapter->pdev->dev,

							   client->name,

							   igb_hwmon,

							   igb_hwmon->groups);

	if (IS_ERR(hwmon_dev)) {

		rc = PTR_ERR(hwmon_dev);

		goto err;

		goto err;

	}

	}