Merge pull request #721 from FrameworkComputer/fwk.modified_power_sequence

Used the system_in_s0ix flags to check the system status

Author: kiram9

zephyr/program/lotus/azalea/src/power_sequence.c

@@ -139,6 +139,7 @@ void power_state_clear(int state)
  */
 static int enter_ms_flag;
 static int resume_ms_flag;
+static int system_in_s0ix;
 
 static int check_s0ix_statsus(void)
 {
@@ -362,16 +363,17 @@ enum power_state power_handle_state(enum power_state state)
 		if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_slp_s3_l)) == 1) {
 
 			/* still in s0ix state */
-			if (enter_ms_flag)
+			if (system_in_s0ix)
 				return POWER_S3S0ix;
 
 			k_msleep(10);
 			return POWER_S3S0;
 		} else if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_slp_s5_l)) == 0) {
 
-			if (enter_ms_flag) {
+			if (system_in_s0ix) {
 				resume_ms_flag = 0;
 				enter_ms_flag = 0;
+				system_in_s0ix = 0;
 				lpc_s0ix_resume_restore_masks();
 				/* Call hooks now that rails are up */
 				hook_notify(HOOK_CHIPSET_RESUME);
@@ -447,7 +449,9 @@ enum power_state power_handle_state(enum power_state state)
 			 * clear the resume ms flag
 			 */
 			if (resume_ms_flag > 0) {
-				resume_ms_flag--;
+				esume_ms_flag = 0;
+				enter_ms_flag = 0;
+				system_in_s0ix = 0;
 				return POWER_S0ixS0;
 			}
 			return POWER_S0ixS3;
@@ -477,7 +481,7 @@ enum power_state power_handle_state(enum power_state state)
 	case POWER_S0ixS0:
 		CPRINTS("PH S0ixS0");
 		resume_ms_flag = 0;
-		enter_ms_flag = 0;
+		system_in_s0ix = 0;
 		lpc_s0ix_resume_restore_masks();
 		hook_call_deferred(&key_stuck_wa_data, 50 * MSEC);
 		/* Call hooks now that rails are up */
@@ -488,6 +492,8 @@ enum power_state power_handle_state(enum power_state state)
 		break;
 
 	case POWER_S0S0ix:
+		enter_ms_flag = 0;
+		system_in_s0ix = 1;
 		CPRINTS("PH S0->S0ix");
 		lpc_s0ix_suspend_clear_masks();
 		/* Call hooks before we remove power rails */

zephyr/program/lotus/lotus/src/power_sequence.c

@@ -164,6 +164,7 @@ void power_state_clear(int state)
  */
 static int enter_ms_flag;
 static int resume_ms_flag;
+static int system_in_s0ix;
 
 static int check_s0ix_statsus(void)
 {
@@ -368,17 +369,18 @@ enum power_state power_handle_state(enum power_state state)
 		if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_slp_s3_l)) == 1) {
 
 			/* still in s0ix state */
-			if (enter_ms_flag)
+			if (system_in_s0ix)
 				return POWER_S3S0ix;
 
 			/* Power up to next state */
 			k_msleep(10);
 			return POWER_S3S0;
 		} else if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_slp_s5_l)) == 0) {
 
-			if (enter_ms_flag) {
+			if (system_in_s0ix) {
 				resume_ms_flag = 0;
 				enter_ms_flag = 0;
+				system_in_s0ix = 0;
 				lpc_s0ix_resume_restore_masks();
 				/* Call hooks now that rails are up */
 				hook_notify(HOOK_CHIPSET_RESUME);
@@ -454,12 +456,15 @@ enum power_state power_handle_state(enum power_state state)
 		if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_slp_s3_l)) == 0) {
 			/*
 			 * If power signal lose, we need to resume to S0 and
-			 * clear the resume ms flag
+			 * clear the all s0ix flags
 			 */
 			if (resume_ms_flag > 0) {
-				resume_ms_flag--;
+				resume_ms_flag = 0;
+				enter_ms_flag = 0;
+				system_in_s0ix = 0;
 				return POWER_S0ixS0;
 			}
+
 			return POWER_S0ixS3;
 		}
 
@@ -480,7 +485,7 @@ enum power_state power_handle_state(enum power_state state)
 
 	case POWER_S0ixS0:
 		resume_ms_flag = 0;
-		enter_ms_flag = 0;
+		system_in_s0ix = 0;
 		lpc_s0ix_resume_restore_masks();
 		/* Call hooks now that rails are up */
 		hook_notify(HOOK_CHIPSET_RESUME);
@@ -489,6 +494,8 @@ enum power_state power_handle_state(enum power_state state)
 		break;
 
 	case POWER_S0S0ix:
+		enter_ms_flag = 0;
+		system_in_s0ix = 1;
 		lpc_s0ix_suspend_clear_masks();
 		/* Call hooks before we remove power rails */
 		hook_notify(HOOK_CHIPSET_SUSPEND);

zephyr/program/lotus/src/board_host_command.c

@@ -396,3 +396,26 @@ static int cmd_bbram(int argc, const char **argv)
 DECLARE_CONSOLE_COMMAND(bbram, cmd_bbram,
 			"[bbram address]",
 			"get bbram data with hibdata_index");
+
+static int cmd_memmap(int argc, const char **argv)
+{
+	int data;
+	int offset;
+	char *e;
+
+	if (argc > 3) {
+		offset = strtoi(argv[2], &e, 0);
+		data = strtoi(argv[3], &e, 0);
+		*host_get_memmap(offset) = data;
+		CPRINTS("EC_MEMMAP offset:%d, set data:%d", offset, data);
+	} else {
+		offset = strtoi(argv[2], &e, 0);
+		data = *host_get_memmap(offset);
+		CPRINTS("EC_MEMMAP offset:%d, get data:%d", offset, data);
+	}
+
+	return EC_SUCCESS;
+}
+DECLARE_CONSOLE_COMMAND(memmap, cmd_memmap,
+			"[memmap get/set offset [value]]",
+			"get/set memmap data");