Commit 95e1bc1d authored by Stewart Smith's avatar Stewart Smith Committed by Michael Ellerman

powernv/opal-sensor: remove not needed lock

Parallel sensor reads could run out of async tokens due to
opal_get_sensor_data grabbing tokens but then doing the sensor
read behind a mutex, essentially serializing the (possibly
asynchronous and relatively slow) sensor read.

It turns out that the mutex isn't needed at all, not only
should the OPAL interface allow concurrent reads, the implementation
is certainly safe for that, and if any sensor we were reading
from somewhere isn't, doing the mutual exclusion in the kernel
is the wrong place to do it, OPAL should be doing it for the kernel.

So, remove the mutex.

Additionally, we shouldn't be printing out an error when we don't
get a token as the only way this should happen is if we've been
interrupted in down_interruptible() on the semaphore.
Reported-by: default avatarRobert Lippert <rlippert@google.com>
Signed-off-by: default avatarStewart Smith <stewart@linux.vnet.ibm.com>
Signed-off-by: default avatarCyril Bur <cyrilbur@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 86cd6d98
...@@ -19,13 +19,10 @@ ...@@ -19,13 +19,10 @@
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mutex.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <asm/opal.h> #include <asm/opal.h>
#include <asm/machdep.h> #include <asm/machdep.h>
static DEFINE_MUTEX(opal_sensor_mutex);
/* /*
* This will return sensor information to driver based on the requested sensor * This will return sensor information to driver based on the requested sensor
* handle. A handle is an opaque id for the powernv, read by the driver from the * handle. A handle is an opaque id for the powernv, read by the driver from the
...@@ -38,13 +35,9 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data) ...@@ -38,13 +35,9 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data)
__be32 data; __be32 data;
token = opal_async_get_token_interruptible(); token = opal_async_get_token_interruptible();
if (token < 0) { if (token < 0)
pr_err("%s: Couldn't get the token, returning\n", __func__); return token;
ret = token;
goto out;
}
mutex_lock(&opal_sensor_mutex);
ret = opal_sensor_read(sensor_hndl, token, &data); ret = opal_sensor_read(sensor_hndl, token, &data);
switch (ret) { switch (ret) {
case OPAL_ASYNC_COMPLETION: case OPAL_ASYNC_COMPLETION:
...@@ -52,7 +45,7 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data) ...@@ -52,7 +45,7 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data)
if (ret) { if (ret) {
pr_err("%s: Failed to wait for the async response, %d\n", pr_err("%s: Failed to wait for the async response, %d\n",
__func__, ret); __func__, ret);
goto out_token; goto out;
} }
ret = opal_error_code(opal_get_async_rc(msg)); ret = opal_error_code(opal_get_async_rc(msg));
...@@ -73,10 +66,8 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data) ...@@ -73,10 +66,8 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data)
break; break;
} }
out_token:
mutex_unlock(&opal_sensor_mutex);
opal_async_release_token(token);
out: out:
opal_async_release_token(token);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(opal_get_sensor_data); EXPORT_SYMBOL_GPL(opal_get_sensor_data);
......
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