Merge pull request #464 from FrameworkComputer/hx30.save_state_in_spi

Hx30.save state in spi

Author: kiram9

board/hx30/board.c

@@ -53,6 +53,7 @@
 #include "pwm_chip.h"
 #include "spi.h"
 #include "spi_chip.h"
+#include "spi_flash.h"
 #include "switch.h"
 #include "system.h"
 #include "task.h"
@@ -370,14 +371,68 @@ void board_reset_pd_mcu(void)
 
 }
 
+#define SPI_FLAGS_REGION 0x80000
+
+void spi_mux_control(int enable)
+{
+	if (enable) {
+		/* Disable LED drv */
+		gpio_set_level(GPIO_TYPEC_G_DRV2_EN, 0);
+		/* Set GPIO56 as SPI for access SPI ROM */
+		gpio_set_alternate_function(1, 0x4000, 2);
+	} else {
+		/* Enable LED drv */
+		gpio_set_level(GPIO_TYPEC_G_DRV2_EN, 1);
+		/* Set GPIO56 as SPI for access SPI ROM */
+		gpio_set_alternate_function(1, 0x4000, 1);
+	}
+}
+
+
+void board_spi_read_byte(uint8_t offset, uint8_t *data)
+{
+	int rv;
+
+	spi_mux_control(1);
+
+	rv = spi_flash_read(data, SPI_FLAGS_REGION + offset, 0x01);
+	if (rv != EC_SUCCESS)
+		CPRINTS("SPI fail to read");
+
+	CPRINTS("%s, offset:0x%02x, data:0x%02x", __func__, offset, *data);
+
+	spi_mux_control(0);
+}
+
+void board_spi_write_byte(uint8_t offset, uint8_t data)
+{
+	int rv;
+
+	spi_mux_control(1);
+
+	rv = spi_flash_erase(SPI_FLAGS_REGION, 0x1000);
+
+	if (rv != EC_SUCCESS)
+		CPRINTS("SPI fail to erase");
+
+	rv = spi_flash_write(SPI_FLAGS_REGION + offset, 0x01, &data);
+
+	if (rv != EC_SUCCESS)
+		CPRINTS("SPI fail to write");
+
+	CPRINTS("%s, offset:0x%02x, data:0x%02x", __func__, offset, data);
+
+	spi_mux_control(0);
+}
+
 /**
  * Check the plug-in AC then power on system setting.
  */
 bool ac_poweron_check(void)
 {
 	uint8_t memcap;
 
-	system_get_bbram(SYSTEM_BBRAM_IDX_AC_BOOT, &memcap);
+	board_spi_read_byte(SPI_AC_BOOT_OFFSET, &memcap);
 
 	return memcap ? true : false;
 }
@@ -648,7 +703,7 @@ static void board_init(void)
 {
 	uint8_t memcap;
 
-	system_get_bbram(SYSTEM_BBRAM_IDX_AC_BOOT, &memcap);
+	board_spi_read_byte(SPI_AC_BOOT_OFFSET, &memcap);
 
 	if (memcap && !ac_boot_status())
 		*host_get_customer_memmap(0x48) = (memcap & BIT(0));
@@ -1203,24 +1258,32 @@ static int cmd_spimux(int argc, char **argv)
 		if (!parse_bool(argv[1], &enable))
 			return EC_ERROR_PARAM1;
 
-		if (enable) {
-			/* Disable LED drv */
-			gpio_set_level(GPIO_TYPEC_G_DRV2_EN, 0);
-			/* Set GPIO56 as SPI for access SPI ROM */
-			gpio_set_alternate_function(1, 0x4000, 2);
-		} else {
-			/* Enable LED drv */
-			gpio_set_level(GPIO_TYPEC_G_DRV2_EN, 1);
-			/* Set GPIO56 as SPI for access SPI ROM */
-			gpio_set_alternate_function(1, 0x4000, 1);
-		}
+		spi_mux_control(enable);
 	}
 	return EC_SUCCESS;
 }
 DECLARE_CONSOLE_COMMAND(spimux, cmd_spimux,
 			"[enable/disable]",
 			"Set if spi CLK is in SPI mode (true) or PWM mode");
 
+
+static int cmd_boardspicontrol(int argc, char **argv)
+{
+	uint8_t data;
+
+	if (!strcasecmp(argv[1], "read")) {
+		board_spi_read_byte(0x01, &data);
+		CPRINTS("DEBUG: cmd get data:0x%02x", data);
+	} else if (!strcasecmp(argv[1], "write")) {
+		board_spi_write_byte(0x01, 0xAA);
+	}
+
+	return EC_SUCCESS;
+}
+DECLARE_CONSOLE_COMMAND(boardspi, cmd_boardspicontrol,
+			"[read/write]",
+			"test");
+
 #define FP_LOCKOUT_TIMEOUT (8 * SECOND)
 static void fingerprint_ctrl_detection_deferred(void);
 DECLARE_DEFERRED(fingerprint_ctrl_detection_deferred);

board/hx30/board.h

@@ -336,6 +336,7 @@
  */
 #define CONFIG_FLASH_SIZE 0x100000
 #define CONFIG_SPI_FLASH_W25Q80
+#define SPI_AC_BOOT_OFFSET 0x00
 
 /*
  * Enable extra SPI flash and generic SPI
@@ -727,6 +728,8 @@ void board_reset_pd_mcu(void);
 /* P sensor */
 void psensor_interrupt(enum gpio_signal signal);
 
+void board_spi_read_byte(uint8_t offset, uint8_t *data);
+void board_spi_write_byte(uint8_t offset, uint8_t data);
 
 /* SOC */
 void soc_signal_interrupt(enum gpio_signal signal);

board/hx30/host_command_customization.c

@@ -56,11 +56,20 @@ void set_non_acpi_mode(int enable)
 
 static void sci_enable(void)
 {
+	uint8_t dataInSPI;
+	int dataInEMI;
+
 	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);
-		system_set_bbram(SYSTEM_BBRAM_IDX_AC_BOOT, ac_boot_status());
+
+	/* 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);
+
 		set_non_acpi_mode(0);
 	} else
 		hook_call_deferred(&sci_enable_data, 250 * MSEC);
@@ -149,7 +158,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);
-		system_set_bbram(SYSTEM_BBRAM_IDX_AC_BOOT, 0);
+		board_spi_write_byte(SPI_AC_BOOT_OFFSET, 0);
 		system_set_bbram(STSTEM_BBRAM_IDX_FP_LED_LEVEL, 0);
 	}