power: Rename sleep types

Make sleep type names clearer and more consistent, and allow space for
something like "os_hibernate" once that gets added to FreeBSD.

Reviewed by:	jaeyoon, olce, markj
Approved by:	jaeyoon, olce, markj
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D56920

sys/compat/linuxkpi/common/src/linux_acpi.c

@@ -131,7 +131,7 @@ linux_handle_power_suspend_event(void *arg __unused, enum power_stype stype)
 		linux_acpi_target_sleep_state = ACPI_STATE_S3;
 		pm_suspend_target_state = PM_SUSPEND_TO_IDLE;
 		break;
-	case POWER_STYPE_SUSPEND_TO_MEM:
+	case POWER_STYPE_FW_SUSPEND:
 		linux_acpi_target_sleep_state = ACPI_STATE_S3;
 		pm_suspend_target_state = PM_SUSPEND_MEM;
 		break;

sys/dev/acpica/acpi.c

@@ -672,12 +672,12 @@ acpi_attach(device_t dev)
      * s2idle when ACPI_FADT_LOW_POWER_S0 is set.
      */
     sc->acpi_sleep_button_stype = POWER_STYPE_UNKNOWN;
-    for (stype = POWER_STYPE_STANDBY; stype <= POWER_STYPE_HIBERNATE; stype++)
+    for (stype = POWER_STYPE_STANDBY; stype <= POWER_STYPE_FW_HIBERNATE; stype++)
 	if (acpi_supported_stypes[stype]) {
 	    sc->acpi_sleep_button_stype = stype;
 	    break;
 	}
-    if (sc->acpi_sleep_button_stype == POWER_STYPE_HIBERNATE ||
+    if (sc->acpi_sleep_button_stype == POWER_STYPE_FW_HIBERNATE ||
 	sc->acpi_sleep_button_stype == POWER_STYPE_UNKNOWN) {
 	if (acpi_supported_stypes[POWER_STYPE_SUSPEND_TO_IDLE])
 	    sc->acpi_sleep_button_stype = POWER_STYPE_SUSPEND_TO_IDLE;
@@ -816,9 +816,9 @@ acpi_stype_to_sstate(struct acpi_softc *sc, enum power_stype stype)
 		return (ACPI_STATE_S0);
 	case POWER_STYPE_STANDBY:
 		return (sc->acpi_standby_sx);
-	case POWER_STYPE_SUSPEND_TO_MEM:
+	case POWER_STYPE_FW_SUSPEND:
 		return (ACPI_STATE_S3);
-	case POWER_STYPE_HIBERNATE:
+	case POWER_STYPE_FW_HIBERNATE:
 		return (ACPI_STATE_S4);
 	case POWER_STYPE_POWEROFF:
 		return (ACPI_STATE_S5);
@@ -851,9 +851,9 @@ acpi_sstate_to_stype(int sstate)
 	case ACPI_STATE_S2:
 		return (POWER_STYPE_STANDBY);
 	case ACPI_STATE_S3:
-		return (POWER_STYPE_SUSPEND_TO_MEM);
+		return (POWER_STYPE_FW_SUSPEND);
 	case ACPI_STATE_S4:
-		return (POWER_STYPE_HIBERNATE);
+		return (POWER_STYPE_FW_HIBERNATE);
 	case ACPI_STATE_S5:
 		return (POWER_STYPE_POWEROFF);
 	}
@@ -3723,8 +3723,8 @@ acpi_EnterSleepState(struct acpi_softc *sc, enum power_stype stype)
     case POWER_STYPE_STANDBY:
 	do_standby(sc, &slp_state, intr);
 	break;
-    case POWER_STYPE_SUSPEND_TO_MEM:
-    case POWER_STYPE_HIBERNATE:
+    case POWER_STYPE_FW_SUSPEND:
+    case POWER_STYPE_FW_HIBERNATE:
 	do_sleep(sc, &slp_state, intr, acpi_sstate);
 	break;
     case POWER_STYPE_SUSPEND_TO_IDLE:

sys/dev/ufshci/ufshci_private.h

@@ -262,11 +262,11 @@ static const struct ufshci_power_entry power_map[POWER_STYPE_COUNT] = {
 	    UFSHCI_UIC_LINK_STATE_ACTIVE },
 	[POWER_STYPE_STANDBY] = { UFSHCI_DEV_PWR_SLEEP, SSS_PC_IDLE,
 	    UFSHCI_UIC_LINK_STATE_HIBERNATE },
-	[POWER_STYPE_SUSPEND_TO_MEM] = { UFSHCI_DEV_PWR_POWERDOWN,
+	[POWER_STYPE_FW_SUSPEND] = { UFSHCI_DEV_PWR_POWERDOWN,
 	    SSS_PC_STANDBY, UFSHCI_UIC_LINK_STATE_HIBERNATE },
 	[POWER_STYPE_SUSPEND_TO_IDLE] = { UFSHCI_DEV_PWR_SLEEP, SSS_PC_IDLE,
 	    UFSHCI_UIC_LINK_STATE_HIBERNATE },
-	[POWER_STYPE_HIBERNATE] = { UFSHCI_DEV_PWR_DEEPSLEEP, 0x40,
+	[POWER_STYPE_FW_HIBERNATE] = { UFSHCI_DEV_PWR_DEEPSLEEP, 0x40,
 	    UFSHCI_UIC_LINK_STATE_OFF },
 	[POWER_STYPE_POWEROFF] = { UFSHCI_DEV_PWR_POWERDOWN, SSS_PC_STANDBY,
 	    UFSHCI_UIC_LINK_STATE_OFF },

sys/dev/xen/control/control.c

@@ -176,12 +176,12 @@ xctrl_suspend(void)
 	cpuset_t cpu_suspend_map;
 #endif
 
-	EVENTHANDLER_INVOKE(power_suspend_early, POWER_STYPE_SUSPEND_TO_MEM);
+	EVENTHANDLER_INVOKE(power_suspend_early, POWER_STYPE_FW_SUSPEND);
 	xs_lock();
 	stop_all_proc();
 	xs_unlock();
 	suspend_all_fs();
-	EVENTHANDLER_INVOKE(power_suspend, POWER_STYPE_SUSPEND_TO_MEM);
+	EVENTHANDLER_INVOKE(power_suspend, POWER_STYPE_FW_SUSPEND);
 
 #ifdef EARLY_AP_STARTUP
 	MPASS(mp_ncpus == 1 || smp_started);
@@ -298,7 +298,7 @@ xctrl_suspend(void)
 	resume_all_fs();
 	resume_all_proc();
 
-	EVENTHANDLER_INVOKE(power_resume, POWER_STYPE_SUSPEND_TO_MEM);
+	EVENTHANDLER_INVOKE(power_resume, POWER_STYPE_FW_SUSPEND);
 
 	if (bootverbose)
 		printf("System resumed after suspension\n");

sys/kern/subr_power.c

@@ -153,12 +153,12 @@ power_pm_register(u_int pm_type, power_pm_fn_t pm_fn, void *pm_arg,
 		    sizeof(power_pm_supported));
 		if (power_pm_supported[POWER_STYPE_STANDBY])
 			power_standby_stype = POWER_STYPE_STANDBY;
-		if (power_pm_supported[POWER_STYPE_SUSPEND_TO_MEM])
-			power_suspend_stype = POWER_STYPE_SUSPEND_TO_MEM;
+		if (power_pm_supported[POWER_STYPE_FW_SUSPEND])
+			power_suspend_stype = POWER_STYPE_FW_SUSPEND;
 		else if (power_pm_supported[POWER_STYPE_SUSPEND_TO_IDLE])
 			power_suspend_stype = POWER_STYPE_SUSPEND_TO_IDLE;
-		if (power_pm_supported[POWER_STYPE_HIBERNATE])
-			power_hibernate_stype = POWER_STYPE_HIBERNATE;
+		if (power_pm_supported[POWER_STYPE_FW_HIBERNATE])
+			power_hibernate_stype = POWER_STYPE_FW_HIBERNATE;
 		error = 0;
 		TASK_INIT(&power_pm_task, 0, power_pm_deferred_fn, NULL);
 	} else {

sys/sys/power.h

@@ -67,9 +67,9 @@ enum power_sstate_transition {
 enum power_stype {
 	POWER_STYPE_AWAKE,
 	POWER_STYPE_STANDBY,
-	POWER_STYPE_SUSPEND_TO_MEM,
+	POWER_STYPE_FW_SUSPEND,
 	POWER_STYPE_SUSPEND_TO_IDLE,
-	POWER_STYPE_HIBERNATE,
+	POWER_STYPE_FW_HIBERNATE,
 	POWER_STYPE_POWEROFF,
 	POWER_STYPE_COUNT,
 	POWER_STYPE_UNKNOWN,
@@ -78,9 +78,9 @@ enum power_stype {
 static const char * const power_stype_names[POWER_STYPE_COUNT] = {
 	[POWER_STYPE_AWAKE]		= "awake",
 	[POWER_STYPE_STANDBY]		= "standby",
-	[POWER_STYPE_SUSPEND_TO_MEM]	= "s2mem",
-	[POWER_STYPE_SUSPEND_TO_IDLE]	= "s2idle",
-	[POWER_STYPE_HIBERNATE]		= "hibernate",
+	[POWER_STYPE_FW_SUSPEND]	= "fw_suspend",
+	[POWER_STYPE_SUSPEND_TO_IDLE]	= "suspend_to_idle",
+	[POWER_STYPE_FW_HIBERNATE]	= "fw_hibernate",
 	[POWER_STYPE_POWEROFF]		= "poweroff",
 };