thermal: trip: Use READ_ONCE() for lockless access to trip properties
[ Upstream commit a52641bc62 ]
When accessing trip temperature and hysteresis without locking, it is
better to use READ_ONCE() to prevent compiler optimizations possibly
affecting the read from being applied.
Of course, for the READ_ONCE() to be effective, WRITE_ONCE() needs to
be used when updating their values.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
db67686676
commit
5fa5febeaf
@@ -150,7 +150,7 @@ trip_point_temp_show(struct device *dev, struct device_attribute *attr,
|
||||
if (sscanf(attr->attr.name, "trip_point_%d_temp", &trip_id) != 1)
|
||||
return -EINVAL;
|
||||
|
||||
return sprintf(buf, "%d\n", tz->trips[trip_id].trip.temperature);
|
||||
return sprintf(buf, "%d\n", READ_ONCE(tz->trips[trip_id].trip.temperature));
|
||||
}
|
||||
|
||||
static ssize_t
|
||||
@@ -174,7 +174,7 @@ trip_point_hyst_store(struct device *dev, struct device_attribute *attr,
|
||||
trip = &tz->trips[trip_id].trip;
|
||||
|
||||
if (hyst != trip->hysteresis) {
|
||||
trip->hysteresis = hyst;
|
||||
WRITE_ONCE(trip->hysteresis, hyst);
|
||||
|
||||
thermal_zone_trip_updated(tz, trip);
|
||||
}
|
||||
@@ -194,7 +194,7 @@ trip_point_hyst_show(struct device *dev, struct device_attribute *attr,
|
||||
if (sscanf(attr->attr.name, "trip_point_%d_hyst", &trip_id) != 1)
|
||||
return -EINVAL;
|
||||
|
||||
return sprintf(buf, "%d\n", tz->trips[trip_id].trip.hysteresis);
|
||||
return sprintf(buf, "%d\n", READ_ONCE(tz->trips[trip_id].trip.hysteresis));
|
||||
}
|
||||
|
||||
static ssize_t
|
||||
|
||||
@@ -152,7 +152,7 @@ void thermal_zone_set_trip_temp(struct thermal_zone_device *tz,
|
||||
if (trip->temperature == temp)
|
||||
return;
|
||||
|
||||
trip->temperature = temp;
|
||||
WRITE_ONCE(trip->temperature, temp);
|
||||
thermal_notify_tz_trip_change(tz, trip);
|
||||
|
||||
if (temp == THERMAL_TEMP_INVALID) {
|
||||
|
||||
Reference in New Issue
Block a user