[PATCH] tpm: updates for new hardware

This is the patch to support TPMs on power ppc hardware.  It has been
reworked as requested to remove the need for messing with the io page mask
by just using ioremap.

Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 129 insertions, 0 deletions

diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h
new file mode 100644
index 000000000000..3c5b9a8d1c49
--- /dev/null
+++ b/drivers/char/tpm/tpm_atmel.h
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2005 IBM Corporation
+ *
+ * Authors:
+ * Kylene Hall <kjhall@us.ibm.com>
+ *
+ * Maintained by: <tpmdd_devel@lists.sourceforge.net>
+ *
+ * Device driver for TCG/TCPA TPM (trusted platform module).
+ * Specifications at www.trustedcomputinggroup.org
+ *
+ * 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.
+ *
+ * These difference are required on power because the device must be
+ * discovered through the device tree and iomap must be used to get
+ * around the need for holes in the io_page_mask.  This does not happen
+ * automatically because the tpm is not a normal pci device and lives
+ * under the root node.
+ *
+ */
+
+#ifdef CONFIG_PPC64
+#define atmel_getb(chip, offset) readb(chip->vendor->iobase + offset);
+#define atmel_putb(val, chip, offset) writeb(val, chip->vendor->iobase + offset)
+#define atmel_request_region request_mem_region
+#define atmel_release_region release_mem_region
+static inline void atmel_put_base_addr(struct tpm_vendor_specific *vendor)
+{
+        iounmap(vendor->iobase);
+}
+
+static int atmel_get_base_addr(struct tpm_vendor_specific *vendor)
+{
+        struct device_node *dn;
+        unsigned long address, size;
+        unsigned int *reg;
+        int reglen;
+        int naddrc;
+        int nsizec;
+
+        dn = of_find_node_by_name(NULL, "tpm");
+
+        if (!dn)
+                return 1;
+
+        if (!device_is_compatible(dn, "AT97SC3201")) {
+                of_node_put(dn);
+                return 1;
+        }
+
+        reg = (unsigned int *) get_property(dn, "reg", &reglen);
+        naddrc = prom_n_addr_cells(dn);
+        nsizec = prom_n_size_cells(dn);
+
+        of_node_put(dn);
+
+
+        if (naddrc == 2)
+                address = ((unsigned long) reg[0] << 32) | reg[1];
+        else
+                address = reg[0];
+
+        if (nsizec == 2)
+                size =
+                    ((unsigned long) reg[naddrc] << 32) | reg[naddrc + 1];
+        else
+                size = reg[naddrc];
+
+        vendor->base = address;
+        vendor->region_size = size;
+        vendor->iobase = ioremap(address, size);
+        return 0;
+}
+#else
+#define atmel_getb(chip, offset) inb(chip->vendor->base + offset)
+#define atmel_putb(val, chip, offset) outb(val, chip->vendor->base + offset)
+#define atmel_request_region request_region
+#define atmel_release_region release_region
+/* Atmel definitions */
+enum tpm_atmel_addr {
+        TPM_ATMEL_BASE_ADDR_LO = 0x08,
+        TPM_ATMEL_BASE_ADDR_HI = 0x09
+};
+
+/* Verify this is a 1.1 Atmel TPM */
+static int atmel_verify_tpm11(void)
+{
+
+        /* verify that it is an Atmel part */
+        if (tpm_read_index(TPM_ADDR, 4) != 'A' ||
+            tpm_read_index(TPM_ADDR, 5) != 'T' ||
+            tpm_read_index(TPM_ADDR, 6) != 'M' ||
+            tpm_read_index(TPM_ADDR, 7) != 'L')
+                return 1;
+
+        /* query chip for its version number */
+        if (tpm_read_index(TPM_ADDR, 0x00) != 1 ||
+            tpm_read_index(TPM_ADDR, 0x01) != 1)
+                return 1;
+
+        /* This is an atmel supported part */
+        return 0;
+}
+
+static inline void atmel_put_base_addr(struct tpm_vendor_specific *vendor)
+{
+}
+
+/* Determine where to talk to device */
+static unsigned long atmel_get_base_addr(struct tpm_vendor_specific
+                                         *vendor)
+{
+        int lo, hi;
+
+        if (atmel_verify_tpm11() != 0)
+                return 1;
+
+        lo = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_LO);
+        hi = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_HI);
+
+        vendor->base = (hi << 8) | lo;
+        vendor->region_size = 2;
+
+        return 0;
+}
+#endif