diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -105,8 +105,8 @@ /* Bitmap of device quirks. */ int acpi_quirks; -/* Supported sleep states. */ -static BOOLEAN acpi_sleep_states[ACPI_S_STATE_COUNT]; +/* Supported sleep types. */ +static BOOLEAN acpi_supported_stypes[STYPE_COUNT]; static void acpi_lookup(void *arg, const char *name, device_t *dev); static int acpi_modevent(struct module *mod, int event, void *junk); @@ -157,19 +157,19 @@ void *context, void **status); static void acpi_sleep_enable(void *arg); static ACPI_STATUS acpi_sleep_disable(struct acpi_softc *sc); -static ACPI_STATUS acpi_EnterSleepState(struct acpi_softc *sc, int state); +static ACPI_STATUS acpi_EnterSleepState(struct acpi_softc *sc, enum sleep_type stype); static void acpi_shutdown_final(void *arg, int howto); static void acpi_enable_fixed_events(struct acpi_softc *sc); static void acpi_resync_clock(struct acpi_softc *sc); -static int acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate); -static int acpi_wake_run_prep(ACPI_HANDLE handle, int sstate); -static int acpi_wake_prep_walk(int sstate); +static int acpi_wake_sleep_prep(ACPI_HANDLE handle, enum sleep_type stype); +static int acpi_wake_run_prep(ACPI_HANDLE handle, enum sleep_type stype); +static int acpi_wake_prep_walk(enum sleep_type stype); static int acpi_wake_sysctl_walk(device_t dev); static int acpi_wake_set_sysctl(SYSCTL_HANDLER_ARGS); -static void acpi_system_eventhandler_sleep(void *arg, int state); -static void acpi_system_eventhandler_wakeup(void *arg, int state); -static int acpi_sname2sstate(const char *sname); -static const char *acpi_sstate2sname(int sstate); +static void acpi_system_eventhandler_sleep(void *arg, enum sleep_type stype); +static void acpi_system_eventhandler_wakeup(void *arg, enum sleep_type stype); +static enum sleep_type acpi_sname2stype(const char *sname); +static const char *acpi_stype2sname(enum sleep_type stype); static int acpi_supported_sleep_state_sysctl(SYSCTL_HANDLER_ARGS); static int acpi_sleep_state_sysctl(SYSCTL_HANDLER_ARGS); static int acpi_debug_objects_sysctl(SYSCTL_HANDLER_ARGS); @@ -567,26 +567,26 @@ SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "power_button_state", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, - &sc->acpi_power_button_sx, 0, acpi_sleep_state_sysctl, "A", + &sc->acpi_power_button_stype, 0, acpi_sleep_state_sysctl, "A", "Power button ACPI sleep state."); SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "sleep_button_state", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, - &sc->acpi_sleep_button_sx, 0, acpi_sleep_state_sysctl, "A", + &sc->acpi_sleep_button_stype, 0, acpi_sleep_state_sysctl, "A", "Sleep button ACPI sleep state."); SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "lid_switch_state", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, - &sc->acpi_lid_switch_sx, 0, acpi_sleep_state_sysctl, "A", + &sc->acpi_lid_switch_stype, 0, acpi_sleep_state_sysctl, "A", "Lid ACPI sleep state. Set to S3 if you want to suspend your laptop when close the Lid."); SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "standby_state", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, - &sc->acpi_standby_sx, 0, acpi_sleep_state_sysctl, "A", ""); + &sc->acpi_standby_stype, 0, acpi_sleep_state_sysctl, "A", ""); SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "suspend_state", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, - &sc->acpi_suspend_sx, 0, acpi_sleep_state_sysctl, "A", ""); + &sc->acpi_suspend_stype, 0, acpi_sleep_state_sysctl, "A", ""); SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "sleep_delay", CTLFLAG_RW, &sc->acpi_sleep_delay, 0, "sleep delay in seconds"); @@ -624,31 +624,33 @@ sc->acpi_s4bios = 1; #endif - /* Probe all supported sleep states. */ - acpi_sleep_states[ACPI_STATE_S0] = TRUE; - for (state = ACPI_STATE_S1; state < ACPI_S_STATE_COUNT; state++) + /* + * Probe all supported ACPI sleep states. Awake (S0) is always supported. + */ + acpi_supported_stypes[STYPE_AWAKE] = TRUE; + for (state = ACPI_STATE_S1; state <= ACPI_STATE_S5; state++) if (ACPI_SUCCESS(AcpiEvaluateObject(ACPI_ROOT_OBJECT, __DECONST(char *, AcpiGbl_SleepStateNames[state]), NULL, NULL)) && ACPI_SUCCESS(AcpiGetSleepTypeData(state, &TypeA, &TypeB))) - acpi_sleep_states[state] = TRUE; + acpi_supported_stypes[state] = TRUE; /* * Dispatch the default sleep state to devices. The lid switch is set * to UNKNOWN by default to avoid surprising users. */ - sc->acpi_power_button_sx = acpi_sleep_states[ACPI_STATE_S5] ? - ACPI_STATE_S5 : ACPI_STATE_UNKNOWN; - sc->acpi_lid_switch_sx = ACPI_STATE_UNKNOWN; - sc->acpi_standby_sx = acpi_sleep_states[ACPI_STATE_S1] ? - ACPI_STATE_S1 : ACPI_STATE_UNKNOWN; - sc->acpi_suspend_sx = acpi_sleep_states[ACPI_STATE_S3] ? - ACPI_STATE_S3 : ACPI_STATE_UNKNOWN; + sc->acpi_power_button_stype = acpi_supported_stypes[STYPE_POWEROFF] ? + STYPE_POWEROFF : STYPE_UNKNOWN; + sc->acpi_lid_switch_stype = STYPE_UNKNOWN; + sc->acpi_standby_stype = acpi_supported_stypes[STYPE_STANDBY] ? + STYPE_STANDBY : STYPE_UNKNOWN; + sc->acpi_suspend_stype = acpi_supported_stypes[STYPE_SUSPEND] ? + STYPE_SUSPEND : ACPI_STATE_UNKNOWN; /* Pick the first valid sleep state for the sleep button default. */ - sc->acpi_sleep_button_sx = ACPI_STATE_UNKNOWN; + sc->acpi_sleep_button_stype = ACPI_STATE_UNKNOWN; for (state = ACPI_STATE_S1; state <= ACPI_STATE_S4; state++) - if (acpi_sleep_states[state]) { - sc->acpi_sleep_button_sx = state; + if (acpi_supported_stypes[state]) { + sc->acpi_sleep_button_stype = state; break; } @@ -673,7 +675,7 @@ /* Flag our initial states. */ sc->acpi_enabled = TRUE; - sc->acpi_sstate = ACPI_STATE_S0; + sc->acpi_stype = STYPE_AWAKE; sc->acpi_sleep_disabled = TRUE; /* Create the control device */ @@ -711,6 +713,24 @@ return_VALUE (error); } +static int +acpi_stype2sstate(enum sleep_type stype) +{ + + switch (stype) { + case STYPE_AWAKE: + case STYPE_STANDBY: + case STYPE_STANDBY_S2: + case STYPE_SUSPEND: + case STYPE_HIBERNATE: + case STYPE_POWEROFF: + return stype; + case STYPE_COUNT: + case STYPE_UNKNOWN: + return ACPI_STATE_UNKNOWN; + } +} + static void acpi_set_power_children(device_t dev, int state) { @@ -1977,7 +1997,7 @@ * Note illegal _S0D is evaluated because some systems expect this. */ sc = device_get_softc(bus); - snprintf(sxd, sizeof(sxd), "_S%dD", sc->acpi_sstate); + snprintf(sxd, sizeof(sxd), "_S%dD", acpi_stype2sstate(sc->acpi_stype)); status = acpi_GetInteger(handle, sxd, dstate); if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) { device_printf(dev, "failed to get %s on %s: %s\n", sxd, @@ -3070,9 +3090,9 @@ { struct acpi_softc *sc = (struct acpi_softc *)context; - if (ACPI_FAILURE(acpi_EnterSleepState(sc, sc->acpi_next_sstate))) + if (ACPI_FAILURE(acpi_EnterSleepState(sc, sc->acpi_next_stype))) device_printf(sc->acpi_dev, "force sleep state S%d failed\n", - sc->acpi_next_sstate); + sc->acpi_next_stype); } static void @@ -3099,24 +3119,23 @@ * acks are in. */ int -acpi_ReqSleepState(struct acpi_softc *sc, int state) +acpi_ReqSleepState(struct acpi_softc *sc, enum sleep_type stype) { #if defined(__amd64__) || defined(__i386__) struct apm_clone_data *clone; ACPI_STATUS status; - if (state < ACPI_STATE_S1 || state > ACPI_S_STATES_MAX) + if (stype < STYPE_AWAKE || stype >= STYPE_COUNT) return (EINVAL); - if (!acpi_sleep_states[state]) + if (!acpi_supported_stypes[stype]) return (EOPNOTSUPP); /* * If a reboot/shutdown/suspend request is already in progress or * suspend is blocked due to an upcoming shutdown, just return. */ - if (rebooting || sc->acpi_next_sstate != 0 || suspend_blocked) { + if (rebooting || sc->acpi_next_stype != STYPE_AWAKE || suspend_blocked) return (0); - } /* Wait until sleep is enabled. */ while (sc->acpi_sleep_disabled) { @@ -3125,12 +3144,12 @@ ACPI_LOCK(acpi); - sc->acpi_next_sstate = state; + sc->acpi_next_stype = stype; /* S5 (soft-off) should be entered directly with no waiting. */ - if (state == ACPI_STATE_S5) { + if (stype == STYPE_POWEROFF) { ACPI_UNLOCK(acpi); - status = acpi_EnterSleepState(sc, state); + status = acpi_EnterSleepState(sc, stype); return (ACPI_SUCCESS(status) ? 0 : ENXIO); } @@ -3146,7 +3165,7 @@ /* If devd(8) is not running, immediately enter the sleep state. */ if (!devctl_process_running()) { ACPI_UNLOCK(acpi); - status = acpi_EnterSleepState(sc, state); + status = acpi_EnterSleepState(sc, stype); return (ACPI_SUCCESS(status) ? 0 : ENXIO); } @@ -3161,7 +3180,7 @@ ACPI_UNLOCK(acpi); /* Now notify devd(8) also. */ - acpi_UserNotify("Suspend", ACPI_ROOT_OBJECT, state); + acpi_UserNotify("Suspend", ACPI_ROOT_OBJECT, stype); return (0); #else @@ -3184,17 +3203,17 @@ struct acpi_softc *sc; int ret, sleeping; - /* If no pending sleep state, return an error. */ + /* If no pending sleep type, return an error. */ ACPI_LOCK(acpi); sc = clone->acpi_sc; - if (sc->acpi_next_sstate == 0) { + if (sc->acpi_next_stype == STYPE_AWAKE) { ACPI_UNLOCK(acpi); return (ENXIO); } /* Caller wants to abort suspend process. */ if (error) { - sc->acpi_next_sstate = 0; + sc->acpi_next_stype = STYPE_AWAKE; callout_stop(&sc->susp_force_to); device_printf(sc->acpi_dev, "listener on %s cancelled the pending suspend\n", @@ -3224,7 +3243,7 @@ ACPI_UNLOCK(acpi); ret = 0; if (sleeping) { - if (ACPI_FAILURE(acpi_EnterSleepState(sc, sc->acpi_next_sstate))) + if (ACPI_FAILURE(acpi_EnterSleepState(sc, sc->acpi_next_stype))) ret = ENODEV; } return (ret); @@ -3281,7 +3300,7 @@ * Currently we support S1-S5 but S4 is only S4BIOS */ static ACPI_STATUS -acpi_EnterSleepState(struct acpi_softc *sc, int state) +acpi_EnterSleepState(struct acpi_softc *sc, enum sleep_type stype) { register_t intr; ACPI_STATUS status; @@ -3291,11 +3310,11 @@ ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); - if (state < ACPI_STATE_S1 || state > ACPI_S_STATES_MAX) + if (stype <= STYPE_AWAKE || stype >= STYPE_COUNT) return_ACPI_STATUS (AE_BAD_PARAMETER); - if (!acpi_sleep_states[state]) { - device_printf(sc->acpi_dev, "Sleep state S%d not supported by BIOS\n", - state); + if (!acpi_supported_stypes[stype]) { + device_printf(sc->acpi_dev, "Sleep type %s not supported on this " + "platform\n", acpi_stype2sname(stype)); return (AE_SUPPORT); } @@ -3307,7 +3326,7 @@ return (status); } - if (state == ACPI_STATE_S5) { + if (stype == STYPE_POWEROFF) { /* * Shut down cleanly and power off. This will call us back through the * shutdown handlers. @@ -3335,16 +3354,16 @@ #endif /* - * Be sure to hold Giant across DEVICE_SUSPEND/RESUME + * Be sure to hold bus topology lock across DEVICE_SUSPEND/RESUME. */ bus_topo_lock(); slp_state = ACPI_SS_NONE; - sc->acpi_sstate = state; + sc->acpi_stype = stype; /* Enable any GPEs as appropriate and requested by the user. */ - acpi_wake_prep_walk(state); + acpi_wake_prep_walk(stype); slp_state = ACPI_SS_GPE_SET; /* @@ -3361,7 +3380,7 @@ } slp_state = ACPI_SS_DEV_SUSPEND; - status = AcpiEnterSleepStatePrep(state); + status = AcpiEnterSleepStatePrep(stype); if (ACPI_FAILURE(status)) { device_printf(sc->acpi_dev, "AcpiEnterSleepStatePrep failed - %s\n", AcpiFormatException(status)); @@ -3374,9 +3393,9 @@ suspendclock(); intr = intr_disable(); - if (state != ACPI_STATE_S1) { - sleep_result = acpi_sleep_machdep(sc, state); - acpi_wakeup_machdep(sc, state, sleep_result, 0); + if (stype != STYPE_STANDBY) { + sleep_result = acpi_sleep_machdep(sc, stype); + acpi_wakeup_machdep(sc, stype, sleep_result, 0); /* * XXX According to ACPI specification SCI_EN bit should be restored @@ -3387,10 +3406,10 @@ * This hack is picked up from Linux, which claims that it follows * Windows behavior. */ - if (sleep_result == 1 && state != ACPI_STATE_S4) + if (sleep_result == 1 && stype != STYPE_HIBERNATE) AcpiWriteBitRegister(ACPI_BITREG_SCI_ENABLE, ACPI_ENABLE_EVENT); - if (sleep_result == 1 && state == ACPI_STATE_S3) { + if (sleep_result == 1 && stype == STYPE_SUSPEND) { /* * Prevent mis-interpretation of the wakeup by power button * as a request for power off. @@ -3416,20 +3435,20 @@ intr_restore(intr); /* call acpi_wakeup_machdep() again with interrupt enabled */ - acpi_wakeup_machdep(sc, state, sleep_result, 1); + acpi_wakeup_machdep(sc, stype, sleep_result, 1); - AcpiLeaveSleepStatePrep(state); + AcpiLeaveSleepStatePrep(stype); if (sleep_result == -1) goto backout; - /* Re-enable ACPI hardware on wakeup from sleep state 4. */ - if (state == ACPI_STATE_S4) + /* Re-enable ACPI hardware on wakeup from hibernate. */ + if (stype == STYPE_HIBERNATE) AcpiEnable(); } else { - status = AcpiEnterSleepState(state); + status = AcpiEnterSleepState(stype); intr_restore(intr); - AcpiLeaveSleepStatePrep(state); + AcpiLeaveSleepStatePrep(stype); if (ACPI_FAILURE(status)) { device_printf(sc->acpi_dev, "AcpiEnterSleepState failed - %s\n", AcpiFormatException(status)); @@ -3446,13 +3465,13 @@ if (slp_state >= ACPI_SS_SLP_PREP) resumeclock(); if (slp_state >= ACPI_SS_GPE_SET) { - acpi_wake_prep_walk(state); - sc->acpi_sstate = ACPI_STATE_S0; + acpi_wake_prep_walk(stype); + sc->acpi_stype = STYPE_AWAKE; } if (slp_state >= ACPI_SS_DEV_SUSPEND) DEVICE_RESUME(root_bus); if (slp_state >= ACPI_SS_SLP_PREP) - AcpiLeaveSleepState(state); + AcpiLeaveSleepState(stype); if (slp_state >= ACPI_SS_SLEPT) { #if defined(__i386__) || defined(__amd64__) /* NB: we are still using ACPI timecounter at this point. */ @@ -3461,7 +3480,7 @@ acpi_resync_clock(sc); acpi_enable_fixed_events(sc); } - sc->acpi_next_sstate = 0; + sc->acpi_next_stype = STYPE_AWAKE; bus_topo_unlock(); @@ -3487,7 +3506,7 @@ /* Run /etc/rc.resume after we are back. */ if (devctl_process_running()) - acpi_UserNotify("Resume", ACPI_ROOT_OBJECT, state); + acpi_UserNotify("Resume", ACPI_ROOT_OBJECT, stype); return_ACPI_STATUS (status); } @@ -3538,8 +3557,9 @@ } static int -acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate) +acpi_wake_sleep_prep(ACPI_HANDLE handle, enum sleep_type stype) { + int sstate = acpi_stype2sstate(stype); struct acpi_prw_data prw; device_t dev; @@ -3558,22 +3578,23 @@ if (sstate > prw.lowest_wake) { AcpiSetGpeWakeMask(prw.gpe_handle, prw.gpe_bit, ACPI_GPE_DISABLE); if (bootverbose) - device_printf(dev, "wake_prep disabled wake for %s (S%d)\n", - acpi_name(handle), sstate); + device_printf(dev, "wake_prep disabled wake for %s (%s)\n", + acpi_name(handle), acpi_stype2sname(stype)); } else if (dev && (acpi_get_flags(dev) & ACPI_FLAG_WAKE_ENABLED) != 0) { acpi_pwr_wake_enable(handle, 1); acpi_SetInteger(handle, "_PSW", 1); if (bootverbose) - device_printf(dev, "wake_prep enabled for %s (S%d)\n", - acpi_name(handle), sstate); + device_printf(dev, "wake_prep enabled for %s (%s)\n", + acpi_name(handle), acpi_stype2sname(stype)); } return (0); } static int -acpi_wake_run_prep(ACPI_HANDLE handle, int sstate) +acpi_wake_run_prep(ACPI_HANDLE handle, enum sleep_type stype) { + int sstate = acpi_stype2sstate(stype); struct acpi_prw_data prw; device_t dev; @@ -3610,26 +3631,26 @@ static ACPI_STATUS acpi_wake_prep(ACPI_HANDLE handle, UINT32 level, void *context, void **status) { - int sstate; + enum sleep_type stype; /* If suspending, run the sleep prep function, otherwise wake. */ - sstate = *(int *)context; + stype = *(enum sleep_type *)context; if (AcpiGbl_SystemAwakeAndRunning) - acpi_wake_sleep_prep(handle, sstate); + acpi_wake_sleep_prep(handle, stype); else - acpi_wake_run_prep(handle, sstate); + acpi_wake_run_prep(handle, stype); return (AE_OK); } /* Walk the tree rooted at acpi0 to prep devices for suspend/resume. */ static int -acpi_wake_prep_walk(int sstate) +acpi_wake_prep_walk(enum sleep_type stype) { ACPI_HANDLE sb_handle; if (ACPI_SUCCESS(AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_SB_", &sb_handle))) AcpiWalkNamespace(ACPI_TYPE_DEVICE, sb_handle, 100, - acpi_wake_prep, NULL, &sstate, NULL); + acpi_wake_prep, NULL, &stype, NULL); return (0); } @@ -3788,7 +3809,7 @@ /* System Event Handlers (registered by EVENTHANDLER_REGISTER) */ static void -acpi_system_eventhandler_sleep(void *arg, int state) +acpi_system_eventhandler_sleep(void *arg, enum sleep_type stype) { struct acpi_softc *sc = (struct acpi_softc *)arg; int ret; @@ -3796,23 +3817,27 @@ ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); /* Check if button action is disabled or unknown. */ - if (state == ACPI_STATE_UNKNOWN) + if (stype == ACPI_STATE_UNKNOWN) return; - /* Request that the system prepare to enter the given suspend state. */ - ret = acpi_ReqSleepState(sc, state); + /* + * Request that the system prepare to enter the given suspend state. We can + * totally pass an ACPI S-state to an enum sleep_type. + */ + ret = acpi_ReqSleepState(sc, stype); if (ret != 0) device_printf(sc->acpi_dev, - "request to enter state S%d failed (err %d)\n", state, ret); + "request to enter state %s failed (err %d)\n", + acpi_stype2sname(stype), ret); return_VOID; } static void -acpi_system_eventhandler_wakeup(void *arg, int state) +acpi_system_eventhandler_wakeup(void *arg, enum sleep_type stype) { - ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, stype); /* Currently, nothing to do for wakeup. */ @@ -3826,14 +3851,14 @@ acpi_invoke_sleep_eventhandler(void *context) { - EVENTHANDLER_INVOKE(acpi_sleep_event, *(int *)context); + EVENTHANDLER_INVOKE(acpi_sleep_event, *(enum sleep_type *)context); } static void acpi_invoke_wake_eventhandler(void *context) { - EVENTHANDLER_INVOKE(acpi_wakeup_event, *(int *)context); + EVENTHANDLER_INVOKE(acpi_wakeup_event, *(enum sleep_type *)context); } UINT32 @@ -3844,7 +3869,7 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (ACPI_FAILURE(AcpiOsExecute(OSL_NOTIFY_HANDLER, - acpi_invoke_sleep_eventhandler, &sc->acpi_power_button_sx))) + acpi_invoke_sleep_eventhandler, &sc->acpi_power_button_stype))) return_VALUE (ACPI_INTERRUPT_NOT_HANDLED); return_VALUE (ACPI_INTERRUPT_HANDLED); } @@ -3857,7 +3882,7 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (ACPI_FAILURE(AcpiOsExecute(OSL_NOTIFY_HANDLER, - acpi_invoke_wake_eventhandler, &sc->acpi_power_button_sx))) + acpi_invoke_wake_eventhandler, &sc->acpi_power_button_stype))) return_VALUE (ACPI_INTERRUPT_NOT_HANDLED); return_VALUE (ACPI_INTERRUPT_HANDLED); } @@ -3870,7 +3895,7 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (ACPI_FAILURE(AcpiOsExecute(OSL_NOTIFY_HANDLER, - acpi_invoke_sleep_eventhandler, &sc->acpi_sleep_button_sx))) + acpi_invoke_sleep_eventhandler, &sc->acpi_sleep_button_stype))) return_VALUE (ACPI_INTERRUPT_NOT_HANDLED); return_VALUE (ACPI_INTERRUPT_HANDLED); } @@ -3883,7 +3908,7 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (ACPI_FAILURE(AcpiOsExecute(OSL_NOTIFY_HANDLER, - acpi_invoke_wake_eventhandler, &sc->acpi_sleep_button_sx))) + acpi_invoke_wake_eventhandler, &sc->acpi_sleep_button_stype))) return_VALUE (ACPI_INTERRUPT_NOT_HANDLED); return_VALUE (ACPI_INTERRUPT_HANDLED); } @@ -4079,7 +4104,8 @@ { struct acpi_softc *sc; struct acpi_ioctl_hook *hp; - int error, state; + int error; + enum sleep_type stype; error = 0; hp = NULL; @@ -4109,9 +4135,9 @@ /* Core system ioctls. */ switch (cmd) { case ACPIIO_REQSLPSTATE: - state = *(int *)addr; - if (state != ACPI_STATE_S5) - return (acpi_ReqSleepState(sc, state)); + stype = *(int *)addr; + if (stype != STYPE_POWEROFF) + return (acpi_ReqSleepState(sc, stype)); device_printf(sc->acpi_dev, "power off via acpi ioctl not supported\n"); error = EOPNOTSUPP; break; @@ -4120,12 +4146,12 @@ error = acpi_AckSleepState(sc->acpi_clone, error); break; case ACPIIO_SETSLPSTATE: /* DEPRECATED */ - state = *(int *)addr; - if (state < ACPI_STATE_S0 || state > ACPI_S_STATES_MAX) + stype = *(int *)addr; + if (stype < STYPE_AWAKE || stype > STYPE_COUNT) return (EINVAL); - if (!acpi_sleep_states[state]) + if (!acpi_supported_stypes[stype]) return (EOPNOTSUPP); - if (ACPI_FAILURE(acpi_SetSleepState(sc, state))) + if (ACPI_FAILURE(acpi_SetSleepState(sc, stype))) error = ENXIO; break; default: @@ -4136,29 +4162,30 @@ return (error); } -static int -acpi_sname2sstate(const char *sname) +static enum sleep_type +acpi_sname2stype(const char *sname) { - int sstate; + enum sleep_type stype; if (toupper(sname[0]) == 'S') { - sstate = sname[1] - '0'; - if (sstate >= ACPI_STATE_S0 && sstate <= ACPI_STATE_S5 && + stype = sname[1] - '0'; + if (stype >= ACPI_STATE_S0 && stype <= ACPI_STATE_S5 && sname[2] == '\0') - return (sstate); + return (stype); } else if (strcasecmp(sname, "NONE") == 0) - return (ACPI_STATE_UNKNOWN); + return (STYPE_UNKNOWN); return (-1); } static const char * -acpi_sstate2sname(int sstate) +acpi_stype2sname(enum sleep_type stype) { - static const char *snames[] = { "S0", "S1", "S2", "S3", "S4", "S5" }; + static const char *snames[STYPE_COUNT] = {"S0", "S1", "S2", "S3", "S4", + "S5"}; - if (sstate >= ACPI_STATE_S0 && sstate <= ACPI_STATE_S5) - return (snames[sstate]); - else if (sstate == ACPI_STATE_UNKNOWN) + if (stype >= STYPE_AWAKE && stype < STYPE_COUNT) + return (snames[stype]); + else if (stype == STYPE_UNKNOWN) return ("NONE"); return (NULL); } @@ -4168,12 +4195,12 @@ { int error; struct sbuf sb; - UINT8 state; + enum sleep_type stype; sbuf_new(&sb, NULL, 32, SBUF_AUTOEXTEND); - for (state = ACPI_STATE_S1; state < ACPI_S_STATE_COUNT; state++) - if (acpi_sleep_states[state]) - sbuf_printf(&sb, "%s ", acpi_sstate2sname(state)); + for (stype = STYPE_STANDBY; stype < STYPE_COUNT; stype++) + if (acpi_supported_stypes[stype]) + sbuf_printf(&sb, "%s ", acpi_stype2sname(stype)); sbuf_trim(&sb); sbuf_finish(&sb); error = sysctl_handle_string(oidp, sbuf_data(&sb), sbuf_len(&sb), req); @@ -4184,20 +4211,21 @@ static int acpi_sleep_state_sysctl(SYSCTL_HANDLER_ARGS) { - char sleep_state[10]; - int error, new_state, old_state; + char sleep_type[10]; + int error; + enum sleep_type new_stype, old_stype; - old_state = *(int *)oidp->oid_arg1; - strlcpy(sleep_state, acpi_sstate2sname(old_state), sizeof(sleep_state)); - error = sysctl_handle_string(oidp, sleep_state, sizeof(sleep_state), req); + old_stype = *(enum sleep_type *)oidp->oid_arg1; + strlcpy(sleep_type, acpi_stype2sname(old_stype), sizeof(sleep_type)); + error = sysctl_handle_string(oidp, sleep_type, sizeof(sleep_type), req); if (error == 0 && req->newptr != NULL) { - new_state = acpi_sname2sstate(sleep_state); - if (new_state < ACPI_STATE_S1) + new_stype = acpi_sname2stype(sleep_type); + if (new_stype <= STYPE_AWAKE) return (EINVAL); - if (new_state < ACPI_S_STATE_COUNT && !acpi_sleep_states[new_state]) + if (new_stype < STYPE_COUNT && !acpi_supported_stypes[new_stype]) return (EOPNOTSUPP); - if (new_state != old_state) - *(int *)oidp->oid_arg1 = new_state; + if (new_stype != old_stype) + *(int *)oidp->oid_arg1 = new_stype; } return (error); } @@ -4550,10 +4578,11 @@ static int acpi_pm_func(u_long cmd, void *arg, ...) { - int state, acpi_state; - int error; - struct acpi_softc *sc; - va_list ap; + int power_sstate; + enum sleep_type acpi_stype; + int error; + struct acpi_softc *sc; + va_list ap; error = 0; switch (cmd) { @@ -4565,25 +4594,25 @@ } va_start(ap, arg); - state = va_arg(ap, int); + power_sstate = va_arg(ap, int); va_end(ap); - switch (state) { + switch (power_sstate) { case POWER_SLEEP_STATE_STANDBY: - acpi_state = sc->acpi_standby_sx; + acpi_stype = sc->acpi_standby_stype; break; case POWER_SLEEP_STATE_SUSPEND: - acpi_state = sc->acpi_suspend_sx; + acpi_stype = sc->acpi_suspend_stype; break; case POWER_SLEEP_STATE_HIBERNATE: - acpi_state = ACPI_STATE_S4; + acpi_stype = STYPE_HIBERNATE; break; default: error = EINVAL; goto out; } - if (ACPI_FAILURE(acpi_EnterSleepState(sc, acpi_state))) + if (ACPI_FAILURE(acpi_EnterSleepState(sc, acpi_stype))) error = ENXIO; break; default: diff --git a/sys/dev/acpica/acpi_lid.c b/sys/dev/acpica/acpi_lid.c --- a/sys/dev/acpica/acpi_lid.c +++ b/sys/dev/acpica/acpi_lid.c @@ -235,9 +235,9 @@ sc->lid_status ? "opened" : "closed"); if (sc->lid_status == 0) - EVENTHANDLER_INVOKE(acpi_sleep_event, acpi_sc->acpi_lid_switch_sx); + EVENTHANDLER_INVOKE(acpi_sleep_event, acpi_sc->acpi_lid_switch_stype); else - EVENTHANDLER_INVOKE(acpi_wakeup_event, acpi_sc->acpi_lid_switch_sx); + EVENTHANDLER_INVOKE(acpi_wakeup_event, acpi_sc->acpi_lid_switch_stype); out: ACPI_SERIAL_END(lid); diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -47,23 +47,42 @@ #include #include +enum sleep_type { + /* + * Map these with ACPI S-states the best we can. We want to be able to + * assign an S-state to an enum sleep_type. The other way round is + * impossible though, as we may support additional non-S-state sleep types + * in the future. + */ + STYPE_AWAKE = ACPI_STATE_S0, + STYPE_STANDBY = ACPI_STATE_S1, + STYPE_STANDBY_S2 = ACPI_STATE_S2, + STYPE_SUSPEND = ACPI_STATE_S3, + STYPE_HIBERNATE = ACPI_STATE_S4, + STYPE_POWEROFF = ACPI_STATE_S5, + STYPE_COUNT, + STYPE_UNKNOWN = ACPI_STATE_UNKNOWN, +}; + +CTASSERT(STYPE_COUNT == 6); + struct apm_clone_data; struct acpi_softc { device_t acpi_dev; struct cdev *acpi_dev_t; int acpi_enabled; - int acpi_sstate; + enum sleep_type acpi_stype; int acpi_sleep_disabled; struct sysctl_ctx_list acpi_sysctl_ctx; struct sysctl_oid *acpi_sysctl_tree; - int acpi_power_button_sx; - int acpi_sleep_button_sx; - int acpi_lid_switch_sx; + enum sleep_type acpi_power_button_stype; + enum sleep_type acpi_sleep_button_stype; + enum sleep_type acpi_lid_switch_stype; - int acpi_standby_sx; - int acpi_suspend_sx; + enum sleep_type acpi_standby_stype; + enum sleep_type acpi_suspend_stype; int acpi_sleep_delay; int acpi_s4bios; @@ -74,7 +93,7 @@ vm_offset_t acpi_wakeaddr; vm_paddr_t acpi_wakephys; - int acpi_next_sstate; /* Next suspend Sx state. */ + enum sleep_type acpi_next_stype; /* Next suspend sleep type. */ struct apm_clone_data *acpi_clone; /* Pseudo-dev for devd(8). */ STAILQ_HEAD(,apm_clone_data) apm_cdevs; /* All apm/apmctl/acpi cdevs. */ struct callout susp_force_to; /* Force suspend if no acks. */ @@ -379,7 +398,7 @@ uint32_t *caps_out, bool query); ACPI_STATUS acpi_OverrideInterruptLevel(UINT32 InterruptNumber); ACPI_STATUS acpi_SetIntrModel(int model); -int acpi_ReqSleepState(struct acpi_softc *sc, int state); +int acpi_ReqSleepState(struct acpi_softc *sc, enum sleep_type stype); int acpi_AckSleepState(struct apm_clone_data *clone, int error); ACPI_STATUS acpi_SetSleepState(struct acpi_softc *sc, int state); int acpi_wake_set_enable(device_t dev, int enable); diff --git a/sys/x86/acpica/acpi_apm.c b/sys/x86/acpica/acpi_apm.c --- a/sys/x86/acpica/acpi_apm.c +++ b/sys/x86/acpica/acpi_apm.c @@ -236,7 +236,7 @@ acpi_sc = clone->acpi_sc; /* We are about to lose a reference so check if suspend should occur */ - if (acpi_sc->acpi_next_sstate != 0 && + if (acpi_sc->acpi_next_stype != STYPE_AWAKE && clone->notify_status != APM_EV_ACKED) acpi_AckSleepState(clone, 0); @@ -284,10 +284,10 @@ case APMIO_SUSPEND: if ((flag & FWRITE) == 0) return (EPERM); - if (acpi_sc->acpi_next_sstate == 0) { - if (acpi_sc->acpi_suspend_sx != ACPI_STATE_S5) { + if (acpi_sc->acpi_next_stype == STYPE_AWAKE) { + if (acpi_sc->acpi_suspend_stype != STYPE_POWEROFF) { error = acpi_ReqSleepState(acpi_sc, - acpi_sc->acpi_suspend_sx); + acpi_sc->acpi_suspend_stype); } else { printf( "power off via apm suspend not supported\n"); @@ -299,10 +299,10 @@ case APMIO_STANDBY: if ((flag & FWRITE) == 0) return (EPERM); - if (acpi_sc->acpi_next_sstate == 0) { - if (acpi_sc->acpi_standby_sx != ACPI_STATE_S5) { + if (acpi_sc->acpi_next_stype == STYPE_AWAKE) { + if (acpi_sc->acpi_standby_stype != STYPE_POWEROFF) { error = acpi_ReqSleepState(acpi_sc, - acpi_sc->acpi_standby_sx); + acpi_sc->acpi_standby_stype); } else { printf( "power off via apm standby not supported\n"); @@ -314,10 +314,10 @@ case APMIO_NEXTEVENT: printf("apm nextevent start\n"); ACPI_LOCK(acpi); - if (acpi_sc->acpi_next_sstate != 0 && clone->notify_status == - APM_EV_NONE) { + if (acpi_sc->acpi_next_stype != STYPE_AWAKE && + clone->notify_status == APM_EV_NONE) { ev_info = (struct apm_event_info *)addr; - if (acpi_sc->acpi_next_sstate <= ACPI_STATE_S3) + if (acpi_sc->acpi_next_stype <= STYPE_SUSPEND) ev_info->type = PMEV_STANDBYREQ; else ev_info->type = PMEV_SUSPENDREQ; @@ -393,7 +393,7 @@ revents = 0; devfs_get_cdevpriv((void **)&clone); ACPI_LOCK(acpi); - if (clone->acpi_sc->acpi_next_sstate) + if (clone->acpi_sc->acpi_next_stype != STYPE_AWAKE) revents |= events & (POLLIN | POLLRDNORM); else selrecord(td, &clone->sel_read); @@ -434,7 +434,7 @@ ACPI_LOCK(acpi); clone = kn->kn_hook; - sleeping = clone->acpi_sc->acpi_next_sstate ? 1 : 0; + sleeping = clone->acpi_sc->acpi_next_stype != STYPE_AWAKE; ACPI_UNLOCK(acpi); return (sleeping); }