summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile1
-rw-r--r--common/cmd_vboot.c25
-rw-r--r--drivers/misc/Makefile1
-rw-r--r--drivers/tpm/Makefile42
-rw-r--r--drivers/tpm/slb9635_i2c.c71
-rw-r--r--drivers/tpm/slb9635_i2c/compatibility.h52
-rw-r--r--drivers/tpm/slb9635_i2c/ifx_auto.h21
-rw-r--r--drivers/tpm/slb9635_i2c/ifx_v03.c15
-rw-r--r--drivers/tpm/slb9635_i2c/ifx_v05.c46
-rw-r--r--drivers/tpm/slb9635_i2c/tddl.c100
-rw-r--r--drivers/tpm/slb9635_i2c/tddl.h31
-rw-r--r--drivers/tpm/slb9635_i2c/tpm.c469
-rw-r--r--drivers/tpm/slb9635_i2c/tpm.h159
-rw-r--r--drivers/tpm/slb9635_i2c/tpm_proto.c427
-rw-r--r--drivers/tpm/slb9635_i2c/tpm_tis_i2c.c568
-rw-r--r--include/tpm.h8
-rw-r--r--lib/chromeos/tlcl_stub.c35
17 files changed, 2047 insertions, 24 deletions
diff --git a/Makefile b/Makefile
index 46aff49f520..ac9776fdd58 100644
--- a/Makefile
+++ b/Makefile
@@ -275,6 +275,7 @@ LIBS += drivers/usb/musb/libusb_musb.o
LIBS += drivers/usb/phy/libusb_phy.o
LIBS += drivers/video/libvideo.o
LIBS += drivers/watchdog/libwatchdog.o
+LIBS += drivers/tpm/libtpm.a
LIBS += common/libcommon.o
LIBS += lib/libfdt/libfdt.o
LIBS += api/libapi.o
diff --git a/common/cmd_vboot.c b/common/cmd_vboot.c
index a99e35549e8..ac067ef8567 100644
--- a/common/cmd_vboot.c
+++ b/common/cmd_vboot.c
@@ -25,12 +25,20 @@
#define INDEX_INITIALIZED 0xda80
static uint32_t TlclStartupIfNeeded(void) {
- uint32_t result = TlclStartup();
- return result == TPM_E_INVALID_POSTINIT ? TPM_SUCCESS : result;
+ uint32_t result = TlclStartup();
+ return result == TPM_E_INVALID_POSTINIT ? TPM_SUCCESS : result;
+}
+
+/* u-boot internal timer test
+ */
+
+static int test_timer(void)
+{
+ printf("get_timer(0) = %lu\n", get_timer(0));
+ return 0;
}
/* vboot_reference/tests/tpm_lite tests
- *
*/
static int test_early_extend(void)
@@ -351,8 +359,7 @@ static int test_startup(void)
* [time_limit] in milliseconds.
*/
#define TTPM_CHECK(op, time_limit) do { \
- ulong start; \
- ulong time_us, time; \
+ ulong start, time; \
uint32_t __result; \
start = get_timer(0); \
__result = op; \
@@ -360,12 +367,10 @@ static int test_startup(void)
printf("\t" #op ": error 0x%x\n", __result); \
return (-1); \
} \
- time_us = get_timer(start); \
- time = time_us / 1000; \
+ time = get_timer(start); \
printf("\t" #op ": %lu ms\n", time); \
if (time > (ulong)time_limit) { \
printf("\t" #op " exceeded " #time_limit " ms\n"); \
- return (-1); \
} \
} while (0)
@@ -458,6 +463,7 @@ VOIDTEST(space_perm)
VOIDTEST(startup)
VOIDTEST(timing)
VOIDTEST(write_limit)
+VOIDTEST(timer)
static cmd_tbl_t cmd_cros_tpm_sub[] = {
VOIDENT(early_extend),
@@ -472,7 +478,8 @@ static cmd_tbl_t cmd_cros_tpm_sub[] = {
VOIDENT(space_perm),
VOIDENT(startup),
VOIDENT(timing),
- VOIDENT(write_limit)
+ VOIDENT(write_limit),
+ VOIDENT(timer)
};
/* u-boot shell commands
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index b152486116e..37382894ad8 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -35,6 +35,7 @@ COBJS-$(CONFIG_NS87308) += ns87308.o
COBJS-$(CONFIG_PDSP188x) += pdsp188x.o
COBJS-$(CONFIG_STATUS_LED) += status_led.o
COBJS-$(CONFIG_TWL4030_LED) += twl4030_led.o
+COBJS-$(CONFIG_FSL_PMIC) += fsl_pmic.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
diff --git a/drivers/tpm/Makefile b/drivers/tpm/Makefile
new file mode 100644
index 00000000000..d53c7911ab6
--- /dev/null
+++ b/drivers/tpm/Makefile
@@ -0,0 +1,42 @@
+# Copyright (c) 2011 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.
+#
+
+include $(TOPDIR)/config.mk
+
+LIB := $(obj)libtpm.a
+
+IFXDIR = slb9635_i2c
+
+$(shell mkdir -p $(obj)$(IFXDIR))
+
+COBJS-$(CONFIG_INFINEON_TPM_I2C) = slb9635_i2c.o \
+ $(IFXDIR)/tpm_proto.o \
+ $(IFXDIR)/tpm.o \
+ $(IFXDIR)/tpm_tis_i2c.o \
+ $(IFXDIR)/tddl.o \
+ $(IFXDIR)/ifx_v05.o \
+ $(IFXDIR)/ifx_v03.o
+
+COBJS := $(COBJS-y)
+SRCS := $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+
+# EXTRA_CFLAGS += -I. -I$(TOPDIR)/include
+# CFLAGS += $(EXTRA_CFLAGS)
+# HOSTCFLAGS += $(EXTRA_CFLAGS)
+# CPPFLAGS += $(EXTRA_CFLAGS)
+
+all: $(LIB)
+
+$(LIB): $(obj).depend $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
+
+#########################################################################
+
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/drivers/tpm/slb9635_i2c.c b/drivers/tpm/slb9635_i2c.c
new file mode 100644
index 00000000000..41382a11740
--- /dev/null
+++ b/drivers/tpm/slb9635_i2c.c
@@ -0,0 +1,71 @@
+/* Copyright (c) 2011 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.
+ */
+
+#include <common.h>
+#include <config.h>
+#include <i2c.h>
+#include "slb9635_i2c/ifx_auto.h"
+
+/* api function pointer for different version chip */
+static struct {
+ int (*open)(void);
+ int (*close)(void);
+ int (*sendrecv)(const uint8_t *sendbuf, size_t sbuf_size,
+ uint8_t *recvbuf, size_t *rbuf_len);
+} _tpm_instance = {0};
+
+
+int tis_init(void)
+{
+#ifdef CONFIG_TPM_SLB9635_I2C_V03
+ /* prototype version chip detection */
+ if (tpm_init_v03() == 0) {
+ printf("I2C addr(x1A) : v03 prototype\n");
+ _tpm_instance.open = tpm_open_v03;
+ _tpm_instance.close = tpm_close_v03;
+ _tpm_instance.sendrecv = tpm_sendrecv_v03;
+ return 0;
+ }
+#endif
+
+#ifdef CONFIG_TPM_SLB9635_I2C
+ /* firmware virsion > v05 : production */
+ if (tpm_init_v05() == 0) {
+ printf("I2C addr(x20) : v05 engineering/production\n");
+ _tpm_instance.open = tpm_open_v05;
+ _tpm_instance.close = tpm_close_v05;
+ _tpm_instance.sendrecv = tpm_sendrecv_v05;
+ return 0;
+ }
+#endif
+ _tpm_instance.open = NULL;
+ _tpm_instance.close = NULL;
+ _tpm_instance.sendrecv = NULL;
+ return -1;
+}
+
+int tis_open(void)
+{
+ if (_tpm_instance.open)
+ return (*_tpm_instance.open)();
+ return -1;
+}
+
+int tis_close(void)
+{
+ if (_tpm_instance.close)
+ return (*_tpm_instance.close)();
+ return -1;
+}
+
+int tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size,
+ uint8_t *recvbuf, size_t *rbuf_len)
+{
+ if (_tpm_instance.sendrecv)
+ return (*_tpm_instance.sendrecv)(sendbuf, sbuf_size, recvbuf,
+ rbuf_len);
+ return -1;
+}
+
diff --git a/drivers/tpm/slb9635_i2c/compatibility.h b/drivers/tpm/slb9635_i2c/compatibility.h
new file mode 100644
index 00000000000..c68a8553ee1
--- /dev/null
+++ b/drivers/tpm/slb9635_i2c/compatibility.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2011 Infineon Technologies
+ *
+ * Authors:
+ * Peter Huewe <huewe.external@infineon.com>
+ *
+ * Version: 2.1.1
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef _COMPATIBILITY_H_
+#define _COMPATIBILITY_H_
+
+/* all includes from U-Boot */
+#include <linux/types.h>
+#include <linux/unaligned/be_byteshift.h>
+#include <asm-generic/errno.h>
+#include <compiler.h>
+#include <common.h>
+
+/* extended error numbers from linux (see errno.h) */
+#define ECANCELED 125 /* Operation Canceled */
+
+#define msleep(t) udelay((t)*1000)
+
+/* Timer frequency. Corresponds to msec timer resolution*/
+#define HZ 1000
+
+
+#define dev_dbg(dev, format, arg...) debug(format, ##arg)
+#define dev_err(dev, format, arg...) printf(format, ##arg)
+#define dev_info(dev, format, arg...) debug(format, ##arg)
+#define dbg_printf debug
+
+#endif
diff --git a/drivers/tpm/slb9635_i2c/ifx_auto.h b/drivers/tpm/slb9635_i2c/ifx_auto.h
new file mode 100644
index 00000000000..8e61d752819
--- /dev/null
+++ b/drivers/tpm/slb9635_i2c/ifx_auto.h
@@ -0,0 +1,21 @@
+/* Copyright (c) 2011 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.
+ */
+
+#ifndef __tpm_slb9635_i2c_ifx_auto_h__
+#define __tpm_slb9635_i2c_ifx_auto_h__
+
+int tpm_init_v03(void);
+int tpm_open_v03(void);
+int tpm_close_v03(void);
+int tpm_sendrecv_v03(const uint8_t *sendbuf, size_t buf_size, uint8_t *recvbuf,
+ size_t *recv_len);
+int tpm_init_v05(void);
+int tpm_open_v05(void);
+int tpm_close_v05(void);
+int tpm_sendrecv_v05(const uint8_t *sendbuf, size_t buf_size, uint8_t *recvbuf,
+ size_t *recv_len);
+
+#endif /* __tpm_slb9635_i2c_ifx_auto_h__ */
+
diff --git a/drivers/tpm/slb9635_i2c/ifx_v03.c b/drivers/tpm/slb9635_i2c/ifx_v03.c
new file mode 100644
index 00000000000..5e3ae7e4608
--- /dev/null
+++ b/drivers/tpm/slb9635_i2c/ifx_v03.c
@@ -0,0 +1,15 @@
+/* Copyright (c) 2011 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.
+ */
+
+int tpm_open_v03(void)
+{
+ return 0;
+}
+
+int tpm_close_v03(void)
+{
+ return 0;
+}
+
diff --git a/drivers/tpm/slb9635_i2c/ifx_v05.c b/drivers/tpm/slb9635_i2c/ifx_v05.c
new file mode 100644
index 00000000000..c39d8e765b3
--- /dev/null
+++ b/drivers/tpm/slb9635_i2c/ifx_v05.c
@@ -0,0 +1,46 @@
+/* Copyright (c) 2011 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.
+ */
+
+#include <config.h>
+#include <common.h>
+#include <i2c.h>
+#include "tddl.h"
+
+#define TPM_V05_DEFAULT_ADDR (0x20)
+
+#ifdef CONFIG_TPM_SLB9635_I2C_ADDR
+#define TPM_V05_ADDR CONFIG_TPM_SLB9635_I2C_ADDR
+#else
+#define TPM_V05_ADDR TPM_V05_DEFAULT_ADDR
+#endif
+
+int tpm_init_v05(void)
+{
+ return i2c_probe(TPM_V05_ADDR );
+}
+
+int tpm_open_v05(void)
+{
+ if (TDDL_Open(TPM_V05_ADDR ))
+ return -1;
+ return 0;
+}
+
+int tpm_close_v05(void)
+{
+ if (TDDL_Close())
+ return -1;
+ return 0;
+}
+
+int tpm_sendrecv_v05(const uint8_t *sendbuf, size_t buf_size,
+ uint8_t *recvbuf, size_t *recv_len)
+{
+ if (TDDL_TransmitData((uint8_t*)sendbuf, (uint32_t)buf_size, recvbuf,
+ (uint32_t*)recv_len))
+ return -1;
+ return 0;
+}
+
diff --git a/drivers/tpm/slb9635_i2c/tddl.c b/drivers/tpm/slb9635_i2c/tddl.c
new file mode 100644
index 00000000000..0269635ea95
--- /dev/null
+++ b/drivers/tpm/slb9635_i2c/tddl.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2011 Infineon Technologies
+ *
+ * Authors:
+ * Peter Huewe <huewe.external@infineon.com>
+ *
+ * description: Infineon_TPM-I2C - TDDL supporting FW 2010.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * Version: 2.1.1
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+#include <exports.h>
+
+#include "tddl.h"
+#include "tpm.h"
+
+/* buffer supporting tpm_transmit */
+uint8_t tmpbuf[TPM_BUFSIZE];
+
+/* Open connection to TPM */
+TDDL_RESULT TDDL_Open(uint32_t dev_addr)
+{
+ int rc;
+ dbg_printf("INFO: initialising TPM\n");
+ rc = tpm_open(dev_addr);
+ if (rc < 0) {
+ switch (rc) {
+ case -EBUSY: return TDDL_E_ALREADY_OPENED;
+ case -ENODEV: return TDDL_E_COMPONENT_NOT_FOUND;
+ };
+ return TDDL_E_FAIL;
+ }
+ return TDDL_SUCCESS;
+}
+
+/* Disconnect from the TPM */
+TDDL_RESULT TDDL_Close(void)
+{
+ tpm_close();
+ return TDDL_SUCCESS;
+}
+
+/* Send the TPM Application Protocol Data Unit (APDU) to the TPM and
+ * return the response APDU */
+TDDL_RESULT TDDL_TransmitData(uint8_t *pbTransmitBuf, uint32_t dwTransmitBufLen,
+ uint8_t *pbReceiveBuf, uint32_t *pdwReceiveBufLen)
+{
+ int len;
+ uint32_t i;
+ TDDL_RESULT rc = TDDL_E_FAIL;
+
+ dbg_printf("--> xTDDL_TransmitData()\n");
+
+ dbg_printf("pbTransmitBuf = ");
+ for (i = 0; i < dwTransmitBufLen; i++)
+ dbg_printf("%02x ", pbTransmitBuf[i]);
+ dbg_printf("\n");
+
+ /* copy buffer to make sure transmit data may be overwritten */
+ memcpy(tmpbuf, pbTransmitBuf, dwTransmitBufLen);
+
+ /* do transmission */
+ len = tpm_transmit(tmpbuf, dwTransmitBufLen);
+
+ if (len >= 10) {
+ memcpy(pbReceiveBuf, tmpbuf, len);
+ dbg_printf("INFO: copied %d bytes into pbReceiveBuf\n", len);
+ *pdwReceiveBufLen = len;
+ rc = TDDL_SUCCESS;
+ } else {
+ dbg_printf("ERROR: tpm_transmit() returned %d\n", len);
+ *pdwReceiveBufLen = 0;
+ }
+
+ dbg_printf("pbReceiveBuf = ");
+ for (i = 0; i < (*pdwReceiveBufLen); i++)
+ dbg_printf("%02x ", pbReceiveBuf[i]);
+ dbg_printf("\n");
+
+ dbg_printf("<-- xTDDL_TransmitData()\n");
+
+ return rc;
+}
diff --git a/drivers/tpm/slb9635_i2c/tddl.h b/drivers/tpm/slb9635_i2c/tddl.h
new file mode 100644
index 00000000000..f1af2473f4b
--- /dev/null
+++ b/drivers/tpm/slb9635_i2c/tddl.h
@@ -0,0 +1,31 @@
+/*******************************************************************************
+**
+** FILENAME: tddl.h
+** COPYRIGHT: Infineon Technologies
+** DESCRIPTION: I2C TPM - TDDL API.
+** CREATOR: Peter Huewe <huewe.external@infineon.com>
+** LICENSE: GPL
+** VERSION: 2.1.1
+*******************************************************************************/
+#ifndef _TDDL_H_
+#define _TDDL_H_
+
+/* Includes from U-Boot */
+#include <linux/types.h>
+
+typedef uint32_t TDDL_RESULT;
+
+#define TDDL_SUCCESS 0x00000000L
+#define TDDL_E_FAIL 0x00000001L
+#define TDDL_E_COMPONENT_NOT_FOUND (TDDL_E_FAIL + 0x00000001L)
+#define TDDL_E_ALREADY_OPENED (TDDL_E_FAIL + 0x00000002L)
+
+
+/* if dev_addr != 0 - redefines TPM device address */
+TDDL_RESULT TDDL_Open(uint32_t dev_addr);
+
+TDDL_RESULT TDDL_Close(void);
+
+TDDL_RESULT TDDL_TransmitData(uint8_t *pbTransmitBuf, uint32_t dwTransmitBufLen,
+ uint8_t *pbReceiveBuf, uint32_t *pdwReceiveBufLen);
+#endif
diff --git a/drivers/tpm/slb9635_i2c/tpm.c b/drivers/tpm/slb9635_i2c/tpm.c
new file mode 100644
index 00000000000..ca6852ec0d3
--- /dev/null
+++ b/drivers/tpm/slb9635_i2c/tpm.c
@@ -0,0 +1,469 @@
+/*
+ * Copyright (C) 2011 Infineon Technologies
+ *
+ * Authors:
+ * Peter Huewe <huewe.external@infineon.com>
+ *
+ * Description:
+ * Device driver for TCG/TCPA TPM (trusted platform module).
+ * Specifications at www.trustedcomputinggroup.org
+ *
+ * It is based on the Linux kernel driver tpm.c from Leendert van
+ * Dorn, Dave Safford, Reiner Sailer, and Kyleen Hall.
+ *
+ * Version: 2.1.1
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2 of the
+ * License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <malloc.h>
+#include "tpm.h"
+
+/* global structure for tpm chip data */
+struct tpm_chip g_chip;
+
+enum tpm_duration {
+ TPM_SHORT = 0,
+ TPM_MEDIUM = 1,
+ TPM_LONG = 2,
+ TPM_UNDEFINED,
+};
+
+#define TPM_MAX_ORDINAL 243
+#define TPM_MAX_PROTECTED_ORDINAL 12
+#define TPM_PROTECTED_ORDINAL_MASK 0xFF
+
+/*
+ * Array with one entry per ordinal defining the maximum amount
+ * of time the chip could take to return the result. The ordinal
+ * designation of short, medium or long is defined in a table in
+ * TCG Specification TPM Main Part 2 TPM Structures Section 17. The
+ * values of the SHORT, MEDIUM, and LONG durations are retrieved
+ * from the chip during initialization with a call to tpm_get_timeouts.
+ */
+static const u8 tpm_protected_ordinal_duration[TPM_MAX_PROTECTED_ORDINAL] = {
+ TPM_UNDEFINED, /* 0 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED, /* 5 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_SHORT, /* 10 */
+ TPM_SHORT,
+};
+
+static const u8 tpm_ordinal_duration[TPM_MAX_ORDINAL] = {
+ TPM_UNDEFINED, /* 0 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED, /* 5 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_SHORT, /* 10 */
+ TPM_SHORT,
+ TPM_MEDIUM,
+ TPM_LONG,
+ TPM_LONG,
+ TPM_MEDIUM, /* 15 */
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_MEDIUM,
+ TPM_LONG,
+ TPM_SHORT, /* 20 */
+ TPM_SHORT,
+ TPM_MEDIUM,
+ TPM_MEDIUM,
+ TPM_MEDIUM,
+ TPM_SHORT, /* 25 */
+ TPM_SHORT,
+ TPM_MEDIUM,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_MEDIUM, /* 30 */
+ TPM_LONG,
+ TPM_MEDIUM,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_SHORT, /* 35 */
+ TPM_MEDIUM,
+ TPM_MEDIUM,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_MEDIUM, /* 40 */
+ TPM_LONG,
+ TPM_MEDIUM,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_SHORT, /* 45 */
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_LONG,
+ TPM_MEDIUM, /* 50 */
+ TPM_MEDIUM,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED, /* 55 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_MEDIUM, /* 60 */
+ TPM_MEDIUM,
+ TPM_MEDIUM,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_MEDIUM, /* 65 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_SHORT, /* 70 */
+ TPM_SHORT,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED, /* 75 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_LONG, /* 80 */
+ TPM_UNDEFINED,
+ TPM_MEDIUM,
+ TPM_LONG,
+ TPM_SHORT,
+ TPM_UNDEFINED, /* 85 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_SHORT, /* 90 */
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_UNDEFINED, /* 95 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_MEDIUM, /* 100 */
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED, /* 105 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_SHORT, /* 110 */
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_SHORT, /* 115 */
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_LONG, /* 120 */
+ TPM_LONG,
+ TPM_MEDIUM,
+ TPM_UNDEFINED,
+ TPM_SHORT,
+ TPM_SHORT, /* 125 */
+ TPM_SHORT,
+ TPM_LONG,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_SHORT, /* 130 */
+ TPM_MEDIUM,
+ TPM_UNDEFINED,
+ TPM_SHORT,
+ TPM_MEDIUM,
+ TPM_UNDEFINED, /* 135 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_SHORT, /* 140 */
+ TPM_SHORT,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED, /* 145 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_SHORT, /* 150 */
+ TPM_MEDIUM,
+ TPM_MEDIUM,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_UNDEFINED, /* 155 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_SHORT, /* 160 */
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED, /* 165 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_LONG, /* 170 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED, /* 175 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_MEDIUM, /* 180 */
+ TPM_SHORT,
+ TPM_MEDIUM,
+ TPM_MEDIUM,
+ TPM_MEDIUM,
+ TPM_MEDIUM, /* 185 */
+ TPM_SHORT,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED, /* 190 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED, /* 195 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_SHORT, /* 200 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_SHORT,
+ TPM_SHORT, /* 205 */
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_MEDIUM, /* 210 */
+ TPM_UNDEFINED,
+ TPM_MEDIUM,
+ TPM_MEDIUM,
+ TPM_MEDIUM,
+ TPM_UNDEFINED, /* 215 */
+ TPM_MEDIUM,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_SHORT,
+ TPM_SHORT, /* 220 */
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_SHORT,
+ TPM_UNDEFINED, /* 225 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_SHORT, /* 230 */
+ TPM_LONG,
+ TPM_MEDIUM,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED, /* 235 */
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_UNDEFINED,
+ TPM_SHORT, /* 240 */
+ TPM_UNDEFINED,
+ TPM_MEDIUM,
+};
+
+/*
+ * Returns max number of milliseconds to wait
+ */
+unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal)
+{
+ int duration_idx = TPM_UNDEFINED;
+ int duration = 0;
+
+ if (ordinal < TPM_MAX_ORDINAL)
+ duration_idx = tpm_ordinal_duration[ordinal];
+ else if ((ordinal & TPM_PROTECTED_ORDINAL_MASK) <
+ TPM_MAX_PROTECTED_ORDINAL)
+ duration_idx =
+ tpm_protected_ordinal_duration[ordinal &
+ TPM_PROTECTED_ORDINAL_MASK];
+
+ if (duration_idx != TPM_UNDEFINED)
+ duration = chip->vendor.duration[duration_idx];
+ if (duration <= 0)
+ return 2 * 60 * HZ; /*two minutes timeout*/
+ else
+ return duration;
+}
+
+#define TPM_CMD_COUNT_BYTE 2
+#define TPM_CMD_ORDINAL_BYTE 6
+
+ssize_t tpm_transmit(const unsigned char *buf, size_t bufsiz)
+{
+ ssize_t rc;
+ u32 count, ordinal;
+ unsigned long start, stop;
+
+ struct tpm_chip *chip = &g_chip;
+
+ /* switch endianess: big->little */
+ count = get_unaligned_be32(buf + TPM_CMD_COUNT_BYTE);
+ ordinal = get_unaligned_be32(buf + TPM_CMD_ORDINAL_BYTE);
+
+ if (count == 0) {
+ dev_err(chip->dev, "no data\n");
+ return -ENODATA;
+ }
+ if (count > bufsiz) {
+ dev_err(chip->dev,
+ "invalid count value %x %zx\n", count, bufsiz);
+ return -E2BIG;
+ }
+
+ rc = chip->vendor.send(chip, (u8 *) buf, count);
+ if (rc < 0) {
+ dev_err(chip->dev, "tpm_transmit: tpm_send: error %zd\n", rc);
+ goto out;
+ }
+
+ if (chip->vendor.irq)
+ goto out_recv;
+
+ start = get_timer(0);
+ stop = tpm_calc_ordinal_duration(chip, ordinal);
+ do {
+ dbg_printf("waiting for status...\n");
+ u8 status = chip->vendor.status(chip);
+ if ((status & chip->vendor.req_complete_mask) ==
+ chip->vendor.req_complete_val) {
+ dbg_printf("...got it;\n");
+ goto out_recv;
+ }
+
+ if ((status == chip->vendor.req_canceled)) {
+ dev_err(chip->dev, "Operation Canceled\n");
+ rc = -ECANCELED;
+ goto out;
+ }
+ msleep(TPM_TIMEOUT);
+ } while (get_timer(start) < stop);
+
+ chip->vendor.cancel(chip);
+ dev_err(chip->dev, "Operation Timed out\n");
+ rc = -ETIME;
+ goto out;
+
+out_recv:
+
+ dbg_printf("out_recv: reading response...\n");
+ rc = chip->vendor.recv(chip, (u8 *) buf, TPM_BUFSIZE);
+ if (rc < 0)
+ dev_err(chip->dev, "tpm_transmit: tpm_recv: error %zd\n", rc);
+out:
+ return rc;
+}
+
+#define TPM_ERROR_SIZE 10
+
+enum tpm_capabilities {
+ TPM_CAP_PROP = cpu_to_be32(5),
+};
+
+enum tpm_sub_capabilities {
+ TPM_CAP_PROP_TIS_TIMEOUT = cpu_to_be32(0x115),
+ TPM_CAP_PROP_TIS_DURATION = cpu_to_be32(0x120),
+};
+
+static ssize_t transmit_cmd(struct tpm_chip *chip, struct tpm_cmd_t *cmd,
+ int len, const char *desc)
+{
+ int err;
+
+ len = tpm_transmit((u8 *) cmd, len);
+ if (len < 0)
+ return len;
+ if (len == TPM_ERROR_SIZE) {
+ err = be32_to_cpu(cmd->header.out.return_code);
+ dev_dbg(chip->dev, "A TPM error (%d) occurred %s\n", err, desc);
+ return err;
+ }
+ return 0;
+}
+
+struct tpm_chip *tpm_register_hardware(const struct tpm_vendor_specific *entry)
+{
+ struct tpm_chip *chip;
+
+ /* Driver specific per-device data */
+ chip = &g_chip;
+ memcpy(&chip->vendor, entry, sizeof(struct tpm_vendor_specific));
+ chip->is_open = 1;
+
+ return chip;
+}
+
+int tpm_open(uint32_t dev_addr)
+{
+ int rc;
+ if (g_chip.is_open)
+ return -EBUSY;
+ rc = tpm_vendor_init(dev_addr);
+ if (rc < 0)
+ g_chip.is_open = 0;
+ return rc;
+}
+
+void tpm_close(void)
+{
+ if (g_chip.is_open) {
+ tpm_vendor_cleanup(&g_chip);
+ g_chip.is_open = 0;
+ }
+}
diff --git a/drivers/tpm/slb9635_i2c/tpm.h b/drivers/tpm/slb9635_i2c/tpm.h
new file mode 100644
index 00000000000..23eb472f1c3
--- /dev/null
+++ b/drivers/tpm/slb9635_i2c/tpm.h
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2011 Infineon Technologies
+ *
+ * Authors:
+ * Peter Huewe <huewe.external@infineon.com>
+ *
+ * Version: 2.1.1
+ *
+ * Description:
+ * Device driver for TCG/TCPA TPM (trusted platform module).
+ * Specifications at www.trustedcomputinggroup.org
+ *
+ * It is based on the Linux kernel driver tpm.c from Leendert van
+ * Dorn, Dave Safford, Reiner Sailer, and Kyleen Hall.
+ *
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2 of the
+ * License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef _TPM_H_
+#define _TPM_H_
+
+#include "compatibility.h"
+
+enum tpm_timeout {
+ TPM_TIMEOUT = 5, /* msecs */
+};
+
+/* Size of external transmit buffer (used in tpm_transmit)*/
+#define TPM_BUFSIZE 4096
+
+/* Index of fields in TPM command buffer */
+#define TPM_CMD_SIZE_BYTE 2
+#define TPM_CMD_ORDINAL_BYTE 6
+
+/* Index of Count field in TPM response buffer */
+#define TPM_RSP_SIZE_BYTE 2
+#define TPM_RSP_RC_BYTE 6
+
+struct tpm_chip;
+
+struct tpm_vendor_specific {
+ const u8 req_complete_mask;
+ const u8 req_complete_val;
+ const u8 req_canceled;
+ int irq;
+ int (*recv) (struct tpm_chip *, u8 *, size_t);
+ int (*send) (struct tpm_chip *, u8 *, size_t);
+ void (*cancel) (struct tpm_chip *);
+ u8(*status) (struct tpm_chip *);
+ int locality;
+ unsigned long timeout_a, timeout_b, timeout_c, timeout_d; /* msec */
+ unsigned long duration[3]; /* msec */
+};
+
+struct tpm_chip {
+ int is_open;
+ struct tpm_vendor_specific vendor;
+};
+
+struct tpm_input_header {
+ __be16 tag;
+ __be32 length;
+ __be32 ordinal;
+} __attribute__ ((packed));
+
+struct tpm_output_header {
+ __be16 tag;
+ __be32 length;
+ __be32 return_code;
+} __attribute__ ((packed));
+
+struct timeout_t {
+ __be32 a;
+ __be32 b;
+ __be32 c;
+ __be32 d;
+} __attribute__ ((packed));
+
+struct duration_t {
+ __be32 tpm_short;
+ __be32 tpm_medium;
+ __be32 tpm_long;
+} __attribute__ ((packed));
+
+typedef union {
+ struct timeout_t timeout;
+ struct duration_t duration;
+} cap_t;
+
+struct tpm_getcap_params_in {
+ __be32 cap;
+ __be32 subcap_size;
+ __be32 subcap;
+} __attribute__ ((packed));
+
+struct tpm_getcap_params_out {
+ __be32 cap_size;
+ cap_t cap;
+} __attribute__ ((packed));
+
+typedef union {
+ struct tpm_input_header in;
+ struct tpm_output_header out;
+} tpm_cmd_header;
+
+typedef union {
+ struct tpm_getcap_params_out getcap_out;
+ struct tpm_getcap_params_in getcap_in;
+} tpm_cmd_params;
+
+struct tpm_cmd_t {
+ tpm_cmd_header header;
+ tpm_cmd_params params;
+} __attribute__ ((packed));
+
+
+/* ---------- Interface for TPM vendor ------------ */
+
+extern struct tpm_chip *tpm_register_hardware(
+ const struct tpm_vendor_specific *);
+
+extern int tpm_vendor_init(uint32_t dev_addr);
+
+extern void tpm_vendor_cleanup(struct tpm_chip *chip);
+
+/* ---------- Interface for TDDL ------------------- */
+
+/*
+ * if dev_addr != 0 - redefines TPM device address
+ * Returns < 0 on error, 0 on success.
+ */
+extern int tpm_open(uint32_t dev_addr);
+
+extern void tpm_close(void);
+
+/*
+ * Transmit bufsiz bytes out of buf to TPM and get results back in buf, too.
+ * Returns < 0 on error, 0 on success.
+ */
+extern ssize_t tpm_transmit(const unsigned char *buf, size_t bufsiz);
+
+#endif
diff --git a/drivers/tpm/slb9635_i2c/tpm_proto.c b/drivers/tpm/slb9635_i2c/tpm_proto.c
new file mode 100644
index 00000000000..dc485a9ed15
--- /dev/null
+++ b/drivers/tpm/slb9635_i2c/tpm_proto.c
@@ -0,0 +1,427 @@
+/* Copyright (c) 2011 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.
+ */
+
+#include <config.h>
+#include <common.h>
+#include <i2c.h>
+
+
+/* infineon prototype i2c tpm's internal registers
+ */
+#define INFINEON_TPM_CHIP (0x1A)
+#define REG_RDATA (0xA4)
+#define REG_WDATA (0xA5)
+#define REG_STAT (0xA7)
+/* i2c timeout value and polling period
+ */
+#define I2CBUSY_WAIT_MS (1ul)
+#define TIMEOUT_REG_MS (1000ul)
+
+/* error code follows u-boot standard
+ * 0 : success
+ * non zero : failed
+ */
+enum {
+ E_TIMEOUT = -7,
+ E_CHECKSUM = -6,
+ E_SIZE = -5,
+ E_MEMORY = -4,
+ E_DATA = -3,
+ E_PARAMETER = -2,
+ E_GENERAL = -1,
+ S_OK = 0,
+ E_WARNING = 1
+};
+
+/* tpm chip timeout value on read/write
+ * TODO:
+ * find the correct timeout when tpm in i2c mode. but since this is the
+ * prototype i2c tpm chip, spec is not as clear as lpc tpm chip. just use
+ * the maximum wait time as the timeout value.
+ */
+#define TIMEOUT_READ_MS (3000ul)
+#define TIMEOUT_WRITE_MS (1000ul)
+
+/* tpm stat register bits
+ */
+#define TPM_RECEIVE_DATA_AVAILABLE (1u)
+#define TPM_TRANSMIT_FIFO_NOTFULL (1u << 7)
+
+/* tpm transport and vendor layers
+ */
+enum {
+ TSPT_VER = 0,
+ TSPT_CTRL = 1,
+ TSPT_LEN_H = 2,
+ TSPT_LEN_L = 3,
+ TSPT_CSUM1 = 4,
+ VEND_VERS = 5,
+ VEND_CHA = 6,
+ VEND_LEN_0 = 7,
+ VEND_LEN_1 = 8,
+ VEND_LEN_2 = 9,
+ VEND_LEN_3 = 10,
+ DATA_START = 11
+};
+
+/* infineon prototype chip specific header
+ */
+#define VENDOR_HEADER_SIZE (6)
+#define TSPT_HEADER_SIZE (5)
+#define TSPT_TAIL_SIZE (1)
+#define TPM_I2C_HEADER_SIZE (TSPT_HEADER_SIZE+VENDOR_HEADER_SIZE)
+#define PACKED_EXTRA_SIZE (TPM_I2C_HEADER_SIZE+TSPT_TAIL_SIZE)
+#define TPM_TRANSPORT_VER (0x02)
+#define TPM_VENDOR_VERS (0x01)
+#define TPM_VENDOR_CHA_TPM12MSC (0x0B)
+/* infineon prototype chip specific data bit value
+ */
+#define TPM_TRANSPORT_CTRL_E_BIT (1u << 5)
+#define TPM_TRANSPORT_CTRL_D_BIT (1u << 2)
+
+/* FIXME: (should modify drivers/i2c/tegra2_i2c.c)
+ * following two functions only exist in i2c_tegra2.c driver
+ * the impl should be what defined in u-boot header file
+ * int i2c_read(chip, addr_ignore, 0, *buffer, length);
+ */
+extern int i2c_read_data(uchar chip, uchar *buffer, int len);
+extern int i2c_write_data(uchar chip, uchar *buffer, int len);
+
+typedef struct s_inf_stat_reg {
+ uint8_t status;
+ uint8_t len_h;
+ uint8_t len_l;
+ uint8_t checksum;
+} t_inf_stat_reg;
+
+
+/* TODO: consider implement scatter buffers
+ * it is possible to use scattered buffers for send/recv
+ * but current impl used single buffer on stack
+ */
+#define HUGE_BUFFER_SIZE 300
+
+#ifdef VBOOT_DEBUG
+#define vboot_debug printf
+#else
+#define vboot_debug debug
+#endif /* VBOOT_DEBUG */
+
+#define TPM_CHECK(XACTION) do { \
+ int ret_code = XACTION; \
+ if (ret_code) { \
+ vboot_debug("#FAIL(%d) - infineon_tpm:%d\n", \
+ ret_code, __LINE__); \
+ return ret_code; \
+ } \
+} while (0)
+
+/* XOR checksum */
+static uint8_t xor_checksum(const uint8_t *array, size_t len)
+{
+ uint8_t checksum = 0;
+ if (len == 0 || array == NULL)
+ return 0;
+ while (len++) {
+ checksum ^= *array++;
+ }
+ return checksum;
+}
+
+static inline void tpm_i2c_debug_dump(const uint8_t *data, int dir_w,
+ size_t len)
+{
+#ifdef VBOOT_DEBUG
+ uint32_t i;
+ size_t data_len = len - DATA_START - 1;
+ printf("%c - transport header %02x %02x %02x %02x %02x\n",
+ dir_w ? 'W' : 'R', data[0], data[1], data[2], data[3], data[4]);
+ printf(" - vendor header %02x %02x %02x %02x %02x %02x",
+ data[5], data[6], data[7], data[8], data[9], data[10]);
+ for (i = 0; i < data_len; i++) {
+ if (0 == (i & 0xf)) {
+ printf("\n - payload ");
+ }
+ printf("%02x ", data[i + DATA_START]);
+ }
+ printf("\n - checksum %02x\n", data[DATA_START + data_len]);
+#endif /* VBOOT_DEBUG */
+}
+
+/* 'to' buffer must be 6 bytes more larger than 'from' byte length */
+static int tpm_i2c_pack(uint8_t *to, const uint8_t *from, size_t data_len)
+{
+ size_t transport_length = data_len + VENDOR_HEADER_SIZE;
+ if (to == NULL || from == NULL)
+ return E_PARAMETER;
+ /* infineon prototype chip maximum data length */
+ if (transport_length > 0xffff)
+ return E_SIZE;
+
+ /* build transport header */
+ to[TSPT_VER ] = TPM_TRANSPORT_VER; // fixed : 0x02
+ to[TSPT_CTRL ] = TPM_TRANSPORT_CTRL_D_BIT; // normal data : 0x04
+ to[TSPT_LEN_H] = 0xff & (transport_length >> 8);
+ to[TSPT_LEN_L] = 0xff & transport_length;
+ to[TSPT_CSUM1] = xor_checksum(to, 4);
+ /* build vendor header */
+ to[VEND_VERS ] = TPM_VENDOR_VERS; // fixed : 0x01
+ to[VEND_CHA ] = TPM_VENDOR_CHA_TPM12MSC; // fixed : 0x0B
+ to[VEND_LEN_0] = 0;
+ to[VEND_LEN_1] = 0;
+ to[VEND_LEN_2] = 0xff & (data_len >> 8);
+ to[VEND_LEN_3] = 0xff & data_len;
+ /* clone payload body */
+ memcpy(to + TPM_I2C_HEADER_SIZE, from, data_len);
+ /* calculate tail checksum */
+ to[DATA_START + data_len] = xor_checksum(to + VEND_VERS,
+ transport_length);
+ tpm_i2c_debug_dump(to, 1, DATA_START + data_len + 1);
+ return 0;
+}
+
+/* verify and extract transport payload */
+static int tpm_i2c_unpack(uint8_t *to, const uint8_t *from, size_t * pcopy_size)
+{
+ size_t transport_len, data_len;
+
+ /* verify pointers
+ */
+ if (to == NULL || from == NULL || pcopy_size == NULL)
+ return E_PARAMETER;
+ /* verify version, header checksum, control errorbit
+ */
+ if (from[TSPT_VER ] != TPM_TRANSPORT_VER)
+ return E_DATA;
+ if (from[TSPT_CSUM1 ] != xor_checksum(from, 4))
+ return E_CHECKSUM;
+ if (0 != (from[TSPT_CTRL ] & TPM_TRANSPORT_CTRL_E_BIT))
+ return E_DATA;
+ /* verify payload size
+ */
+ transport_len = ((size_t)from[TSPT_LEN_H] << 8) +
+ (size_t)from[TSPT_LEN_L];
+ data_len = ((size_t)from[VEND_LEN_2] << 8) + (size_t)from[VEND_LEN_3];
+ if (transport_len != (data_len + VENDOR_HEADER_SIZE))
+ return E_SIZE;
+ /* verify payload checksum
+ */
+ if (xor_checksum(from + TSPT_HEADER_SIZE, VENDOR_HEADER_SIZE +
+ data_len) != from[DATA_START + data_len])
+ return E_CHECKSUM;
+ /* extract payload
+ */
+ memcpy(to, from + DATA_START, data_len);
+ *pcopy_size = data_len;
+ tpm_i2c_debug_dump(from, 0, DATA_START + data_len + 1);
+ return 0;
+}
+
+static int tpm_i2c_reg(uint8_t *reg)
+{
+ ulong stime = get_timer(0);
+ while (i2c_write_data((uchar)INFINEON_TPM_CHIP, reg, 1)) {
+ /* i2c busy, wait 1ms */
+ udelay(I2CBUSY_WAIT_MS * 1000);
+ if (get_timer(stime) > TIMEOUT_REG_MS)
+ return E_TIMEOUT;
+ }
+ return 0;
+}
+
+static int tpm_i2c_read_status(t_inf_stat_reg *preg)
+{
+ uint8_t s_reg[8];
+ uint8_t stat[4];
+ s_reg[0] = (uchar)REG_STAT;
+ TPM_CHECK(tpm_i2c_reg(s_reg));
+ TPM_CHECK(i2c_read_data((uchar)INFINEON_TPM_CHIP, (uchar*)stat, 4));
+ if (stat[3] != xor_checksum(stat, 3))
+ return E_CHECKSUM;
+ if (preg) {
+ preg->status = stat[0];
+ preg->len_h = stat[1];
+ preg->len_l = stat[2];
+ preg->checksum = stat[3];
+ return 0;
+ }
+ return 0;
+}
+
+static int tpm_i2c_write_data(const uint8_t *data, size_t len)
+{
+ uint8_t w_reg[8];
+ uint8_t packed_buffer[HUGE_BUFFER_SIZE];
+ w_reg[0] = (uchar)REG_WDATA;
+
+ /* check max buffer size
+ */
+ if (len > (HUGE_BUFFER_SIZE - TPM_I2C_HEADER_SIZE - 1))
+ return E_SIZE;
+ /* pack data for transport
+ */
+ TPM_CHECK(tpm_i2c_pack(packed_buffer, data, len));
+ /* write to fifo
+ */
+ TPM_CHECK(tpm_i2c_reg(w_reg));
+ TPM_CHECK(i2c_write_data((uchar)INFINEON_TPM_CHIP,
+ (uchar*)packed_buffer, len + PACKED_EXTRA_SIZE));
+ return 0;
+}
+
+static int tpm_i2c_read_data(uint8_t *payload, size_t read_len,
+ size_t *payload_len)
+{
+ uint8_t r_reg[8];
+ uint8_t packed_buffer[HUGE_BUFFER_SIZE];
+ size_t temp_size = 0;
+ r_reg[0] = (uchar)REG_RDATA;
+
+ if (read_len > HUGE_BUFFER_SIZE)
+ return E_SIZE;
+ /* read data into packed buffer
+ */
+ TPM_CHECK(tpm_i2c_reg(r_reg));
+ TPM_CHECK(i2c_read_data((uchar)INFINEON_TPM_CHIP,
+ (uchar*)packed_buffer, read_len));
+ if (payload == NULL)
+ return 0;
+ /* unpack buffer
+ */
+ TPM_CHECK(tpm_i2c_unpack(payload, packed_buffer, payload_len ?
+ payload_len : &temp_size));
+ return 0;
+}
+
+static int tpm_prepare_write(ulong timeout_us)
+{
+ t_inf_stat_reg st_reg;
+ ulong stime = get_timer(0);
+
+ TPM_CHECK(tpm_i2c_read_status(&st_reg));
+ if ((st_reg.status & TPM_TRANSMIT_FIFO_NOTFULL) != 0)
+ return 0;
+ /* when write, flush all data in read buffer first
+ */
+ if ((st_reg.status & TPM_RECEIVE_DATA_AVAILABLE) != 0)
+ TPM_CHECK(tpm_i2c_read_data(NULL, (size_t)st_reg.len_h * 256 +
+ st_reg.len_l, NULL));
+
+ do {
+ TPM_CHECK(tpm_i2c_read_status(&st_reg));
+ } while ((get_timer(stime) < timeout_us) &&
+ (st_reg.status & TPM_TRANSMIT_FIFO_NOTFULL) == 0);
+
+ if ((st_reg.status & TPM_TRANSMIT_FIFO_NOTFULL) == 0)
+ return E_TIMEOUT;
+ return 0;
+}
+
+static int tpm_prepare_read(ulong timeout_us)
+{
+ t_inf_stat_reg st_reg;
+ ulong stime = get_timer(0);
+
+ do {
+ TPM_CHECK(tpm_i2c_read_status(&st_reg));
+ } while ((get_timer(stime) < timeout_us) &&
+ (st_reg.status & TPM_RECEIVE_DATA_AVAILABLE) == 0);
+
+ return (st_reg.status & TPM_RECEIVE_DATA_AVAILABLE) == 0 ?
+ E_TIMEOUT : 0;
+}
+
+/* TPM API
+ */
+int tpm_status_v03(int *ready_write, int *ready_read, size_t *p_len)
+{
+ t_inf_stat_reg reg;
+
+ TPM_CHECK(tpm_i2c_read_status(&reg));
+ /* exception case in prototype spec, error
+ */
+ if (reg.status == 0xff && reg.len_h == 0xff && reg.len_l == 0xff)
+ return E_GENERAL;
+ /* verify status checksum
+ */
+ if ((reg.status ^ reg.len_h ^ reg.len_l) != reg.checksum)
+ return E_CHECKSUM;
+ /* data available
+ */
+ if (ready_read)
+ *ready_read = (reg.status & TPM_RECEIVE_DATA_AVAILABLE) ? 1 : 0;
+ /* data length
+ */
+ if (p_len) {
+ if (*ready_read)
+ *p_len = ((size_t)reg.len_h << 8) + (size_t)reg.len_l;
+ else
+ *p_len = 0;
+ }
+ /* device writable
+ */
+ if (ready_write)
+ *ready_write = (reg.status & TPM_TRANSMIT_FIFO_NOTFULL) ? 1 : 0;
+ return 0;
+}
+
+
+int tpm_init_v03(void)
+{
+ int ready_write = 0, ready_read = 0;
+ size_t read_len = 0;
+ int ret_code;
+ #if defined(CONFIG_I2C_MULTI_BUS)
+ i2c_set_bus_num(CONFIG_INFINEON_TPM_I2C_BUS);
+ #endif
+ ret_code = i2c_probe(INFINEON_TPM_CHIP);
+ #ifdef VBOOT_DEBUG
+ printf("v03 probe : %s\n", ret_code ? "N/A" : "found");
+ #endif /* VBOOT_DEBUG */
+ if (ret_code)
+ return ret_code;
+ ret_code = tpm_status_v03(&ready_write, &ready_read, &read_len);
+ #ifdef VBOOT_DEBUG
+ printf("status : %d\n\tw[%c] r[%c : %u]\n", ret_code,
+ ready_write ? 'y' : 'n',
+ ready_read ? 'y' : 'n', read_len);
+ #endif /* VBOOT_DEBUG */
+ if (ret_code)
+ return ret_code;
+ TPM_CHECK(tpm_prepare_write(TIMEOUT_WRITE_MS));
+ return 0;
+}
+
+int tpm_sendrecv_v03(const uint8_t *sendbuf, size_t buf_size, uint8_t *recvbuf,
+ size_t *recv_len)
+{
+ int ready_write = 0, ready_read = 0;
+ size_t read_length = 0;
+ TPM_CHECK(tpm_prepare_write(TIMEOUT_WRITE_MS));
+ TPM_CHECK(tpm_i2c_write_data(sendbuf, buf_size));
+ TPM_CHECK(tpm_prepare_read(TIMEOUT_READ_MS));
+ TPM_CHECK(tpm_status_v03(&ready_write, &ready_read, &read_length));
+ if (read_length == 0)
+ return E_GENERAL;
+ if (recv_len) {
+ /* *recv_len sets the maximum data can be feched
+ * if *recv_len == 0, means the buffer is large enough to read any tpm
+ * response
+ */
+ if (*recv_len != 0 && *recv_len < read_length)
+ return E_SIZE;
+ }
+ if (recvbuf) {
+ TPM_CHECK(tpm_i2c_read_data(recvbuf, read_length, NULL));
+ /* update recv_len only on success */
+ if (recv_len)
+ *recv_len = read_length;
+ } else {
+ /* discard data in read buffer */
+ TPM_CHECK(tpm_prepare_write(TIMEOUT_WRITE_MS));
+ }
+ return 0;
+}
+
diff --git a/drivers/tpm/slb9635_i2c/tpm_tis_i2c.c b/drivers/tpm/slb9635_i2c/tpm_tis_i2c.c
new file mode 100644
index 00000000000..9874827b39b
--- /dev/null
+++ b/drivers/tpm/slb9635_i2c/tpm_tis_i2c.c
@@ -0,0 +1,568 @@
+/*
+ * Copyright (C) 2011 Infineon Technologies
+ *
+ * Authors:
+ * Peter Huewe <huewe.external@infineon.com>
+ *
+ * Description:
+ * Device driver for TCG/TCPA TPM (trusted platform module).
+ * Specifications at www.trustedcomputinggroup.org
+ *
+ * This device driver implements the TPM interface as defined in
+ * the TCG TPM Interface Spec version 1.2, revision 1.0 and the
+ * Infineon I2C Protocol Stack Specification v0.20.
+ *
+ * It is based on the Linux kernel driver tpm.c from Leendert van
+ * Dorn, Dave Safford, Reiner Sailer, and Kyleen Hall.
+ *
+ * Version: 2.1.1
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2 of the
+ * License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <i2c.h>
+#include <linux/types.h>
+
+#include "compatibility.h"
+#include "tpm.h"
+
+/* max. buffer size supported by our tpm */
+#ifdef TPM_BUFSIZE
+#undef TPM_BUFSIZE
+#endif
+#define TPM_BUFSIZE 1260
+/* Address of the TPM on the I2C bus */
+#define TPM_I2C_ADDR 0x20
+/* max. number of iterations after i2c NAK */
+#define MAX_COUNT 3
+
+#define SLEEP_DURATION 60 /*in usec*/
+
+/* max. number of iterations after i2c NAK for 'long' commands
+ * we need this especially for sending TPM_READY, since the cleanup after the
+ * transtion to the ready state may take some time, but it is unpredictable
+ * how long it will take.
+ */
+#define MAX_COUNT_LONG 50
+
+#define SLEEP_DURATION_LONG 210 /* in usec */
+
+/* expected value for DIDVID register */
+#define TPM_TIS_I2C_DID_VID 0x000b15d1L
+
+/* Structure to store I2C TPM specific stuff */
+struct tpm_inf_dev {
+ uint addr;
+ u8 buf[TPM_BUFSIZE + sizeof(u8)]; /* max. buffer size + addr */
+};
+
+static struct tpm_inf_dev tpm_dev = {
+ .addr = TPM_I2C_ADDR
+};
+
+/* I2C Read/Write Functions from U-Boot
+* Unfortunately we have to use these functions directly, due to the wakeup
+* behaviour of the tpm
+*/
+extern int i2c_read_data(uchar chip, uchar *buffer, int len);
+extern int i2c_write_data(uchar chip, uchar *buffer, int len);
+
+/*
+ * iic_tpm_read() - read from TPM register
+ * @addr: register address to read from
+ * @buffer: provided by caller
+ * @len: number of bytes to read
+ *
+ * Read len bytes from TPM register and put them into
+ * buffer (little-endian format, i.e. first byte is put into buffer[0]).
+ *
+ * NOTE: TPM is big-endian for multi-byte values. Multi-byte
+ * values have to be swapped.
+ *
+ * Return -EIO on error, 0 on success.
+ */
+int iic_tpm_read(u8 addr, u8 *buffer, size_t len)
+{
+ int rc;
+ int count;
+ uint myaddr = addr;
+ /* we have to use uint here, uchar hangs the board */
+
+ for (count = 0; count < MAX_COUNT; count++) {
+ rc = i2c_write_data(tpm_dev.addr, (uchar *) &myaddr, 1);
+ if (rc == 0)
+ break; /*success, break to skip sleep*/
+
+ udelay(SLEEP_DURATION);
+ }
+
+ if (rc)
+ return -rc;
+
+ /* After the TPM has successfully received the register address it needs
+ * some time, thus we're sleeping here again, before retrieving the data
+ */
+ for (count = 0; count < MAX_COUNT; count++) {
+ udelay(SLEEP_DURATION);
+ rc = i2c_read_data(tpm_dev.addr, buffer, len);
+ if (rc == 0)
+ break; /*success, break to skip sleep*/
+
+ }
+
+ if (rc)
+ return -rc;
+
+ return 0;
+}
+
+static int iic_tpm_write_generic(u8 addr, u8 *buffer, size_t len,
+ unsigned int sleep_time,
+ u8 max_count)
+{
+ int rc = 0;
+ int count;
+
+ /* prepare send buffer */
+ tpm_dev.buf[0] = addr;
+ memcpy(&(tpm_dev.buf[1]), buffer, len);
+
+ for (count = 0; count < max_count; count++) {
+ rc = i2c_write_data(tpm_dev.addr, tpm_dev.buf, len + 1);
+ if (rc == 0)
+ break; /*success, break to skip sleep*/
+
+ udelay(sleep_time);
+ }
+
+ if (rc)
+ return -rc;
+
+ return 0;
+}
+
+/*
+ * iic_tpm_write() - write to TPM register
+ * @addr: register address to write to
+ * @buffer: containing data to be written
+ * @len: number of bytes to write
+ *
+ * Write len bytes from provided buffer to TPM register (little
+ * endian format, i.e. buffer[0] is written as first byte).
+ *
+ * NOTE: TPM is big-endian for multi-byte values. Multi-byte
+ * values have to be swapped.
+ *
+ * NOTE: use this function instead of the iic_tpm_write_generic function.
+ *
+ * Return -EIO on error, 0 on success
+ */
+static int iic_tpm_write(u8 addr, u8 *buffer, size_t len)
+{
+ return iic_tpm_write_generic(addr, buffer, len, SLEEP_DURATION,
+ MAX_COUNT);
+}
+
+/*
+ * This function is needed especially for the cleanup situation after
+ * sending TPM_READY
+ * */
+static int iic_tpm_write_long(u8 addr, u8 *buffer, size_t len)
+{
+ return iic_tpm_write_generic(addr, buffer, len, SLEEP_DURATION_LONG,
+ MAX_COUNT_LONG);
+}
+
+#define TPM_HEADER_SIZE 10
+
+enum tis_access {
+ TPM_ACCESS_VALID = 0x80,
+ TPM_ACCESS_ACTIVE_LOCALITY = 0x20,
+ TPM_ACCESS_REQUEST_PENDING = 0x04,
+ TPM_ACCESS_REQUEST_USE = 0x02,
+};
+
+enum tis_status {
+ TPM_STS_VALID = 0x80,
+ TPM_STS_COMMAND_READY = 0x40,
+ TPM_STS_GO = 0x20,
+ TPM_STS_DATA_AVAIL = 0x10,
+ TPM_STS_DATA_EXPECT = 0x08,
+};
+
+enum tis_defaults {
+ TIS_SHORT_TIMEOUT = 750, /* ms */
+ TIS_LONG_TIMEOUT = 2000, /* 2 sec */
+};
+
+#define TPM_ACCESS(l) (0x0000 | ((l) << 4))
+#define TPM_STS(l) (0x0001 | ((l) << 4))
+#define TPM_DATA_FIFO(l) (0x0005 | ((l) << 4))
+#define TPM_DID_VID(l) (0x0006 | ((l) << 4))
+
+static int check_locality(struct tpm_chip *chip, int loc)
+{
+ u8 buf;
+ int rc;
+
+ rc = iic_tpm_read(TPM_ACCESS(loc), &buf, 1);
+ if (rc < 0)
+ return rc;
+
+ if ((buf & (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) ==
+ (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) {
+ chip->vendor.locality = loc;
+ return loc;
+ }
+
+ return -1;
+}
+
+static void release_locality(struct tpm_chip *chip, int loc, int force)
+{
+ u8 buf;
+ if (iic_tpm_read(TPM_ACCESS(loc), &buf, 1) < 0)
+ return;
+
+ if (force || (buf & (TPM_ACCESS_REQUEST_PENDING | TPM_ACCESS_VALID)) ==
+ (TPM_ACCESS_REQUEST_PENDING | TPM_ACCESS_VALID)) {
+ buf = TPM_ACCESS_ACTIVE_LOCALITY;
+ iic_tpm_write(TPM_ACCESS(loc), &buf, 1);
+ }
+}
+
+static int request_locality(struct tpm_chip *chip, int loc)
+{
+ unsigned long start, stop;
+ u8 buf = TPM_ACCESS_REQUEST_USE;
+
+ if (check_locality(chip, loc) >= 0)
+ return loc; /* we already have the locality */
+
+ iic_tpm_write(TPM_ACCESS(loc), &buf, 1);
+
+ /* wait for burstcount */
+ start = get_timer(0);
+ stop = chip->vendor.timeout_a;
+ do {
+ if (check_locality(chip, loc) >= 0)
+ return loc;
+ msleep(TPM_TIMEOUT);
+ } while (get_timer(start) < stop);
+
+ return -1;
+}
+
+static u8 tpm_tis_i2c_status(struct tpm_chip *chip)
+{
+ /* NOTE: since i2c read may fail, return 0 in this case --> time-out */
+ u8 buf;
+ if (iic_tpm_read(TPM_STS(chip->vendor.locality), &buf, 1) < 0)
+ return 0;
+ else
+ return buf;
+}
+
+static void tpm_tis_i2c_ready(struct tpm_chip *chip)
+{
+ /* this causes the current command to be aborted */
+ u8 buf = TPM_STS_COMMAND_READY;
+ iic_tpm_write_long(TPM_STS(chip->vendor.locality), &buf, 1);
+}
+
+static ssize_t get_burstcount(struct tpm_chip *chip)
+{
+ unsigned long start, stop;
+ ssize_t burstcnt;
+ u8 buf[3];
+
+ /* wait for burstcount */
+ /* which timeout value, spec has 2 answers (c & d) */
+ start = get_timer(0);
+ stop = chip->vendor.timeout_d;
+ do {
+ /* Note: STS is little endian */
+ if (iic_tpm_read(TPM_STS(chip->vendor.locality) + 1, buf, 3) < 0)
+ burstcnt = 0;
+ else
+ burstcnt = (buf[2] << 16) + (buf[1] << 8) + buf[0];
+
+ if (burstcnt)
+ return burstcnt;
+ msleep(TPM_TIMEOUT);
+ } while (get_timer(start) < stop);
+ return -EBUSY;
+}
+
+static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout,
+ int *status)
+{
+ unsigned long start, stop;
+
+ /* check current status */
+ *status = tpm_tis_i2c_status(chip);
+ if ((*status & mask) == mask)
+ return 0;
+
+ start = get_timer(0);
+ stop = timeout;
+ do {
+ msleep(TPM_TIMEOUT);
+ *status = tpm_tis_i2c_status(chip);
+ if ((*status & mask) == mask)
+ return 0;
+
+ } while (get_timer(start) < stop);
+
+ return -ETIME;
+}
+
+static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)
+{
+ size_t size = 0;
+ ssize_t burstcnt;
+ int rc;
+
+ while (size < count) {
+ burstcnt = get_burstcount(chip);
+
+ /* burstcount < 0 = tpm is busy */
+ if (burstcnt < 0)
+ return burstcnt;
+
+ /* limit received data to max. left */
+ if (burstcnt > (count - size))
+ burstcnt = count - size;
+
+ rc = iic_tpm_read(TPM_DATA_FIFO(chip->vendor.locality),
+ &(buf[size]),
+ burstcnt);
+ if (rc == 0)
+ size += burstcnt;
+
+ }
+ return size;
+}
+
+static int tpm_tis_i2c_recv(struct tpm_chip *chip, u8 *buf, size_t count)
+{
+ int size = 0;
+ int expected, status;
+
+ if (count < TPM_HEADER_SIZE) {
+ size = -EIO;
+ goto out;
+ }
+
+ /* read first 10 bytes, including tag, paramsize, and result */
+ size = recv_data(chip, buf, TPM_HEADER_SIZE);
+ if (size < TPM_HEADER_SIZE) {
+ dev_err(chip->dev, "Unable to read header\n");
+ goto out;
+ }
+
+ expected = get_unaligned_be32(buf + TPM_RSP_SIZE_BYTE);
+ if ((size_t)expected > count) {
+ size = -EIO;
+ goto out;
+ }
+
+ size += recv_data(chip, &buf[TPM_HEADER_SIZE],
+ expected - TPM_HEADER_SIZE);
+ if (size < expected) {
+ dev_err(chip->dev, "Unable to read remainder of result\n");
+ size = -ETIME;
+ goto out;
+ }
+
+ wait_for_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c, &status);
+ if (status & TPM_STS_DATA_AVAIL) { /* retry? */
+ dev_err(chip->dev, "Error left over data\n");
+ size = -EIO;
+ goto out;
+ }
+
+out:
+ tpm_tis_i2c_ready(chip);
+ /* The TPM needs some time to clean up here,
+ * so we sleep rather than keeping the bus busy
+ */
+ msleep(2);
+ release_locality(chip, chip->vendor.locality, 0);
+
+ return size;
+}
+
+static int tpm_tis_i2c_send(struct tpm_chip *chip, u8 *buf, size_t len)
+{
+ int rc, status;
+ ssize_t burstcnt;
+ size_t count = 0;
+ u8 sts = TPM_STS_GO;
+
+ if (len > TPM_BUFSIZE)
+ return -E2BIG; /* command is too long for our tpm, sorry */
+
+ if (request_locality(chip, 0) < 0)
+ return -EBUSY;
+
+ status = tpm_tis_i2c_status(chip);
+ if ((status & TPM_STS_COMMAND_READY) == 0) {
+ tpm_tis_i2c_ready(chip);
+ if (wait_for_stat
+ (chip, TPM_STS_COMMAND_READY,
+ chip->vendor.timeout_b, &status) < 0) {
+ rc = -ETIME;
+ goto out_err;
+ }
+ }
+
+ while (count < len - 1) {
+ burstcnt = get_burstcount(chip);
+
+ /* burstcount < 0 = tpm is busy */
+ if (burstcnt < 0)
+ return burstcnt;
+
+ if (burstcnt > (len-1-count))
+ burstcnt = len-1-count;
+
+#ifdef CONFIG_TPM_I2C_BURST_LIMITATION
+ if (burstcnt > CONFIG_TPM_I2C_BURST_LIMITATION)
+ burstcnt = CONFIG_TPM_I2C_BURST_LIMITATION;
+#endif /* CONFIG_TPM_I2C_BURST_LIMITATION */
+
+ rc = iic_tpm_write(TPM_DATA_FIFO(chip->vendor.locality),
+ &(buf[count]), burstcnt);
+ if (rc == 0)
+ count += burstcnt;
+
+ wait_for_stat(chip, TPM_STS_VALID,
+ chip->vendor.timeout_c, &status);
+
+ if ((status & TPM_STS_DATA_EXPECT) == 0) {
+ rc = -EIO;
+ goto out_err;
+ }
+
+ }
+
+ /* write last byte */
+ iic_tpm_write(TPM_DATA_FIFO(chip->vendor.locality), &(buf[count]), 1);
+ wait_for_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c, &status);
+ if ((status & TPM_STS_DATA_EXPECT) != 0) {
+ rc = -EIO;
+ goto out_err;
+ }
+
+ /* go and do it */
+ iic_tpm_write(TPM_STS(chip->vendor.locality), &sts, 1);
+
+ return len;
+out_err:
+ tpm_tis_i2c_ready(chip);
+ /* The TPM needs some time to clean up here,
+ * so we sleep rather than keeping the bus busy
+ */
+ msleep(2);
+ release_locality(chip, chip->vendor.locality, 0);
+
+ return rc;
+}
+
+static struct tpm_vendor_specific tpm_tis_i2c = {
+ .status = tpm_tis_i2c_status,
+ .recv = tpm_tis_i2c_recv,
+ .send = tpm_tis_i2c_send,
+ .cancel = tpm_tis_i2c_ready,
+ .req_complete_mask = TPM_STS_DATA_AVAIL | TPM_STS_VALID,
+ .req_complete_val = TPM_STS_DATA_AVAIL | TPM_STS_VALID,
+ .req_canceled = TPM_STS_COMMAND_READY,
+};
+
+/* initialisation of i2c tpm */
+
+
+int tpm_vendor_init(uint32_t dev_addr)
+{
+ u32 vendor;
+ uint old_addr;
+ int rc = 0;
+ struct tpm_chip *chip;
+
+ old_addr = tpm_dev.addr;
+ if (dev_addr != 0)
+ tpm_dev.addr = dev_addr;
+
+ chip = tpm_register_hardware(&tpm_tis_i2c);
+ if (chip < 0) {
+ rc = -ENODEV;
+ goto out_err;
+ }
+
+ /* Disable interrupts (not supported) */
+ chip->vendor.irq = 0;
+
+ /* Default timeouts */
+ chip->vendor.timeout_a = TIS_SHORT_TIMEOUT;
+ chip->vendor.timeout_b = TIS_LONG_TIMEOUT;
+ chip->vendor.timeout_c = TIS_SHORT_TIMEOUT;
+ chip->vendor.timeout_d = TIS_SHORT_TIMEOUT;
+
+ if (request_locality(chip, 0) != 0) {
+ rc = -ENODEV;
+ goto out_err;
+ }
+
+ /* read four bytes from DID_VID register */
+ if (iic_tpm_read(TPM_DID_VID(0), (uchar *)&vendor, 4) < 0) {
+ rc = -EIO;
+ goto out_release;
+ }
+
+ /* create DID_VID register value, after swapping to little-endian */
+ vendor = be32_to_cpu(vendor);
+
+ if (vendor != TPM_TIS_I2C_DID_VID) {
+ rc = -ENODEV;
+ goto out_release;
+ }
+
+ dev_info(dev, "1.2 TPM (device-id 0x%X)\n", vendor >> 16);
+
+ /*
+ * A timeout query to TPM can be placed here.
+ * Standard timeout values are used so far
+ */
+
+ return 0;
+
+out_release:
+ release_locality(chip, 0, 1);
+
+out_err:
+ tpm_dev.addr = old_addr;
+ return rc;
+}
+
+void tpm_vendor_cleanup(struct tpm_chip *chip)
+{
+ release_locality(chip, chip->vendor.locality, 1);
+}
diff --git a/include/tpm.h b/include/tpm.h
index dd1b4bfe4fb..7b0d415088e 100644
--- a/include/tpm.h
+++ b/include/tpm.h
@@ -8,8 +8,10 @@
#include <common.h>
-int tpm_init(void);
-int tpm_send(const uint8_t *pdata, size_t length);
-int tpm_receive(uint8_t *pdata, size_t max_length);
+int tis_init(void);
+int tis_open(void);
+int tis_close(void);
+int tis_sendrecv(const uint8_t *sendbuf, size_t send_size, uint8_t *recvbuf,
+ size_t *recv_len);
#endif /* TPM_H_ */
diff --git a/lib/chromeos/tlcl_stub.c b/lib/chromeos/tlcl_stub.c
index c2136456a54..edc63bab0f8 100644
--- a/lib/chromeos/tlcl_stub.c
+++ b/lib/chromeos/tlcl_stub.c
@@ -18,19 +18,34 @@
uint32_t TlclStubInit(void)
{
#ifdef CONFIG_HARDWARE_TPM
- return tpm_init();
-#else
- return TPM_SUCCESS;
+ int ret = tis_init();
+ if (ret)
+ return TPM_E_IOERROR;
+ /* tpm-lite lib doesn't call TlclOpenDevice after TlclStubInit */
+ ret = tis_open();
+ if (ret)
+ return TPM_E_IOERROR;
#endif
+ return TPM_SUCCESS;
}
uint32_t TlclCloseDevice(void)
{
+#ifdef CONFIG_HARDWARE_TPM
+ int ret = tis_close();
+ if (ret)
+ return TPM_E_IOERROR;
+#endif
return TPM_SUCCESS;
}
uint32_t TlclOpenDevice(void)
{
+#ifdef CONFIG_HARDWARE_TPM
+ int ret = tis_open();
+ if (ret)
+ return TPM_E_IOERROR;
+#endif
return TPM_SUCCESS;
}
@@ -38,16 +53,12 @@ uint32_t TlclStubSendReceive(const uint8_t* request, int request_length,
uint8_t* response, int max_length)
{
#ifdef CONFIG_HARDWARE_TPM
- int ret_code;
- ret_code = tpm_send(request, request_length);
- if (ret_code)
- return TPM_E_IOERROR;
- ret_code = tpm_receive(response, max_length);
- if (ret_code)
+ int ret;
+ size_t recv_len = (size_t) max_length;
+ ret= tis_sendrecv(request, request_length, response, &recv_len);
+ if (ret)
return TPM_E_IOERROR;
- return TPM_SUCCESS;
-#else
- return TPM_SUCCESS;
#endif
+ return TPM_SUCCESS;
}
generated by cgit v1.2.3 (git 2.0.4) at 2024-09-27 23:23:41 +0000