lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwmon: (occ) Fix poll rate limiting

Browse Source 
[ Upstream commit 5216dff22dc2bbbbe6f00335f9fd2879670e753b ]

The poll rate limiter time was initialized at zero. This breaks the
comparison in time_after if jiffies is large. Switch to storing the
next update time rather than the previous time, and initialize the
time when the device is probed.

Fixes: c10e753d43 ("hwmon (occ): Add sensor types and versions")
Signed-off-by: Eddie James <eajames@linux.ibm.com>
Link: https://lore.kernel.org/r/20210429151336.18980-1-eajames@linux.ibm.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Eddie James 2021-04-29 10:13:36 -05:00 committed by Greg Kroah-Hartman
parent fa1547f6e4
commit 1648505d13
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/hwmon/occ/common.c
View File

@ -209,9 +209,9 @@ int occ_update_response(struct occ *occ)
return rc; return rc;
/* limit the maximum rate of polling the OCC */ /* limit the maximum rate of polling the OCC */
if (time_after(jiffies, occ->last_update + OCC_UPDATE_FREQUENCY)) { if (time_after(jiffies, occ->next_update)) {
rc = occ_poll(occ); rc = occ_poll(occ);
occ->last_update = jiffies; occ->next_update = jiffies + OCC_UPDATE_FREQUENCY;
} else { } else {
rc = occ->last_error; rc = occ->last_error;
} }
@ -1089,6 +1089,7 @@ int occ_setup(struct occ *occ, const char *name)
return rc; return rc;
} }
occ->next_update = jiffies + OCC_UPDATE_FREQUENCY;
occ_parse_poll_response(occ); occ_parse_poll_response(occ);
rc = occ_setup_sensor_attrs(occ); rc = occ_setup_sensor_attrs(occ);

2
drivers/hwmon/occ/common.h
View File

@ -99,7 +99,7 @@ struct occ {
u8 poll_cmd_data; /* to perform OCC poll command */ u8 poll_cmd_data; /* to perform OCC poll command */
int (*send_cmd)(struct occ *occ, u8 *cmd); int (*send_cmd)(struct occ *occ, u8 *cmd);
unsigned long last_update; unsigned long next_update;
struct mutex lock; /* lock OCC access */ struct mutex lock; /* lock OCC access */
struct device *hwmon; struct device *hwmon;