From f4e9eb9aba875768cbd80241e3770659bdafd643 Mon Sep 17 00:00:00 2001 From: Jagadish Krishnamoorthy Date: Sat, 18 Jul 2015 11:46:37 -0700 Subject: [PATCH] mec: Correct the access mode for short payloads If the Host Command payload is less than 4 bytes and is word aligned then the payload was not transferred at all. EC reads the old packet and CRC mismatch occurs. In this issue, the HC command packet consisting of EC_CMD_REBOOT_EC as command and EC_REBOOT_COLD as payload encountered the same problem as above. Hence select byte access mode for shorter payloads. BRANCH=None BUG=chrome-os-partner:42396 TEST=System should boot after chromeos-firmwareupdate Change-Id: I22bdb739108d31b592c20247be69c198d617d359 Signed-off-by: Patrick Georgi Original-Commit-Id: 8a43d2636b1bbfbac0384e1ea5e8853a7bd87a7f Original-Change-Id: I5572093436f4f4a0fc337efa943753ab4642d8e4 Original-Signed-off-by: Jagadish Krishnamoorthy Original-Signed-off-by: Icarus Sparry Original-Reviewed-on: https://chromium-review.googlesource.com/286537 Original-Reviewed-by: Shawn N Reviewed-on: http://review.coreboot.org/11012 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/ec/google/chromeec/ec_mec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ec/google/chromeec/ec_mec.c b/src/ec/google/chromeec/ec_mec.c index 8a3b852593..5d1ec3c7f3 100644 --- a/src/ec/google/chromeec/ec_mec.c +++ b/src/ec/google/chromeec/ec_mec.c @@ -85,7 +85,7 @@ void mec_io_bytes(int write, u16 port, unsigned int length, u8 *buf, u8 *csum) * Long access cannot be used on misaligned data since reading B0 loads * the data register and writing B3 flushes it. */ - if (port & 0x3) + if ((port & 0x3) || (length < 4)) access_mode = ACCESS_TYPE_BYTE; else access_mode = ACCESS_TYPE_LONG_AUTO_INCREMENT;