Skip to content

Commit

Permalink
hwmon: (occ) Fix poll rate limiting
Browse files Browse the repository at this point in the history
[ Upstream commit 5216dff ]

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: c10e753 ("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>
  • Loading branch information
Eddie James authored and gregkh committed May 19, 2021
1 parent 0becd19 commit 5504739
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions drivers/hwmon/occ/common.c
Expand Up @@ -209,9 +209,9 @@ int occ_update_response(struct occ *occ)
return rc;

/* 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);
occ->last_update = jiffies;
occ->next_update = jiffies + OCC_UPDATE_FREQUENCY;
} else {
rc = occ->last_error;
}
Expand Down Expand Up @@ -1089,6 +1089,7 @@ int occ_setup(struct occ *occ, const char *name)
return rc;
}

occ->next_update = jiffies + OCC_UPDATE_FREQUENCY;
occ_parse_poll_response(occ);

rc = occ_setup_sensor_attrs(occ);
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/occ/common.h
Expand Up @@ -99,7 +99,7 @@ struct occ {
u8 poll_cmd_data; /* to perform OCC poll command */
int (*send_cmd)(struct occ *occ, u8 *cmd);

unsigned long last_update;
unsigned long next_update;
struct mutex lock; /* lock OCC access */

struct device *hwmon;
Expand Down

0 comments on commit 5504739

Please sign in to comment.