Merge pull request #5 from DHowett/hx20

ectool: add support for the MEC LPC protocol

Author: kiram9

util/build.mk

@@ -32,7 +32,7 @@ include util/private/build.mk
 endif
 
 comm-objs=$(util-lock-objs:%=lock/%) comm-host.o comm-dev.o
-comm-objs+=comm-lpc.o comm-i2c.o misc_util.o
+comm-objs+=comm-lpc.o comm-mec_lpc.o comm-i2c.o misc_util.o
 
 iteflash-objs = iteflash.o usb_if.o
 ectool-objs=ectool.o ectool_keyscan.o ec_flash.o ec_panicinfo.o $(comm-objs)

util/comm-lpc.c

@@ -21,7 +21,7 @@
  * Wait for the EC to be unbusy.  Returns 0 if unbusy, non-zero if
  * timeout.
  */
-static int wait_for_ec(int status_addr, int timeout_usec)
+int wait_for_ec(int status_addr, int timeout_usec)
 {
 	int i;
 	int delay = INITIAL_UDELAY;
@@ -246,6 +246,8 @@ static int ec_readmem_lpc(int offset, int bytes, void *dest)
 	return cnt;
 }
 
+int comm_init_lpc_mec(void) __attribute__((weak));
+
 int comm_init_lpc(void)
 {
 	int i;
@@ -273,6 +275,15 @@ int comm_init_lpc(void)
 		return -4;
 	}
 
