Commit b5c46a53 authored by Eddie James's avatar Eddie James Committed by Guenter Roeck

hwmon: (occ) Store error condition for rate-limited polls

The OCC driver limits the rate of sending poll commands to the OCC. If a
user reads a hwmon entry after a poll response resulted in an error and
is rate-limited, the error is invisible to the user. Fix this by storing
the last error and returning that in the rate-limited case.
Signed-off-by: default avatarEddie James <eajames@linux.ibm.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 5c090abf
...@@ -141,6 +141,7 @@ static int occ_poll(struct occ *occ) ...@@ -141,6 +141,7 @@ static int occ_poll(struct occ *occ)
/* mutex should already be locked if necessary */ /* mutex should already be locked if necessary */
rc = occ->send_cmd(occ, cmd); rc = occ->send_cmd(occ, cmd);
if (rc) { if (rc) {
occ->last_error = rc;
if (occ->error_count++ > OCC_ERROR_COUNT_THRESHOLD) if (occ->error_count++ > OCC_ERROR_COUNT_THRESHOLD)
occ->error = rc; occ->error = rc;
...@@ -149,6 +150,7 @@ static int occ_poll(struct occ *occ) ...@@ -149,6 +150,7 @@ static int occ_poll(struct occ *occ)
/* clear error since communication was successful */ /* clear error since communication was successful */
occ->error_count = 0; occ->error_count = 0;
occ->last_error = 0;
occ->error = 0; occ->error = 0;
/* check for safe state */ /* check for safe state */
...@@ -210,6 +212,8 @@ int occ_update_response(struct occ *occ) ...@@ -210,6 +212,8 @@ int occ_update_response(struct occ *occ)
if (time_after(jiffies, occ->last_update + OCC_UPDATE_FREQUENCY)) { if (time_after(jiffies, occ->last_update + OCC_UPDATE_FREQUENCY)) {
rc = occ_poll(occ); rc = occ_poll(occ);
occ->last_update = jiffies; occ->last_update = jiffies;
} else {
rc = occ->last_error;
} }
mutex_unlock(&occ->lock); mutex_unlock(&occ->lock);
......
...@@ -106,7 +106,8 @@ struct occ { ...@@ -106,7 +106,8 @@ struct occ {
struct attribute_group group; struct attribute_group group;
const struct attribute_group *groups[2]; const struct attribute_group *groups[2];
int error; /* latest transfer error */ int error; /* final transfer error after retry */
int last_error; /* latest transfer error */
unsigned int error_count; /* number of xfr errors observed */ unsigned int error_count; /* number of xfr errors observed */
unsigned long last_safe; /* time OCC entered "safe" state */ unsigned long last_safe; /* time OCC entered "safe" state */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment