zephyr/ap_pwrseq: use backward-compatible powerinfo format

servo tooling expects a particular format for output from the powerinfo
command. This change modifies the ap_pwrseq implementation of the command
to use the same format as the old implementation, to maintain
compatibility with the outside tooling that depends on it.

BUG=b:224657603
TEST=`powerinfo` output now has expected format
BRANCH=none

Signed-off-by: Peter Marheine <[email protected]>
Change-Id: Ideeced578dc4f5bdb9c9513524b390f701452d3a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3539774
Reviewed-by: Andrew McRae <[email protected]>
Reviewed-by: Tanu Malhotra <[email protected]>

Author: tari

zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c

@@ -16,8 +16,8 @@ static int powerinfo_handler(const struct shell *shell, size_t argc,
 	int state;
 
 	state = pwr_sm_get_state();
-	shell_fprintf(shell, SHELL_INFO, "Power state = %d (%s)\n",
-					state, pwrsm_dbg[state]);
+	shell_fprintf(shell, SHELL_INFO, "power state %d = %s, in 0x%04x\n",
+		      state, pwrsm_dbg[state], power_get_signals());
 	return 0;
 }
 

zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c

@@ -20,19 +20,19 @@ LOG_MODULE_REGISTER(ap_pwrseq, CONFIG_AP_PWRSEQ_LOG_LEVEL);
  * @brief power_state names for debug
  */
 const char pwrsm_dbg[][25] = {
-	[SYS_POWER_STATE_G3] = "STATE_G3",
-	[SYS_POWER_STATE_S5] = "STATE_S5",
-	[SYS_POWER_STATE_S4] = "STATE_S4",
-	[SYS_POWER_STATE_S3] = "STATE_S3",
-	[SYS_POWER_STATE_S0] = "STATE_S0",
-	[SYS_POWER_STATE_G3S5] = "STATE_G3S5",
-	[SYS_POWER_STATE_S5S4] = "STATE_S5S4",
-	[SYS_POWER_STATE_S4S3] = "STATE_S4S3",
-	[SYS_POWER_STATE_S3S0] = "STATE_S3S0",
-	[SYS_POWER_STATE_S5G3] = "STATE_S5G3",
-	[SYS_POWER_STATE_S4S5] = "STATE_S4S5",
-	[SYS_POWER_STATE_S3S4] = "STATE_S3S4",
-	[SYS_POWER_STATE_S0S3] = "STATE_S0S3",
+	[SYS_POWER_STATE_G3] = "G3",
+	[SYS_POWER_STATE_S5] = "S5",
+	[SYS_POWER_STATE_S4] = "S4",
+	[SYS_POWER_STATE_S3] = "S3",
+	[SYS_POWER_STATE_S0] = "S0",
+	[SYS_POWER_STATE_G3S5] = "G3S5",
+	[SYS_POWER_STATE_S5S4] = "S5S4",
+	[SYS_POWER_STATE_S4S3] = "S4S3",
+	[SYS_POWER_STATE_S3S0] = "S3S0",
+	[SYS_POWER_STATE_S5G3] = "S5G3",
+	[SYS_POWER_STATE_S4S5] = "S4S5",
+	[SYS_POWER_STATE_S3S4] = "S3S4",
+	[SYS_POWER_STATE_S0S3] = "S0S3",
 };
 #endif