github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-06 21:58:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

hwmon: (acpi_power_meter) Fix uninitialized variables

Browse Source 
The 'power1_alarm' attribute uses the 'power' and 'cap' in the
acpi_power_meter_resource structure. Currently, these two fields are just
updated when user query 'power' and 'cap' attribute. If user directly query
the 'power1_alarm' attribute without queryng above two attributes, driver
will use uninitialized variables to judge.

So this patch adds the setting of alarm state and update 'cap' in the
notification callback and update 'power' and 'cap' if needed to show the
real alarm state.

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Link: https://lore.kernel.org/r/20250109081708.27366-2-lihuisong@huawei.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Huisong Li 2025-01-09 16:17:07 +08:00 committed by Guenter Roeck
parent c909e68f81
commit 7532e68f5d
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/hwmon/acpi_power_meter.c
View File

@ -84,6 +84,7 @@ struct acpi_power_meter_resource {
u64 power; u64 power;
u64 cap; u64 cap;
u64 avg_interval; u64 avg_interval;
bool power_alarm;
int sensors_valid; int sensors_valid;
unsigned long sensors_last_updated; unsigned long sensors_last_updated;
struct sensor_device_attribute sensors[NUM_SENSORS]; struct sensor_device_attribute sensors[NUM_SENSORS];
@ -396,6 +397,9 @@ static ssize_t show_val(struct device *dev,
struct acpi_device *acpi_dev = to_acpi_device(dev); struct acpi_device *acpi_dev = to_acpi_device(dev);
struct acpi_power_meter_resource *resource = acpi_dev->driver_data; struct acpi_power_meter_resource *resource = acpi_dev->driver_data;
u64 val = 0; u64 val = 0;
int ret;
guard(mutex)(&resource->lock);
switch (attr->index) { switch (attr->index) {
case 0: case 0:
@ -423,10 +427,17 @@ static ssize_t show_val(struct device *dev,
val = 0; val = 0;
break; break;
case 6: case 6:
if (resource->power > resource->cap) ret = update_meter(resource);
val = 1; if (ret)
else return ret;
val = 0; /* 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;
}
val = resource->power_alarm || resource->power > resource->cap;
resource->power_alarm = resource->power > resource->cap;
break; break;
case 7: case 7:
case 8: case 8:
@ -847,12 +858,20 @@ static void acpi_power_meter_notify(struct acpi_device *device, u32 event)
sysfs_notify(&device->dev.kobj, NULL, POWER_AVERAGE_NAME); sysfs_notify(&device->dev.kobj, NULL, POWER_AVERAGE_NAME);
break; break;
case METER_NOTIFY_CAP: 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); sysfs_notify(&device->dev.kobj, NULL, POWER_CAP_NAME);
break; break;
case METER_NOTIFY_INTERVAL: case METER_NOTIFY_INTERVAL:
sysfs_notify(&device->dev.kobj, NULL, POWER_AVG_INTERVAL_NAME); sysfs_notify(&device->dev.kobj, NULL, POWER_AVG_INTERVAL_NAME);
break; break;
case METER_NOTIFY_CAPPING: 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); sysfs_notify(&device->dev.kobj, NULL, POWER_ALARM_NAME);
dev_info(&device->dev, "Capping in progress.\n"); dev_info(&device->dev, "Capping in progress.\n");
break; break;