4 files changed, 295 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
index 58454bdfa20e..f1fb26eed0e9 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -15,6 +15,7 @@ adi,adt7461		+/-1C TDM Extended Temp Range I.C
 adt7461                 +/-1C TDM Extended Temp Range I.C
 at,24c08                i2c serial eeprom  (24cxx)
 atmel,24c02             i2c serial eeprom  (24cxx)
+atmel,at97sc3204t       i2c trusted platform module (TPM)
 catalyst,24c32          i2c serial eeprom
 dallas,ds1307           64 x 8, Serial, I2C Real-Time Clock
 dallas,ds1338           I2C RTC with 56-Byte NV RAM
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index ade71c134a1a..f9085860b716 100644
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -33,6 +33,15 @@ config TCG_TIS
           from within Linux.  To compile this driver as a module, choose
           M here; the module will be called tpm_tis.
 
+config TCG_TIS_I2C_ATMEL
+        tristate "TPM Interface Specification 1.2 Interface (I2C - Atmel)"
+        depends on I2C
+        ---help---
+          If you have an Atmel I2C TPM security chip say Yes and it will be
+          accessible from within Linux.
+          To compile this driver as a module, choose M here; the module will
+          be called tpm_tis_i2c_atmel.
+
 config TCG_TIS_I2C_INFINEON
         tristate "TPM Interface Specification 1.2 Interface (I2C - Infineon)"
         depends on I2C
diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile
index 07ee67cf3341..b80a4000daee 100644
--- a/drivers/char/tpm/Makefile
+++ b/drivers/char/tpm/Makefile
@@ -13,6 +13,7 @@ ifdef CONFIG_TCG_IBMVTPM
 endif
 endif
 obj-$(CONFIG_TCG_TIS) += tpm_tis.o
+obj-$(CONFIG_TCG_TIS_I2C_ATMEL) += tpm_i2c_atmel.o
 obj-$(CONFIG_TCG_TIS_I2C_INFINEON) += tpm_i2c_infineon.o
 obj-$(CONFIG_TCG_TIS_I2C_NUVOTON) += tpm_i2c_nuvoton.o
 obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
diff --git a/drivers/char/tpm/tpm_i2c_atmel.c b/drivers/char/tpm/tpm_i2c_atmel.c
new file mode 100644
index 000000000000..c3cd7fe481a1
--- /dev/null
+++ b/drivers/char/tpm/tpm_i2c_atmel.c
@@ -0,0 +1,284 @@
+/*
+ * ATMEL I2C TPM AT97SC3204T
+ *
+ * Copyright (C) 2012 V Lab Technologies
+ *  Teddy Reed <teddy@prosauce.org>
+ * Copyright (C) 2013, Obsidian Research Corp.
+ *  Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
+ * Device driver for ATMEL I2C TPMs.
+ *
+ * Teddy Reed determined the basic I2C command flow, unlike other I2C TPM
+ * devices the raw TCG formatted TPM command data is written via I2C and then
+ * raw TCG formatted TPM command data is returned via I2C.
+ *
+ * TGC status/locality/etc functions seen in the LPC implementation do not
+ * seem to be present.
+ *
+ * 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, see http://www.gnu.org/licenses/>.
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include "tpm.h"
+
+#define I2C_DRIVER_NAME "tpm_i2c_atmel"
+
+#define TPM_I2C_SHORT_TIMEOUT  750     /* ms */
+#define TPM_I2C_LONG_TIMEOUT   2000    /* 2 sec */
+
+#define ATMEL_STS_OK 1
+
+struct priv_data {
+        size_t len;
+        /* This is the amount we read on the first try. 25 was chosen to fit a
+         * fair number of read responses in the buffer so a 2nd retry can be
+         * avoided in small message cases. */
+        u8 buffer[sizeof(struct tpm_output_header) + 25];
+};
+
+static int i2c_atmel_send(struct tpm_chip *chip, u8 *buf, size_t len)
+{
+        struct priv_data *priv = chip->vendor.priv;
+        struct i2c_client *client = to_i2c_client(chip->dev);
+        s32 status;
+
+        priv->len = 0;
+
+        if (len <= 2)
+                return -EIO;
+
+        status = i2c_master_send(client, buf, len);
+
+        dev_dbg(chip->dev,
+                "%s(buf=%*ph len=%0zx) -> sts=%d\n", __func__,
+                (int)min_t(size_t, 64, len), buf, len, status);
+        return status;
+}
+
+static int i2c_atmel_recv(struct tpm_chip *chip, u8 *buf, size_t count)
+{
+        struct priv_data *priv = chip->vendor.priv;
+        struct i2c_client *client = to_i2c_client(chip->dev);
+        struct tpm_output_header *hdr =
+                (struct tpm_output_header *)priv->buffer;
+        u32 expected_len;
+        int rc;
+
+        if (priv->len == 0)
+                return -EIO;
+
+        /* Get the message size from the message header, if we didn't get the
+         * whole message in read_status then we need to re-read the
+         * message. */
+        expected_len = be32_to_cpu(hdr->length);
+        if (expected_len > count)
+                return -ENOMEM;
+
+        if (priv->len >= expected_len) {
+                dev_dbg(chip->dev,
+                        "%s early(buf=%*ph count=%0zx) -> ret=%d\n", __func__,
+                        (int)min_t(size_t, 64, expected_len), buf, count,
+                        expected_len);
+                memcpy(buf, priv->buffer, expected_len);
+                return expected_len;
+        }
+
+        rc = i2c_master_recv(client, buf, expected_len);
+        dev_dbg(chip->dev,
+                "%s reread(buf=%*ph count=%0zx) -> ret=%d\n", __func__,
+                (int)min_t(size_t, 64, expected_len), buf, count,
+                expected_len);
+        return rc;
+}
+
+static void i2c_atmel_cancel(struct tpm_chip *chip)
+{
+        dev_err(chip->dev, "TPM operation cancellation was requested, but is not supported");
+}
+
+static u8 i2c_atmel_read_status(struct tpm_chip *chip)
+{
+        struct priv_data *priv = chip->vendor.priv;
+        struct i2c_client *client = to_i2c_client(chip->dev);
+        int rc;
+
+        /* The TPM fails the I2C read until it is ready, so we do the entire
+         * transfer here and buffer it locally. This way the common code can
+         * properly handle the timeouts. */
+        priv->len = 0;
+        memset(priv->buffer, 0, sizeof(priv->buffer));
+
+
+        /* Once the TPM has completed the command the command remains readable
+         * until another command is issued. */
+        rc = i2c_master_recv(client, priv->buffer, sizeof(priv->buffer));
+        dev_dbg(chip->dev,
+                "%s: sts=%d", __func__, rc);
+        if (rc <= 0)
+                return 0;
+
+        priv->len = rc;
+
+        return ATMEL_STS_OK;
+}
+
+static const struct file_operations i2c_atmel_ops = {
+        .owner = THIS_MODULE,
+        .llseek = no_llseek,
+        .open = tpm_open,
+        .read = tpm_read,
+        .write = tpm_write,
+        .release = tpm_release,
+};