d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/powernv: Reduce the scope of the sensor guarding mutex

Browse Source 
vmem_xalloc() cannot be called while holding a nonblocking mutex, warned
by WITNESS.  The lock may not be necessary in general, but it avoids
superfluous concurrent OPAL calls for the same sensor.

Reported by:	pkubaj
This commit is contained in:
Justin Hibbits 2019-06-10 03:16:55 +00:00
parent 97220a279f
commit f433dab2de
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=348844
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/powerpc/powernv/opal_sensor.c
View File

@ -92,13 +92,14 @@ const char *opal_sensor_types[] = {
* Retrieve the raw value from OPAL. This will be cooked by the sysctl handler.
*/
static int
opal_sensor_get_val(uint32_t key, uint64_t *val)
opal_sensor_get_val(struct opal_sensor_softc *sc, uint32_t key, uint64_t *val)
{
struct opal_msg msg;
uint32_t val32;
int rv, token;
token = opal_alloc_async_token();
SENSOR_LOCK(sc);
rv = opal_call(OPAL_SENSOR_READ, key, token, vtophys(&val32));
if (rv == OPAL_ASYNC_COMPLETION) {
@ -110,6 +111,7 @@ opal_sensor_get_val(uint32_t key, uint64_t *val)
if (rv == OPAL_SUCCESS)
val32 = msg.params[0];
}
SENSOR_UNLOCK(sc);
if (rv == OPAL_SUCCESS)
*val = val32;
@ -131,9 +133,7 @@ opal_sensor_sysctl(SYSCTL_HANDLER_ARGS)
sc = arg1;
sensor = arg2;
SENSOR_LOCK(sc);
error = opal_sensor_get_val(sensor, &sensval);
SENSOR_UNLOCK(sc);
error = opal_sensor_get_val(sc, sensor, &sensval);
if (error)
return (error);