Merge pull request #507 from FrameworkComputer/hx30.standalone

Implement standalone mode

Author: kiram9

board/hx30/board.c

@@ -21,6 +21,7 @@
 #include "chipset.h"
 #include "console.h"
 #include "cypress5525.h"
+#include "diagnostics.h"
 #include "driver/als_cm32183.h"
 #include "driver/accel_kionix.h"
 #include "driver/accel_kx022.h"
@@ -432,9 +433,9 @@ bool ac_poweron_check(void)
 {
 	uint8_t memcap;
 
-	board_spi_read_byte(SPI_AC_BOOT_OFFSET, &memcap);
+	board_spi_read_byte(SPI_BIOS_SETUP, &memcap);
 
-	return memcap ? true : false;
+	return (memcap & BIOS_SETUP_AC_BOOT) ? true : false;
 }
 
 int poweron_reason_acin(void)
@@ -670,10 +671,13 @@ static void board_init(void)
 {
 	uint8_t memcap;
 
-	board_spi_read_byte(SPI_AC_BOOT_OFFSET, &memcap);
+	board_spi_read_byte(SPI_BIOS_SETUP, &memcap);
 
-	if (memcap && !ac_boot_status())
-		*host_get_customer_memmap(0x48) = (memcap & BIT(0));
+	if ((memcap & BIOS_SETUP_AC_BOOT) && !ac_boot_status())
+		*host_get_customer_memmap(0x48) = (memcap & BIOS_SETUP_AC_BOOT);
+
+	if (memcap & BIOS_SETUP_STANDALONE)
+		set_standalone_mode(1);
 
 	check_chassis_open(1);
 

board/hx30/board.h

@@ -336,7 +336,10 @@
  */
 #define CONFIG_FLASH_SIZE 0x100000
 #define CONFIG_SPI_FLASH_W25Q80
-#define SPI_AC_BOOT_OFFSET 0x00
+#define SPI_BIOS_SETUP 0x00
+
+#define BIOS_SETUP_AC_BOOT	BIT(0)
+#define BIOS_SETUP_STANDALONE	BIT(1)
 
 /*
  * Enable extra SPI flash and generic SPI

board/hx30/diagnostics.c

@@ -32,6 +32,20 @@ uint8_t bios_complete;
 uint8_t fan_seen;
 uint8_t s0_seen;
 uint8_t run_diagnostics;
+
+int standalone_mode;
+
+void set_standalone_mode(int enable)
+{
+	CPRINTS("set standalone = %d", enable);
+	standalone_mode = enable;
+}
+
+int get_standalone_mode(void)
+{
+	return standalone_mode;
+}
+
 void reset_diagnostics(void)
 {
 	hw_diagnostics =0;
@@ -100,9 +114,8 @@ bool diagnostics_tick(void)
 		set_hw_diagnostic(DIAGNOSTICS_NO_S0, true);
 	}
 
-    if (charge_get_state() == PWR_STATE_ERROR){
-        set_hw_diagnostic(DIAGNOSTICS_HW_NO_BATTERY, true);
-    }
+    if ((charge_get_state() == PWR_STATE_ERROR) && !standalone_mode)
+		set_hw_diagnostic(DIAGNOSTICS_HW_NO_BATTERY, true);
 
 	if (hw_diagnostic_tick & 0x01) {
 		/*off*/
@@ -163,13 +176,13 @@ static void diagnostic_check_tempsensor_deferred(void)
 	device_id[0] = get_hardware_id(ADC_TP_BOARD_ID);
 	device_id[1] = get_hardware_id(ADC_AUDIO_BOARD_ID);
 
-	if (device_id[0] <= BOARD_VERSION_1 ||  device_id[0] >= BOARD_VERSION_14 ||
-		(high_adc[0] - low_adc[0]) > ADC_NC_DELTA) {
+	if ((device_id[0] <= BOARD_VERSION_1 ||  device_id[0] >= BOARD_VERSION_14 ||
+		(high_adc[0] - low_adc[0]) > ADC_NC_DELTA) && !standalone_mode) {
 		set_hw_diagnostic(DIAGNOSTICS_TOUCHPAD, true);
 	}
 
-	if (device_id[1] <= BOARD_VERSION_1 ||  device_id[1] >= BOARD_VERSION_14 ||
-		(high_adc[1] - low_adc[1]) > ADC_NC_DELTA) {
+	if ((device_id[1] <= BOARD_VERSION_1 ||  device_id[1] >= BOARD_VERSION_14 ||
+		(high_adc[1] - low_adc[1]) > ADC_NC_DELTA) && !standalone_mode) {
 		set_hw_diagnostic(DIAGNOSTICS_AUDIO_DAUGHTERBOARD, true);
 	}
     CPRINTS("TP  Ver %d, delta %d", device_id[0], high_adc[0] - low_adc[0]);
@@ -204,6 +217,6 @@ void set_bios_diagnostic(uint8_t code)
 
 	if (code == CODE_DDR_FAIL)
 		set_hw_diagnostic(DIAGNOSTICS_NO_DDR, true);
-	if (code == CODE_NO_EDP)
+	if (code == CODE_NO_EDP && !standalone_mode)
 		set_hw_diagnostic(DIAGNOSTICS_NO_EDP, true);
-}
+}

board/hx30/diagnostics.h

@@ -43,6 +43,9 @@ enum diagnostics_device_idx {
 void set_hw_diagnostic(enum diagnostics_device_idx idx, bool error);
 void set_bios_diagnostic(uint8_t code);
 
+void set_standalone_mode(int enable);
+int get_standalone_mode(void);
+
 void reset_diagnostics(void);
 
 void cancel_diagnostics(void);

board/hx30/host_command_customization.c

@@ -57,18 +57,25 @@ void set_non_acpi_mode(int enable)
 static void sci_enable(void)
 {
 	uint8_t dataInSPI;
-	int dataInEMI;
+	int biosSetup = 0;
+	
 
 	if (*host_get_customer_memmap(0x00) & BIT(0)) {
 	/* when host set EC driver ready flag, EC need to enable SCI */
 		lpc_set_host_event_mask(LPC_HOST_EVENT_SCI, SCI_HOST_EVENT_MASK);
 		update_soc_power_limit(true, false);
 
 	/* check the Flag in EEPROM and EMI, if values are different, write the value in EEPROM */
-		board_spi_read_byte(SPI_AC_BOOT_OFFSET, &dataInSPI);
-		dataInEMI = ac_boot_status();
-		if ((int)dataInSPI != dataInEMI)
-			board_spi_write_byte(SPI_AC_BOOT_OFFSET, (uint8_t)dataInEMI);
+		board_spi_read_byte(SPI_BIOS_SETUP, &dataInSPI);
+
+		if (ac_boot_status())
+			biosSetup |= BIT(0);
+		
+		if (get_standalone_mode())
+			biosSetup |= BIT(1);
+
+		if ((int)dataInSPI != biosSetup)
+			board_spi_write_byte(SPI_BIOS_SETUP, (uint8_t)biosSetup);
 
 		set_non_acpi_mode(0);
 	} else
@@ -158,7 +165,7 @@ static enum ec_status factory_mode(struct host_cmd_handler_args *args)
 		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);
-		board_spi_write_byte(SPI_AC_BOOT_OFFSET, 0);
+		board_spi_write_byte(SPI_BIOS_SETUP, 0);
 		system_set_bbram(STSTEM_BBRAM_IDX_FP_LED_LEVEL, 0);
 	}
 
@@ -339,3 +346,14 @@ static enum ec_status thermal_qevent(struct host_cmd_handler_args *args)
 	return EC_ERROR_INVAL;
 }
 DECLARE_HOST_COMMAND(EC_CMD_THERMAL_QEVENT, thermal_qevent, EC_VER_MASK(0));
