Unverified Commit 0e66969e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15731 Some mainline patches merged into drivers/hwmon 

Merge Pull Request from: @ci-robot 
 
PR sync from: Lifeng Zheng <zhenglifeng1@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/WOWX36HAUOZKETR67AQTWCKJ5SB6GAES/ 
From: Xinghai Cen <cenxinghai@h-partners.com>

Some mainline patches merged into drivers/hwmon

Huisong Li (4):
  hwmon: (acpi_power_meter) Fix fail to load module on platform without
    _PMD method
  hwmon: (acpi_power_meter) Fix uninitialized variables
  hwmon: (acpi_power_meter) Fix update the power trip points on failure
  hwmon: (acpi_power_meter) Fix the fake power alarm reporting

Kazuhiro Abe (1):
  hwmon: (acpi_power_meter) Fix a check for the return value of
    read_domain_devices().

 
https://gitee.com/openeuler/kernel/issues/IBVB4K 
 
Link:https://gitee.com/openeuler/kernel/pulls/15731

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents af590008 4165684b

drivers/hwmon/acpi_power_meter.c

+36 −10
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ struct acpi_power_meter_resource { 
	u64		power;

	u64		cap;

	u64		avg_interval;

	bool		power_alarm;

	int			sensors_valid;

	unsigned long		sensors_last_updated;

	struct sensor_device_attribute	sensors[NUM_SENSORS];
@@ -292,8 +293,8 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr, 
	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct acpi_device *acpi_dev = to_acpi_device(dev);

	struct acpi_power_meter_resource *resource = acpi_dev->driver_data;

	unsigned long temp, trip_bk;

	int res;

	unsigned long temp;



	res = kstrtoul(buf, 10, &temp);

	if (res)
@@ -301,13 +302,15 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr, 


	temp = DIV_ROUND_CLOSEST(temp, 1000);



	mutex_lock(&resource->lock);

	guard(mutex)(&resource->lock);



	trip_bk = resource->trip[attr->index - 7];

	resource->trip[attr->index - 7] = temp;

	res = set_acpi_trip(resource);

	mutex_unlock(&resource->lock);



	if (res)

	if (res) {

		resource->trip[attr->index - 7] = trip_bk;

		return res;

	}



	return count;

}
@@ -396,6 +399,9 @@ static ssize_t show_val(struct device *dev, 
	struct acpi_device *acpi_dev = to_acpi_device(dev);

	struct acpi_power_meter_resource *resource = acpi_dev->driver_data;

	u64 val = 0;

	int ret;



	guard(mutex)(&resource->lock);



	switch (attr->index) {

	case 0:
@@ -423,10 +429,21 @@ static ssize_t show_val(struct device *dev, 
			val = 0;

		break;

	case 6:

		if (resource->power > resource->cap)

			val = 1;

		else

			val = 0;

		ret = update_meter(resource);

		if (ret)

			return ret;

		/* need to update cap if not to support the notification. */

		if (!(resource->caps.flags & POWER_METER_CAN_NOTIFY)) {

			ret = update_cap(resource);

			if (ret)

				return ret;

			resource->power_alarm = resource->power > resource->cap;

			val = resource->power_alarm;

		} else {

			val = resource->power_alarm ||

				 resource->power > resource->cap;

			resource->power_alarm = resource->power > resource->cap;

		}

		break;

	case 7:

	case 8:
@@ -680,8 +697,9 @@ static int setup_attrs(struct acpi_power_meter_resource *resource) 
{

	int res = 0;



	/* _PMD method is optional. */

	res = read_domain_devices(resource);

	if (res)

	if (res && res != -ENODEV)

		return res;



	if (resource->caps.flags & POWER_METER_CAN_MEASURE) {
@@ -847,12 +865,20 @@ static void acpi_power_meter_notify(struct acpi_device *device, u32 event) 
		sysfs_notify(&device->dev.kobj, NULL, POWER_AVERAGE_NAME);

		break;

	case METER_NOTIFY_CAP:

		mutex_lock(&resource->lock);

		res = update_cap(resource);

		if (res)

			dev_err_once(&device->dev, "update cap failed when capping value is changed.\n");

		mutex_unlock(&resource->lock);

		sysfs_notify(&device->dev.kobj, NULL, POWER_CAP_NAME);

		break;

	case METER_NOTIFY_INTERVAL:

		sysfs_notify(&device->dev.kobj, NULL, POWER_AVG_INTERVAL_NAME);

		break;

	case METER_NOTIFY_CAPPING:

		mutex_lock(&resource->lock);

		resource->power_alarm = true;

		mutex_unlock(&resource->lock);

		sysfs_notify(&device->dev.kobj, NULL, POWER_ALARM_NAME);

		dev_info(&device->dev, "Capping in progress.\n");

		break;