+	/* Check for a MEC first. */
+	if (comm_init_lpc_mec && comm_init_lpc_mec() >= 0) {
+		ec_max_outsize = EC_LPC_HOST_PACKET_SIZE -
+			sizeof(struct ec_host_request);
+		ec_max_insize = EC_LPC_HOST_PACKET_SIZE -
+			sizeof(struct ec_host_response);
+		return 0;
+	}
+
 	/*
 	 * Test if LPC command args are supported.
 	 *

util/comm-mec_lpc.c

@@ -0,0 +1,226 @@
+/* Copyright 2013 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* The I/O asm funcs exist only on x86. */
+#if defined(__i386__) || defined(__x86_64__)
+
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/io.h>
+#include <sys/param.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "comm-host.h"
+
+/* from comm-lpc.c */
+int wait_for_ec(int status_addr, int timeout_usec);
+
+typedef enum _ec_xfer_direction { EC_MEC_WRITE, EC_MEC_READ } ec_xfer_direction;
+
+/* As defined in MEC172x section 16.8.3
+ * https://ww1.microchip.com/downloads/en/DeviceDoc/MEC172x-Data-Sheet-DS00003583C.pdf
+ */
+#define MEC_EC_BYTE_ACCESS               0x00
+#define MEC_EC_LONG_ACCESS_AUTOINCREMENT 0x03
+
+#define MEC_EC_ADDRESS_REGISTER0      0x0802
+#define MEC_EC_ADDRESS_REGISTER1      0x0803
+#define MEC_EC_DATA_REGISTER0         0x0804
+#define MEC_EC_DATA_REGISTER2         0x0806
+#define MEC_EC_MEMMAP_START            0x100
+
+static int ec_mec_xfer(ec_xfer_direction direction, uint16_t address,
+		       char *data, uint16_t size)
+{
+	/*
+	 * There's a cleverer way to do this, but it's somewhat less clear what's happening.
+	 * I prefer clarity over cleverness. :)
+	 */
+	int pos = 0;
+	uint16_t temp[2];
+	if (address % 4 > 0) {
+		outw((address & 0xFFFC) | MEC_EC_BYTE_ACCESS, MEC_EC_ADDRESS_REGISTER0);
+		/* Unaligned start address */
+		for (int i = address % 4; i < 4; ++i) {
+			char *storage = &data[pos++];
+			if (direction == EC_MEC_WRITE)
+				outb(*storage, MEC_EC_DATA_REGISTER0 + i);
+			else if (direction == EC_MEC_READ)
+				*storage = inb(MEC_EC_DATA_REGISTER0 + i);
+		}
+		address = (address + 4) & 0xFFFC;
+	}
+
+	if (size - pos >= 4) {
+		outw((address & 0xFFFC) | MEC_EC_LONG_ACCESS_AUTOINCREMENT, MEC_EC_ADDRESS_REGISTER0);
+		while (size - pos >= 4) {
+			if (direction == EC_MEC_WRITE) {
+				memcpy(temp, &data[pos], sizeof(temp));
+				outw(temp[0], MEC_EC_DATA_REGISTER0);
+				outw(temp[1], MEC_EC_DATA_REGISTER2);
+			} else if (direction == EC_MEC_READ) {
+				temp[0] = inw(MEC_EC_DATA_REGISTER0);
+				temp[1] = inw(MEC_EC_DATA_REGISTER2);
+				memcpy(&data[pos], temp, sizeof(temp));
+			}
+
+			pos += 4;
+			address += 4;
+		}
+	}
+
+	if (size - pos > 0) {
+		outw((address & 0xFFFC) | MEC_EC_BYTE_ACCESS, MEC_EC_ADDRESS_REGISTER0);
+		for (int i = 0; i < (size - pos); ++i) {
+			char *storage = &data[pos + i];
+			if (direction == EC_MEC_WRITE)
+				outb(*storage, MEC_EC_DATA_REGISTER0 + i);
+			else if (direction == EC_MEC_READ)
+				*storage = inb(MEC_EC_DATA_REGISTER0 + i);
+		}
+	}
+	return 0;
+}
+
+static uint8_t ec_checksum_buffer(char *data, size_t size)
+{
+	uint8_t sum = 0;
+	for (int i = 0; i < size; ++i) {
+		sum += data[i];
+	}
+	return sum;
+};
+
+static int ec_command_lpc_mec_3(int command, int version, const void *outdata,
+				int outsize, void *indata, int insize)
+{
+	uint8_t csum = 0;
+	int i;
+
+	union {
+		struct ec_host_request rq;
+		char data[EC_LPC_HOST_PACKET_SIZE];
+	} u;
+
+	union {
+		struct ec_host_response rs;
+		char data[EC_LPC_HOST_PACKET_SIZE];
+	} r;
+
+	/* Fail if output size is too big */
+	if (outsize + sizeof(u.rq) > EC_LPC_HOST_PACKET_SIZE)
+		return -EC_RES_REQUEST_TRUNCATED;
+
+	/* Fill in request packet */
+	/* TODO(crosbug.com/p/23825): This should be common to all protocols */
+	u.rq.struct_version = EC_HOST_REQUEST_VERSION;
+	u.rq.checksum = 0;
+	u.rq.command = command;
+	u.rq.command_version = version;
+	u.rq.reserved = 0;
+	u.rq.data_len = outsize;
+
+	memcpy(&u.data[sizeof(u.rq)], outdata, outsize);
+	csum = ec_checksum_buffer(u.data, outsize + sizeof(u.rq));
+	u.rq.checksum = (uint8_t)(-csum);
+
+	if (wait_for_ec(EC_LPC_ADDR_HOST_CMD, 1000000)) {
+		fprintf(stderr, "Timeout waiting for EC response\n");
+		return -EC_RES_ERROR;
+	}
+
+	ec_mec_xfer(EC_MEC_WRITE, 0, u.data, outsize + sizeof(u.rq));
+
+	/* Start the command */
+	outb(EC_COMMAND_PROTOCOL_3, EC_LPC_ADDR_HOST_CMD);
+
+	if (wait_for_ec(EC_LPC_ADDR_HOST_CMD, 1000000)) {
+		fprintf(stderr, "Timeout waiting for EC response\n");
+		return -EC_RES_ERROR;
+	}
+
+	/* Check result */
+	i = inb(EC_LPC_ADDR_HOST_DATA);
+	if (i) {
+		fprintf(stderr, "EC returned error result code %d\n", i);
+		return -EECRESULT - i;
+	}
+
+	csum = 0;
+	ec_mec_xfer(EC_MEC_READ, 0, r.data, sizeof(r.rs));
+
+	if (r.rs.struct_version != EC_HOST_RESPONSE_VERSION) {
+		fprintf(stderr, "EC response version mismatch\n");
+		return -EC_RES_INVALID_RESPONSE;
+	}
+
+	if (r.rs.reserved) {
+		fprintf(stderr, "EC response reserved != 0\n");
+		return -EC_RES_INVALID_RESPONSE;
+	}
+
+	if (r.rs.data_len > insize) {
+		fprintf(stderr, "EC returned too much data\n");
+		return -EC_RES_RESPONSE_TOO_BIG;
+	}
+
+	if (r.rs.data_len > 0) {
+		ec_mec_xfer(EC_MEC_READ, 8, r.data + sizeof(r.rs), r.rs.data_len);
+		if (ec_checksum_buffer(r.data, sizeof(r.rs) + r.rs.data_len)) {
+			fprintf(stderr, "EC response has invalid checksum\n");
+			return -EC_RES_INVALID_CHECKSUM;
+		}
+
+		memcpy(indata, r.data + sizeof(r.rs), r.rs.data_len);
+	}
+	return r.rs.data_len;
+}
+
+static int ec_readmem_lpc_mec(int offset, int bytes, void *dest)
+{
+	int i = offset;
+	int cnt = 0;
+	char* s = dest;
+
+	if (offset >= EC_MEMMAP_SIZE - bytes)
+		return -1;
+
+	if (bytes) {
+		ec_mec_xfer(EC_MEC_READ, MEC_EC_MEMMAP_START + i, dest, bytes);
+		cnt = bytes;
+	} else {
+		/* Somewhat brute-force to set up a bunch of
+		 * individual transfers, but clearer than copying the xfer code
+		 * to add a stop condition.
+		 */
+		for(; i < EC_MEMMAP_SIZE; ++i, ++s) {
+			ec_mec_xfer(EC_MEC_READ, MEC_EC_MEMMAP_START + i, s, 1);
+			cnt++;
+			if (!*s)
+				break;
+		}
+	}
+	return cnt;
+}
+
+int comm_init_lpc_mec(void)
+{
+	char signature[2];
+
+	/* This function assumes some setup was done by comm_init_lpc. */
+
+	ec_readmem_lpc_mec(EC_MEMMAP_ID, 2, &signature[0]);
+	if (signature[0] != 'E' || signature[1] != 'C') {
+		return -1;
+	}
+
+	ec_command_proto = ec_command_lpc_mec_3;
+	ec_readmem = ec_readmem_lpc_mec;
+
+	return 0;
+}
+
+#endif