mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-05 12:56:08 +00:00
Code Issues Releases Activity

MPSAFE locking

Browse Source 
* Serialize access to the sysctl routines and the notify handler
* Assert that the sx lock is held in any functions they call.
This commit is contained in:
Nate Lawson 2004-08-13 06:22:31 +00:00
parent 1051a7c2da
commit e8a162f4f3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=133629
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/acpi_support/acpi_panasonic.c
View File

@ -83,6 +83,7 @@ static hkey_fn_t hkey_lcd_brightness_max;
static hkey_fn_t hkey_lcd_brightness; static hkey_fn_t hkey_lcd_brightness;
static hkey_fn_t hkey_sound_mute; static hkey_fn_t hkey_sound_mute;
static int lcd_brightness_max = 255; static int lcd_brightness_max = 255;
ACPI_SERIAL_DECL(panasonic, "ACPI Panasonic extras");
/* Table of sysctl names and HKEY functions to call. */ /* Table of sysctl names and HKEY functions to call. */
static struct { static struct {
@ -210,18 +211,21 @@ acpi_panasonic_sysctl(SYSCTL_HANDLER_ARGS)
handler = sysctl_table[function].handler; handler = sysctl_table[function].handler;
/* Get the current value from the appropriate function. */ /* Get the current value from the appropriate function. */
ACPI_SERIAL_BEGIN(panasonic);
error = handler(sc->handle, HKEY_GET, &arg); error = handler(sc->handle, HKEY_GET, &arg);
if (error != 0) if (error != 0)
return (error); goto out;
/* Send the current value to the user and return if no new value. */ /* Send the current value to the user and return if no new value. */
error = sysctl_handle_int(oidp, &arg, 0, req); error = sysctl_handle_int(oidp, &arg, 0, req);
if (error != 0 || req->newptr == NULL) if (error != 0 || req->newptr == NULL)
return (error); goto out;
/* Set the new value via the appropriate function. */ /* Set the new value via the appropriate function. */
error = handler(sc->handle, HKEY_SET, &arg); error = handler(sc->handle, HKEY_SET, &arg);
ACPI_SERIAL_END(panasonic);
out:
return (error); return (error);
} }
@ -232,6 +236,7 @@ acpi_panasonic_sinf(ACPI_HANDLE h, ACPI_INTEGER index)
ACPI_OBJECT *res; ACPI_OBJECT *res;
ACPI_INTEGER ret; ACPI_INTEGER ret;
ACPI_SERIAL_ASSERT(panasonic);
ret = -1; ret = -1;
buf.Length = ACPI_ALLOCATE_BUFFER; buf.Length = ACPI_ALLOCATE_BUFFER;
buf.Pointer = NULL; buf.Pointer = NULL;
@ -250,6 +255,7 @@ acpi_panasonic_sset(ACPI_HANDLE h, ACPI_INTEGER index, ACPI_INTEGER val)
ACPI_OBJECT_LIST args; ACPI_OBJECT_LIST args;
ACPI_OBJECT obj[2]; ACPI_OBJECT obj[2];
ACPI_SERIAL_ASSERT(panasonic);
obj[0].Type = ACPI_TYPE_INTEGER; obj[0].Type = ACPI_TYPE_INTEGER;
obj[0].Integer.Value = index; obj[0].Integer.Value = index;
obj[1].Type = ACPI_TYPE_INTEGER; obj[1].Type = ACPI_TYPE_INTEGER;
@ -263,6 +269,7 @@ static int
hkey_lcd_brightness_max(ACPI_HANDLE h, int op, UINT32 *val) hkey_lcd_brightness_max(ACPI_HANDLE h, int op, UINT32 *val)
{ {
ACPI_SERIAL_ASSERT(panasonic);
switch (op) { switch (op) {
case HKEY_SET: case HKEY_SET:
if (*val < 0 || *val > 255) if (*val < 0 || *val > 255)
@ -281,6 +288,7 @@ static int
hkey_lcd_brightness(ACPI_HANDLE h, int op, UINT32 *val) hkey_lcd_brightness(ACPI_HANDLE h, int op, UINT32 *val)
{ {
ACPI_SERIAL_ASSERT(panasonic);
switch (op) { switch (op) {
case HKEY_SET: case HKEY_SET:
if (*val < 0 || *val > lcd_brightness_max) if (*val < 0 || *val > lcd_brightness_max)
@ -299,6 +307,7 @@ static int
hkey_sound_mute(ACPI_HANDLE h, int op, UINT32 *val) hkey_sound_mute(ACPI_HANDLE h, int op, UINT32 *val)
{ {
ACPI_SERIAL_ASSERT(panasonic);
switch (op) { switch (op) {
case HKEY_SET: case HKEY_SET:
if (*val != 0 && *val != 1) if (*val != 0 && *val != 1)
@ -322,6 +331,7 @@ acpi_panasonic_hkey_event(struct acpi_panasonic_softc *sc, ACPI_HANDLE h,
ACPI_INTEGER val; ACPI_INTEGER val;
int status; int status;
ACPI_SERIAL_ASSERT(panasonic);
status = ENXIO; status = ENXIO;
buf.Length = ACPI_ALLOCATE_BUFFER; buf.Length = ACPI_ALLOCATE_BUFFER;
@ -355,6 +365,7 @@ acpi_panasonic_hkey_action(struct acpi_panasonic_softc *sc, ACPI_HANDLE h,
{ {
int arg; int arg;
ACPI_SERIAL_ASSERT(panasonic);
switch (key) { switch (key) {
case 1: case 1:
/* Decrease LCD brightness. */ /* Decrease LCD brightness. */
@ -398,10 +409,12 @@ acpi_panasonic_notify(ACPI_HANDLE h, UINT32 notify, void *context)
switch (notify) { switch (notify) {
case 0x80: case 0x80:
ACPI_SERIAL_BEGIN(panasonic);
if (acpi_panasonic_hkey_event(sc, h, &key) == 0) { if (acpi_panasonic_hkey_event(sc, h, &key) == 0) {
acpi_panasonic_hkey_action(sc, h, key); acpi_panasonic_hkey_action(sc, h, key);
acpi_UserNotify("Panasonic", h, (uint8_t)key); acpi_UserNotify("Panasonic", h, (uint8_t)key);
} }
ACPI_SERIAL_END(panasonic);
break; break;
default: default:
device_printf(sc->dev, "unknown notify: %#x\n", notify); device_printf(sc->dev, "unknown notify: %#x\n", notify);

17
sys/i386/acpica/acpi_panasonic.c
View File

@ -83,6 +83,7 @@ static hkey_fn_t hkey_lcd_brightness_max;
static hkey_fn_t hkey_lcd_brightness; static hkey_fn_t hkey_lcd_brightness;
static hkey_fn_t hkey_sound_mute; static hkey_fn_t hkey_sound_mute;
static int lcd_brightness_max = 255; static int lcd_brightness_max = 255;
ACPI_SERIAL_DECL(panasonic, "ACPI Panasonic extras");
/* Table of sysctl names and HKEY functions to call. */ /* Table of sysctl names and HKEY functions to call. */
static struct { static struct {
@ -210,18 +211,21 @@ acpi_panasonic_sysctl(SYSCTL_HANDLER_ARGS)
handler = sysctl_table[function].handler; handler = sysctl_table[function].handler;
/* Get the current value from the appropriate function. */ /* Get the current value from the appropriate function. */
ACPI_SERIAL_BEGIN(panasonic);
error = handler(sc->handle, HKEY_GET, &arg); error = handler(sc->handle, HKEY_GET, &arg);
if (error != 0) if (error != 0)
return (error); goto out;
/* Send the current value to the user and return if no new value. */ /* Send the current value to the user and return if no new value. */
error = sysctl_handle_int(oidp, &arg, 0, req); error = sysctl_handle_int(oidp, &arg, 0, req);
if (error != 0 || req->newptr == NULL) if (error != 0 || req->newptr == NULL)
return (error); goto out;
/* Set the new value via the appropriate function. */ /* Set the new value via the appropriate function. */
error = handler(sc->handle, HKEY_SET, &arg); error = handler(sc->handle, HKEY_SET, &arg);
ACPI_SERIAL_END(panasonic);
out:
return (error); return (error);
} }
@ -232,6 +236,7 @@ acpi_panasonic_sinf(ACPI_HANDLE h, ACPI_INTEGER index)
ACPI_OBJECT *res; ACPI_OBJECT *res;
ACPI_INTEGER ret; ACPI_INTEGER ret;
ACPI_SERIAL_ASSERT(panasonic);
ret = -1; ret = -1;
buf.Length = ACPI_ALLOCATE_BUFFER; buf.Length = ACPI_ALLOCATE_BUFFER;
buf.Pointer = NULL; buf.Pointer = NULL;
@ -250,6 +255,7 @@ acpi_panasonic_sset(ACPI_HANDLE h, ACPI_INTEGER index, ACPI_INTEGER val)
ACPI_OBJECT_LIST args; ACPI_OBJECT_LIST args;
ACPI_OBJECT obj[2]; ACPI_OBJECT obj[2];
ACPI_SERIAL_ASSERT(panasonic);
obj[0].Type = ACPI_TYPE_INTEGER; obj[0].Type = ACPI_TYPE_INTEGER;
obj[0].Integer.Value = index; obj[0].Integer.Value = index;
obj[1].Type = ACPI_TYPE_INTEGER; obj[1].Type = ACPI_TYPE_INTEGER;
@ -263,6 +269,7 @@ static int
hkey_lcd_brightness_max(ACPI_HANDLE h, int op, UINT32 *val) hkey_lcd_brightness_max(ACPI_HANDLE h, int op, UINT32 *val)
{ {
ACPI_SERIAL_ASSERT(panasonic);
switch (op) { switch (op) {
case HKEY_SET: case HKEY_SET:
if (*val < 0 || *val > 255) if (*val < 0 || *val > 255)
@ -281,6 +288,7 @@ static int
hkey_lcd_brightness(ACPI_HANDLE h, int op, UINT32 *val) hkey_lcd_brightness(ACPI_HANDLE h, int op, UINT32 *val)
{ {
ACPI_SERIAL_ASSERT(panasonic);
switch (op) { switch (op) {
case HKEY_SET: case HKEY_SET:
if (*val < 0 || *val > lcd_brightness_max) if (*val < 0 || *val > lcd_brightness_max)
@ -299,6 +307,7 @@ static int
hkey_sound_mute(ACPI_HANDLE h, int op, UINT32 *val) hkey_sound_mute(ACPI_HANDLE h, int op, UINT32 *val)
{ {
ACPI_SERIAL_ASSERT(panasonic);
switch (op) { switch (op) {
case HKEY_SET: case HKEY_SET:
if (*val != 0 && *val != 1) if (*val != 0 && *val != 1)
@ -322,6 +331,7 @@ acpi_panasonic_hkey_event(struct acpi_panasonic_softc *sc, ACPI_HANDLE h,
ACPI_INTEGER val; ACPI_INTEGER val;
int status; int status;
ACPI_SERIAL_ASSERT(panasonic);
status = ENXIO; status = ENXIO;
buf.Length = ACPI_ALLOCATE_BUFFER; buf.Length = ACPI_ALLOCATE_BUFFER;
@ -355,6 +365,7 @@ acpi_panasonic_hkey_action(struct acpi_panasonic_softc *sc, ACPI_HANDLE h,
{ {
int arg; int arg;
ACPI_SERIAL_ASSERT(panasonic);
switch (key) { switch (key) {
case 1: case 1:
/* Decrease LCD brightness. */ /* Decrease LCD brightness. */
@ -398,10 +409,12 @@ acpi_panasonic_notify(ACPI_HANDLE h, UINT32 notify, void *context)
switch (notify) { switch (notify) {
case 0x80: case 0x80:
ACPI_SERIAL_BEGIN(panasonic);
if (acpi_panasonic_hkey_event(sc, h, &key) == 0) { if (acpi_panasonic_hkey_event(sc, h, &key) == 0) {
acpi_panasonic_hkey_action(sc, h, key); acpi_panasonic_hkey_action(sc, h, key);
acpi_UserNotify("Panasonic", h, (uint8_t)key); acpi_UserNotify("Panasonic", h, (uint8_t)key);
} }
ACPI_SERIAL_END(panasonic);
break; break;
default: default:
device_printf(sc->dev, "unknown notify: %#x\n", notify); device_printf(sc->dev, "unknown notify: %#x\n", notify);