d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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.
* Note that recursively calling to re-enable the hotkeys is sub-optimal.
This commit is contained in:
Nate Lawson 2004-08-13 06:22:35 +00:00
parent e8a162f4f3
commit 8781a7852f
2 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/acpi_support/acpi_toshiba.c
View File

@ -147,6 +147,8 @@ static void acpi_toshiba_notify(ACPI_HANDLE h, UINT32 notify,
static int acpi_toshiba_video_probe(device_t dev); static int acpi_toshiba_video_probe(device_t dev);
static int acpi_toshiba_video_attach(device_t dev); static int acpi_toshiba_video_attach(device_t dev);
ACPI_SERIAL_DECL(toshiba, "ACPI Toshiba Extras");
/* Table of sysctl names and HCI functions to call. */ /* Table of sysctl names and HCI functions to call. */
static struct { static struct {
char *name; char *name;
@ -292,18 +294,21 @@ acpi_toshiba_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(toshiba);
error = handler(sc->handle, HCI_GET, &arg); error = handler(sc->handle, HCI_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, HCI_SET, &arg); error = handler(sc->handle, HCI_SET, &arg);
out:
ACPI_SERIAL_END(toshiba);
return (error); return (error);
} }
@ -312,6 +317,7 @@ hci_force_fan(ACPI_HANDLE h, int op, UINT32 *state)
{ {
int ret; int ret;
ACPI_SERIAL_ASSERT(toshiba);
if (op == HCI_SET) { if (op == HCI_SET) {
if (*state < 0 || *state > 1) if (*state < 0 || *state > 1)
return (EINVAL); return (EINVAL);
@ -329,6 +335,7 @@ hci_video_output(ACPI_HANDLE h, int op, UINT32 *video_output)
int ret; int ret;
ACPI_STATUS status; ACPI_STATUS status;
ACPI_SERIAL_ASSERT(toshiba);
if (op == HCI_SET) { if (op == HCI_SET) {
if (*video_output < 1 || *video_output > 7) if (*video_output < 1 || *video_output > 7)
return (EINVAL); return (EINVAL);
@ -354,6 +361,7 @@ hci_lcd_brightness(ACPI_HANDLE h, int op, UINT32 *brightness)
{ {
int ret; int ret;
ACPI_SERIAL_ASSERT(toshiba);
if (op == HCI_SET) { if (op == HCI_SET) {
if (*brightness < 0 || *brightness > HCI_LCD_BRIGHTNESS_MAX) if (*brightness < 0 || *brightness > HCI_LCD_BRIGHTNESS_MAX)
return (EINVAL); return (EINVAL);
@ -368,6 +376,8 @@ hci_lcd_brightness(ACPI_HANDLE h, int op, UINT32 *brightness)
static int static int
hci_lcd_backlight(ACPI_HANDLE h, int op, UINT32 *backlight) hci_lcd_backlight(ACPI_HANDLE h, int op, UINT32 *backlight)
{ {
ACPI_SERIAL_ASSERT(toshiba);
if (op == HCI_SET) { if (op == HCI_SET) {
if (*backlight < 0 || *backlight > 1) if (*backlight < 0 || *backlight > 1)
return (EINVAL); return (EINVAL);
@ -380,6 +390,7 @@ hci_cpu_speed(ACPI_HANDLE h, int op, UINT32 *speed)
{ {
int ret; int ret;
ACPI_SERIAL_ASSERT(toshiba);
if (op == HCI_SET) { if (op == HCI_SET) {
if (*speed < 0 || *speed > HCI_CPU_SPEED_MAX) if (*speed < 0 || *speed > HCI_CPU_SPEED_MAX)
return (EINVAL); return (EINVAL);
@ -400,6 +411,7 @@ hci_call(ACPI_HANDLE h, int op, int function, UINT32 *arg)
ACPI_OBJECT *res; ACPI_OBJECT *res;
int status, i, ret; int status, i, ret;
ACPI_SERIAL_ASSERT(toshiba);
status = ENXIO; status = ENXIO;
for (i = 0; i < HCI_WORDS; i++) { for (i = 0; i < HCI_WORDS; i++) {
@ -433,6 +445,9 @@ hci_call(ACPI_HANDLE h, int op, int function, UINT32 *arg)
/* /*
* Sometimes system events are disabled without us requesting * Sometimes system events are disabled without us requesting
* it. This workaround attempts to re-enable them. * it. This workaround attempts to re-enable them.
*
* XXX This call probably shouldn't be recursive. Queueing
* a task via AcpiOsQueueForExecution() might be better.
*/ */
i = 1; i = 1;
hci_call(h, HCI_SET, HCI_REG_SYSTEM_EVENT, &i); hci_call(h, HCI_SET, HCI_REG_SYSTEM_EVENT, &i);
@ -454,6 +469,7 @@ hci_key_action(struct acpi_toshiba_softc *sc, ACPI_HANDLE h, UINT32 key)
{ {
UINT32 arg; UINT32 arg;
ACPI_SERIAL_ASSERT(toshiba);
switch (key) { switch (key) {
case FN_F6_RELEASE: case FN_F6_RELEASE:
/* Decrease LCD brightness. */ /* Decrease LCD brightness. */
@ -501,10 +517,12 @@ acpi_toshiba_notify(ACPI_HANDLE h, UINT32 notify, void *context)
sc = (struct acpi_toshiba_softc *)context; sc = (struct acpi_toshiba_softc *)context;
if (notify == 0x80) { if (notify == 0x80) {
ACPI_SERIAL_BEGIN(toshiba);
while (hci_call(h, HCI_GET, HCI_REG_SYSTEM_EVENT, &key) == 0) { while (hci_call(h, HCI_GET, HCI_REG_SYSTEM_EVENT, &key) == 0) {
hci_key_action(sc, h, key); hci_key_action(sc, h, key);
acpi_UserNotify("TOSHIBA", h, (uint8_t)key); acpi_UserNotify("TOSHIBA", h, (uint8_t)key);
} }
ACPI_SERIAL_END(toshiba);
} else } else
device_printf(sc->dev, "unknown notify: 0x%x\n", notify); device_printf(sc->dev, "unknown notify: 0x%x\n", notify);
} }

22
sys/i386/acpica/acpi_toshiba.c
View File

@ -147,6 +147,8 @@ static void acpi_toshiba_notify(ACPI_HANDLE h, UINT32 notify,
static int acpi_toshiba_video_probe(device_t dev); static int acpi_toshiba_video_probe(device_t dev);
static int acpi_toshiba_video_attach(device_t dev); static int acpi_toshiba_video_attach(device_t dev);
ACPI_SERIAL_DECL(toshiba, "ACPI Toshiba Extras");
/* Table of sysctl names and HCI functions to call. */ /* Table of sysctl names and HCI functions to call. */
static struct { static struct {
char *name; char *name;
@ -292,18 +294,21 @@ acpi_toshiba_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(toshiba);
error = handler(sc->handle, HCI_GET, &arg); error = handler(sc->handle, HCI_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, HCI_SET, &arg); error = handler(sc->handle, HCI_SET, &arg);
out:
ACPI_SERIAL_END(toshiba);
return (error); return (error);
} }
@ -312,6 +317,7 @@ hci_force_fan(ACPI_HANDLE h, int op, UINT32 *state)
{ {
int ret; int ret;
ACPI_SERIAL_ASSERT(toshiba);
if (op == HCI_SET) { if (op == HCI_SET) {
if (*state < 0 || *state > 1) if (*state < 0 || *state > 1)
return (EINVAL); return (EINVAL);
@ -329,6 +335,7 @@ hci_video_output(ACPI_HANDLE h, int op, UINT32 *video_output)
int ret; int ret;
ACPI_STATUS status; ACPI_STATUS status;
ACPI_SERIAL_ASSERT(toshiba);
if (op == HCI_SET) { if (op == HCI_SET) {
if (*video_output < 1 || *video_output > 7) if (*video_output < 1 || *video_output > 7)
return (EINVAL); return (EINVAL);
@ -354,6 +361,7 @@ hci_lcd_brightness(ACPI_HANDLE h, int op, UINT32 *brightness)
{ {
int ret; int ret;
ACPI_SERIAL_ASSERT(toshiba);
if (op == HCI_SET) { if (op == HCI_SET) {
if (*brightness < 0 || *brightness > HCI_LCD_BRIGHTNESS_MAX) if (*brightness < 0 || *brightness > HCI_LCD_BRIGHTNESS_MAX)
return (EINVAL); return (EINVAL);
@ -368,6 +376,8 @@ hci_lcd_brightness(ACPI_HANDLE h, int op, UINT32 *brightness)
static int static int
hci_lcd_backlight(ACPI_HANDLE h, int op, UINT32 *backlight) hci_lcd_backlight(ACPI_HANDLE h, int op, UINT32 *backlight)
{ {
ACPI_SERIAL_ASSERT(toshiba);
if (op == HCI_SET) { if (op == HCI_SET) {
if (*backlight < 0 || *backlight > 1) if (*backlight < 0 || *backlight > 1)
return (EINVAL); return (EINVAL);
@ -380,6 +390,7 @@ hci_cpu_speed(ACPI_HANDLE h, int op, UINT32 *speed)
{ {
int ret; int ret;
ACPI_SERIAL_ASSERT(toshiba);
if (op == HCI_SET) { if (op == HCI_SET) {
if (*speed < 0 || *speed > HCI_CPU_SPEED_MAX) if (*speed < 0 || *speed > HCI_CPU_SPEED_MAX)
return (EINVAL); return (EINVAL);
@ -400,6 +411,7 @@ hci_call(ACPI_HANDLE h, int op, int function, UINT32 *arg)
ACPI_OBJECT *res; ACPI_OBJECT *res;
int status, i, ret; int status, i, ret;
ACPI_SERIAL_ASSERT(toshiba);
status = ENXIO; status = ENXIO;
for (i = 0; i < HCI_WORDS; i++) { for (i = 0; i < HCI_WORDS; i++) {
@ -433,6 +445,9 @@ hci_call(ACPI_HANDLE h, int op, int function, UINT32 *arg)
/* /*
* Sometimes system events are disabled without us requesting * Sometimes system events are disabled without us requesting
* it. This workaround attempts to re-enable them. * it. This workaround attempts to re-enable them.
*
* XXX This call probably shouldn't be recursive. Queueing
* a task via AcpiOsQueueForExecution() might be better.
*/ */
i = 1; i = 1;
hci_call(h, HCI_SET, HCI_REG_SYSTEM_EVENT, &i); hci_call(h, HCI_SET, HCI_REG_SYSTEM_EVENT, &i);
@ -454,6 +469,7 @@ hci_key_action(struct acpi_toshiba_softc *sc, ACPI_HANDLE h, UINT32 key)
{ {
UINT32 arg; UINT32 arg;
ACPI_SERIAL_ASSERT(toshiba);
switch (key) { switch (key) {
case FN_F6_RELEASE: case FN_F6_RELEASE:
/* Decrease LCD brightness. */ /* Decrease LCD brightness. */
@ -501,10 +517,12 @@ acpi_toshiba_notify(ACPI_HANDLE h, UINT32 notify, void *context)
sc = (struct acpi_toshiba_softc *)context; sc = (struct acpi_toshiba_softc *)context;
if (notify == 0x80) { if (notify == 0x80) {
ACPI_SERIAL_BEGIN(toshiba);
while (hci_call(h, HCI_GET, HCI_REG_SYSTEM_EVENT, &key) == 0) { while (hci_call(h, HCI_GET, HCI_REG_SYSTEM_EVENT, &key) == 0) {
hci_key_action(sc, h, key); hci_key_action(sc, h, key);
acpi_UserNotify("TOSHIBA", h, (uint8_t)key); acpi_UserNotify("TOSHIBA", h, (uint8_t)key);
} }
ACPI_SERIAL_END(toshiba);
} else } else
device_printf(sc->dev, "unknown notify: 0x%x\n", notify); device_printf(sc->dev, "unknown notify: 0x%x\n", notify);
} }