+
+
+static enum ec_status standalone_mode(struct host_cmd_handler_args *args)
+{
+	const struct ec_params_standalone_mode *p = args->params;
+
+	set_standalone_mode((int)p->enable);
+	return EC_RES_SUCCESS;
+
+}
+DECLARE_HOST_COMMAND(EC_CMD_STANDALONE_MODE, standalone_mode, EC_VER_MASK(0));

board/hx30/host_command_customization.h

@@ -216,4 +216,10 @@ struct ec_params_thermal_qevent_control {
 	uint8_t send_event;
 } __ec_align1;
 
-#endif /* __HOST_COMMAND_CUSTOMIZATION_H */
+#define EC_CMD_STANDALONE_MODE 0x3E13
+
+struct ec_params_standalone_mode {
+	uint8_t enable;
+} __ec_align1;
+
+#endif /* __HOST_COMMAND_CUSTOMIZATION_H */

board/hx30/led.c

@@ -251,8 +251,11 @@ static void led_set_battery(void)
 		(battery_ticks & 0x2) ? EC_LED_COLOR_RED : EC_LED_COLOR_BLUE);
 		return;
 	}
-	/* Blink both mainboard LEDS as a warning if the chasssis is open and power is on */
-	if (!gpio_get_level(GPIO_CHASSIS_OPEN)) {
+	/*
+	 * Blink both mainboard LEDS as a warning if the chasssis is open and power is on,
+	 * if EC in standalone mode, disable the blinking behavior when chassis is open.
+	 */
+	if (!gpio_get_level(GPIO_CHASSIS_OPEN) && !get_standalone_mode()) {
 		set_pwm_led_color(PWM_LED0, (battery_ticks & 0x2) ? EC_LED_COLOR_RED : -1);
 		set_pwm_led_color(PWM_LED1, (battery_ticks & 0x2) ? EC_LED_COLOR_RED : -1);
 		return;