tools: kwboot: don't adjust destaddr when patching the image

[u-boot] / drivers / tpm / tpm_atmel_twi.c

diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c
index 361a7720fa547816c04818ccc0640188384cd759..eba654b15dcad4d85fa06e9396be4147888ea1c4 100644 (file)
--- a/drivers/tpm/tpm_atmel_twi.c
+++ b/drivers/tpm/tpm_atmel_twi.c
@@ -1,66 +1,62 @@
 /*
- * 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.
+ * Copyright (C) 2013 Guntermann & Drunck, GmbH
  *
- * 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.
+ * Written by Dirk Eibach <eibach@gdsys.de>
  *
- * 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
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <dm.h>
 #include <tpm.h>
 #include <i2c.h>
 #include <asm/unaligned.h>
 
+#include "tpm_internal.h"
+
 #define ATMEL_TPM_TIMEOUT_MS 5000 /* sufficient for anything but
                                     generating/exporting keys */
 
 /*
- * tis_init()
- *
- * Initialize the TPM device. Returns 0 on success or -1 on
- * failure (in case device probing did not succeed).
- */
-int tis_init(void)
-{
-       return 0;
-}
-
-/*
- * tis_open()
+ * tpm_atmel_twi_open()
  *
  * Requests access to locality 0 for the caller. After all commands have been
  * completed the caller is supposed to call tis_close().
  *
  * Returns 0 on success, -1 on failure.
  */
-int tis_open(void)
+static int tpm_atmel_twi_open(struct udevice *dev)
 {
        return 0;
 }
 
 /*
- * tis_close()
+ * tpm_atmel_twi_close()
  *
  * terminate the currect session with the TPM by releasing the locked
  * locality. Returns 0 on success of -1 on failure (in case lock
  * removal did not succeed).
  */
-int tis_close(void)
+static int tpm_atmel_twi_close(struct udevice *dev)
 {
        return 0;
 }
 
 /*
- * tis_sendrecv()
+ * tpm_atmel_twi_get_desc()
+ *
+ * @dev:        Device to check
+ * @buf:        Buffer to put the string
+ * @size:       Maximum size of buffer
+ * @return length of string, or -ENOSPC it no space
+ */
+static int tpm_atmel_twi_get_desc(struct udevice *dev, char *buf, int size)
+{
+       return 0;
+}
+
+/*
+ * tpm_atmel_twi_xfer()
  *
  * Send the requested data to the TPM and then try to get its response
  *
@@ -72,8 +68,9 @@ int tis_close(void)
  * Returns 0 on success (and places the number of response bytes at recv_len)
  * or -1 on failure.
  */
-int tis_sendrecv(const uint8_t *sendbuf, size_t send_size, uint8_t *recvbuf,
-                       size_t *recv_len)
+static int tpm_atmel_twi_xfer(struct udevice *dev,
+                             const uint8_t *sendbuf, size_t send_size,
+                             uint8_t *recvbuf, size_t *recv_len)
 {
        int res;
        unsigned long start;
@@ -84,14 +81,24 @@ int tis_sendrecv(const uint8_t *sendbuf, size_t send_size, uint8_t *recvbuf,
        print_buffer(0, (void *)sendbuf, 1, send_size, 0);
 #endif
 
+#ifndef CONFIG_DM_I2C
        res = i2c_write(0x29, 0, 0, (uchar *)sendbuf, send_size);
+#else
+       res = dm_i2c_write(dev, 0, sendbuf, send_size);
+#endif
        if (res) {
                printf("i2c_write returned %d\n", res);
                return -1;
        }
 
        start = get_timer(0);
-       while ((res = i2c_read(0x29, 0, 0, recvbuf, 10))) {
+#ifndef CONFIG_DM_I2C
+       while ((res = i2c_read(0x29, 0, 0, recvbuf, 10)))
+#else
+       while ((res = dm_i2c_read(dev, 0, recvbuf, 10)))
+#endif
+       {
+               /* TODO Use TIS_TIMEOUT from tpm_tis_infineon.h */
                if (get_timer(start) > ATMEL_TPM_TIMEOUT_MS) {
                        puts("tpm timed out\n");
                        return -1;
@@ -101,7 +108,11 @@ int tis_sendrecv(const uint8_t *sendbuf, size_t send_size, uint8_t *recvbuf,
        if (!res) {
                *recv_len = get_unaligned_be32(recvbuf + 2);
                if (*recv_len > 10)
+#ifndef CONFIG_DM_I2C
                        res = i2c_read(0x29, 0, 0, recvbuf, *recv_len);
+#else
+                       res = dm_i2c_read(dev, 0, recvbuf, *recv_len);
+#endif
        }
        if (res) {
                printf("i2c_read returned %d (rlen=%d)\n", res, *recv_len);
@@ -119,3 +130,28 @@ int tis_sendrecv(const uint8_t *sendbuf, size_t send_size, uint8_t *recvbuf,
 
        return res;
 }
+
+static int tpm_atmel_twi_probe(struct udevice *dev)
+{
+       return 0;
+}
+
+static const struct udevice_id tpm_atmel_twi_ids[] = {
+       { .compatible = "atmel,at97sc3204t"},
+       { }
+};
+
+static const struct tpm_ops tpm_atmel_twi_ops = {
+       .open = tpm_atmel_twi_open,
+       .close = tpm_atmel_twi_close,
+       .xfer = tpm_atmel_twi_xfer,
+       .get_desc = tpm_atmel_twi_get_desc,
+};
+
+U_BOOT_DRIVER(tpm_atmel_twi) = {
+       .name = "tpm_atmel_twi",
+       .id = UCLASS_TPM,
+       .of_match = tpm_atmel_twi_ids,
+       .ops = &tpm_atmel_twi_ops,
+       .probe = tpm_atmel_twi_probe,
+};