Merge branch 'hx20' into fp_led_control

Author: LeoCX-Tsai

board/hx20/board.c

@@ -467,17 +467,15 @@ int ac_boot_status(void)
 	return (*host_get_customer_memmap(0x48) & BIT(0)) ? true : false;
 }
 
-static uint8_t chassis_edge_status;
 static uint8_t chassis_vtr_open_count;
 static uint8_t chassis_open_count;
 
 static void check_chassis_open(int init)
 {
-	if (MCHP_VCI_POSEDGE_DETECT & BIT(2) ||
-		MCHP_VCI_NEGEDGE_DETECT & BIT(2)) {
+	if (MCHP_VCI_NEGEDGE_DETECT & BIT(2)) {
 		MCHP_VCI_POSEDGE_DETECT = BIT(2);
 		MCHP_VCI_NEGEDGE_DETECT = BIT(2);
-		chassis_edge_status = 1;
+		system_set_bbram(STSTEM_BBRAM_IDX_CHASSIS_WAS_OPEN, 1);
 
 		if (init) {
 			system_get_bbram(STSTEM_BBRAM_IDX_CHASSIS_VTR_OPEN,
@@ -492,7 +490,6 @@ static void check_chassis_open(int init)
 				system_set_bbram(SYSTEM_BBRAM_IDX_CHASSIS_TOTAL,
 								++chassis_open_count);
 		}
-		
 
 		CPRINTF("Chassis was open");
 	}
@@ -1115,17 +1112,15 @@ static enum ec_status host_chassis_intrusion_control(struct host_cmd_handler_arg
 	}
 
 	if (p->clear_chassis_status) {
-		chassis_edge_status = 0;
+		system_set_bbram(STSTEM_BBRAM_IDX_CHASSIS_WAS_OPEN, 0);
 		return EC_SUCCESS;
 	}
 
-	r->chassis_ever_opened = chassis_edge_status;
+	system_get_bbram(STSTEM_BBRAM_IDX_CHASSIS_WAS_OPEN, &r->chassis_ever_opened);
 	system_get_bbram(STSTEM_BBRAM_IDX_CHASSIS_MAGIC, &r->coin_batt_ever_remove);
 	system_get_bbram(SYSTEM_BBRAM_IDX_CHASSIS_TOTAL, &r->total_open_count);
 	system_get_bbram(STSTEM_BBRAM_IDX_CHASSIS_VTR_OPEN, &r->vtr_open_count);
 
-
-
 	args->response_size = sizeof(*r);
 
 	return EC_SUCCESS;

board/hx20/host_command_customization.c

@@ -134,6 +134,7 @@ static enum ec_status factory_mode(struct host_cmd_handler_args *args)
 		system_set_bbram(SYSTEM_BBRAM_IDX_CHASSIS_TOTAL, 0);
 		system_set_bbram(STSTEM_BBRAM_IDX_CHASSIS_MAGIC, EC_PARAM_CHASSIS_BBRAM_MAGIC);
 		system_set_bbram(STSTEM_BBRAM_IDX_CHASSIS_VTR_OPEN, 0);
+		system_set_bbram(STSTEM_BBRAM_IDX_CHASSIS_WAS_OPEN, 0);
 		system_set_bbram(SYSTEM_BBRAM_IDX_AC_BOOT, 0);
 		system_set_bbram(STSTEM_BBRAM_IDX_FP_LED_LEVEL, 0);
 	}
@@ -257,3 +258,16 @@ static enum ec_status bb_retimer_control(struct host_cmd_handler_args *args)
 	return EC_RES_SUCCESS;
 }
 DECLARE_HOST_COMMAND(EC_CMD_BB_RETIMER_CONTROL, bb_retimer_control, EC_VER_MASK(0));
+
+static enum ec_status chassis_open_check(struct host_cmd_handler_args *args)
+{
+	struct ec_response_chassis_open_check *r = args->response;
+
+	CPRINTS("Chassis status: %d", !gpio_get_level(GPIO_CHASSIS_OPEN));
+	r->status = !gpio_get_level(GPIO_CHASSIS_OPEN) & 0x01;
+	args->response_size = sizeof(*r);
+
+	return EC_RES_SUCCESS;
+
+}
+DECLARE_HOST_COMMAND(EC_CMD_CHASSIS_OPEN_CHECK, chassis_open_check, EC_VER_MASK(0));

board/hx20/host_command_customization.h

@@ -191,4 +191,10 @@ struct ec_response_fp_led_level {
 	uint8_t level;
 } __ec_align1;
 
+#define EC_CMD_CHASSIS_OPEN_CHECK 0x3E0F
+
+struct ec_response_chassis_open_check {
+	uint8_t status;
+} __ec_align1;
+
 #endif /* __HOST_COMMAND_CUSTOMIZATION_H */

board/hx20/led.c

@@ -282,6 +282,7 @@ static void led_set_power(void)
 	/* don't light up when at lid close */
 	if (!lid_is_open()) {
 		set_pwr_led_color(PWM_LED2, -1);
+		enable_pwr_breath(PWM_LED2, EC_LED_COLOR_WHITE, 0);
 		return;
 	}
 

board/hx20/power_sequence.c

@@ -536,8 +536,7 @@ enum power_state power_handle_state(enum power_state state)
 
 #ifdef CONFIG_EMI_REGION1
 		if (keep_pch_power()) {
-			if ((power_get_signals() & IN_PCH_SLP_S5_DEASSERTED))
-				return POWER_G3S5;
+			return POWER_S5;
 		}
 #endif
 

chip/mchp/system.c

@@ -51,6 +51,7 @@ enum hibdata_index {
 	HIBDATA_INDEX_CHASSIS_MAGIC = 33,
 	HIBDATA_INDEX_CHASSIS_VTR_OPEN = 34,
 	HIBDATA_INDEX_VPRO_STATUS = 35,
+	HIBDATA_INDEX_CHASSIS_WAS_OPEN = 36,
 	HIBDATA_INDEX_FP_LED_LEVEL = 37,
 	/*
 	 * .. 56 ~ 59 byte for ESPI VW use ..
@@ -366,6 +367,8 @@ static int bbram_idx_lookup(enum system_bbram_idx idx)
 		return HIBDATA_INDEX_CHASSIS_VTR_OPEN;
 	case SYSTEM_BBRAM_IDX_VPRO_STATUS:
 		return HIBDATA_INDEX_VPRO_STATUS;
+	case STSTEM_BBRAM_IDX_CHASSIS_WAS_OPEN:
+		return HIBDATA_INDEX_CHASSIS_WAS_OPEN;
 	case STSTEM_BBRAM_IDX_FP_LED_LEVEL:
 		return HIBDATA_INDEX_FP_LED_LEVEL;
 	default:

include/system.h

@@ -383,6 +383,7 @@ enum system_bbram_idx {
 	STSTEM_BBRAM_IDX_CHASSIS_MAGIC,
 	STSTEM_BBRAM_IDX_CHASSIS_VTR_OPEN,
 	SYSTEM_BBRAM_IDX_VPRO_STATUS,
+	STSTEM_BBRAM_IDX_CHASSIS_WAS_OPEN,
 	STSTEM_BBRAM_IDX_FP_LED_LEVEL,
 
 };