From: "Cédric Le Goater" <clg@fr.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: "Stewart Smith" <stewart@linux.vnet.ibm.com>,
benh@au1.ibm.com, "Cédric Le Goater" <clg@fr.ibm.com>,
"Neelesh Gupta" <neelegup@linux.vnet.ibm.com>,
skiboot@lists.ozlabs.org
Subject: [PATCH v3 3/3] powerpc/powernv: remove opal_sensor_mutex
Date: Fri, 27 Mar 2015 17:39:21 +0100 [thread overview]
Message-ID: <1427474362-3903-3-git-send-email-clg@fr.ibm.com> (raw)
In-Reply-To: <20150327095936.50A921400A0@ozlabs.org>
The opal sensor mutex protects the opal_sensor_read call which
can return a OPAL_BUSY code on IBM Power systems if a previous
request is in progress.
This can be handled at user level with a retry.
Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
---
Changes since v2 :
- removed a goto label
arch/powerpc/platforms/powernv/opal-sensor.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
Index: linux.git/arch/powerpc/platforms/powernv/opal-sensor.c
===================================================================
--- linux.git.orig/arch/powerpc/platforms/powernv/opal-sensor.c
+++ linux.git/arch/powerpc/platforms/powernv/opal-sensor.c
@@ -19,13 +19,10 @@
*/
#include <linux/delay.h>
-#include <linux/mutex.h>
#include <linux/of_platform.h>
#include <asm/opal.h>
#include <asm/machdep.h>
-static DEFINE_MUTEX(opal_sensor_mutex);
-
/*
* 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
@@ -40,11 +37,9 @@ int opal_get_sensor_data(u32 sensor_hndl
token = opal_async_get_token_interruptible();
if (token < 0) {
pr_err("%s: Couldn't get the token, returning\n", __func__);
- ret = token;
- goto out;
+ return token;
}
- mutex_lock(&opal_sensor_mutex);
ret = opal_sensor_read(sensor_hndl, token, &data);
switch (ret) {
case OPAL_ASYNC_COMPLETION:
@@ -70,9 +65,7 @@ int opal_get_sensor_data(u32 sensor_hndl
}
out_token:
- mutex_unlock(&opal_sensor_mutex);
opal_async_release_token(token);
-out:
return ret;
}
EXPORT_SYMBOL_GPL(opal_get_sensor_data);
next prev parent reply other threads:[~2015-03-27 16:40 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-25 17:50 [PATCH] powerpc/powernv: handle OPAL_SUCCESS return in opal_sensor_read Cédric Le Goater
2015-03-25 23:07 ` Stewart Smith
2015-03-26 9:44 ` Cedric Le Goater
2015-03-26 12:58 ` Cedric Le Goater
2015-03-26 16:04 ` [PATCH v2 1/3] powerpc/powernv: convert codes returned by OPAL calls Cédric Le Goater
2015-03-26 16:04 ` [PATCH v2 2/3] powerpc/powernv: handle OPAL_SUCCESS return in opal_sensor_read Cédric Le Goater
2015-03-26 16:04 ` [PATCH v2 3/3] powerpc/powernv: remove opal_sensor_mutex Cédric Le Goater
2015-03-27 9:59 ` [v2,1/3] powerpc/powernv: convert codes returned by OPAL calls Michael Ellerman
2015-03-27 10:36 ` [Skiboot] [v2, 1/3] " Benjamin Herrenschmidt
2015-03-27 10:39 ` Cedric Le Goater
2015-03-27 10:45 ` [v2,1/3] " Cedric Le Goater
2015-03-27 16:39 ` [PATCH v3 1/3] " Cédric Le Goater
2015-03-30 2:05 ` Michael Ellerman
2015-03-30 6:37 ` Cedric Le Goater
2015-03-30 6:54 ` Michael Ellerman
2015-03-30 6:56 ` Cedric Le Goater
2015-03-30 10:06 ` [PATCH v4 1/2] " Cédric Le Goater
2015-03-30 10:06 ` [PATCH v4 2/2] powerpc/powernv: handle OPAL_SUCCESS return in opal_sensor_read Cédric Le Goater
2015-03-27 16:39 ` [PATCH v3 2/3] " Cédric Le Goater
2015-03-27 16:39 ` Cédric Le Goater [this message]
2015-03-30 2:09 ` [PATCH v3 3/3] powerpc/powernv: remove opal_sensor_mutex Michael Ellerman
2015-03-30 6:51 ` Cedric Le Goater
2015-03-30 6:59 ` Michael Ellerman
2015-03-30 10:05 ` Cedric Le Goater
2015-03-27 6:05 ` [PATCH] powerpc/powernv: handle OPAL_SUCCESS return in opal_sensor_read Stewart Smith
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427474362-3903-3-git-send-email-clg@fr.ibm.com \
--to=clg@fr.ibm.com \
--cc=benh@au1.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=neelegup@linux.vnet.ibm.com \
--cc=skiboot@lists.ozlabs.org \
--cc=stewart@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).