Skip to contentSkip to conversation

cros_ec_i2c: prevent i2c timeout for EC_CMD_FLASH_ERASE

PATCH Superseded Wei-Ning Huang 2 participants 2 messages May 15, 2017

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cros_ec_i2c: prevent i2c timeout for EC_CMD_FLASH_ERASE

Some EC chip has larger flash sector size which requires longer erase time. During erase the CPU is usually stalled and can't even respond to interrupts. We sleep a while to block any EC command from executing during the flash erase period.

---
 drivers/mfd/cros_ec_i2c.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
drivers/mfd/cros_ec_i2c.c +18 -0
index 9f70de1e4c70..8f23d5a8cc5b 100644
@@ -23,6 +23,14 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
+/*
+ * Some EC chip has larger flash sector size which requires longer erase time.
+ * During erase the CPU is usually stalled and can't even respond to
+ * interrupts. We sleep for a while to block any EC command from executing
+ * during the flash erase period to prevent i2c timeout.
+ */
+#define EC_FLASH_ERASE_DELAY_MS	5000
+
 /**
  * Request format for protocol v3
  * byte 0	0xda (EC_COMMAND_PROTOCOL_3)
@@ -177,6 +185,16 @@ static int cros_ec_pkt_xfer_i2c(struct cros_ec_device *ec_dev,
 
 	ret = ec_response->data_len;
 
+	/*
+	 * If we get EC_RES_IN_PROGRESS for EC_CMD_FLASH_ERASE this means EC
+	 * need a long time to erase flash, during flash erase CPU is stalled
+	 * and can't respond to interrupts, so we sleep for a while to stop new
+	 * EC commands from communicating with EC.
+	 */
+	if (msg->command == EC_CMD_FLASH_ERASE &&
+	    msg->result == EC_RES_IN_PROGRESS)
+		msleep(EC_FLASH_ERASE_DELAY_MS);
+
 done:
 	if (msg->command == EC_CMD_REBOOT_EC)
 		msleep(EC_REBOOT_DELAY_MS);
Signature · 1 line
2.12.2
Reviewed-by on v1 1/1
#1 lore raw

Hi,

Quoted 6 lines · Wei-Ning Huang

Some EC chip has larger flash sector size which requires longer erase time. During erase the CPU is usually stalled and can't even respond to interrupts. We sleep a while to block any EC command from executing during the flash erase period.

Slightly odd here that your SoB and author don't match. Patch is listed as "From" your chromium address but SoB is your google one.

Quoted 30 lines
---
 drivers/mfd/cros_ec_i2c.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
drivers/mfd/cros_ec_i2c.c +11 -0
index 9f70de1e4c70..8f23d5a8cc5b 100644
@@ -23,6 +23,14 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
+/*
+ * Some EC chip has larger flash sector size which requires longer erase time.
+ * During erase the CPU is usually stalled and can't even respond to
+ * interrupts. We sleep for a while to block any EC command from executing
+ * during the flash erase period to prevent i2c timeout.
+ */
+#define EC_FLASH_ERASE_DELAY_MS        5000
+
 /**
  * Request format for protocol v3
  * byte 0      0xda (EC_COMMAND_PROTOCOL_3)
@@ -177,6 +185,16 @@ static int cros_ec_pkt_xfer_i2c(struct cros_ec_device *ec_dev,
 
        ret = ec_response->data_len;
 
+       /*
+        * If we get EC_RES_IN_PROGRESS for EC_CMD_FLASH_ERASE this means EC
+        * need a long time to erase flash, during flash erase CPU is stalled

drivers/mfd/cros_ec_i2c.c static int cros_ec_pkt_xfer_i2c(struct cros_ec_device *ec_dev, · line 200

Quoted 10 lines
drivers/mfd/cros_ec_i2c.c +7 -0
+        * and can't respond to interrupts, so we sleep for a while to stop new
+        * EC commands from communicating with EC.
+        */
+       if (msg->command == EC_CMD_FLASH_ERASE &&
+           msg->result == EC_RES_IN_PROGRESS)
+               msleep(EC_FLASH_ERASE_DELAY_MS);
+
 done:
        if (msg->command == EC_CMD_REBOOT_EC)
                msleep(EC_REBOOT_DELAY_MS);

As per review that took place off-list on crosreview.com/502840, this seems pretty sane to me.