[PATCH] tpm: Support for new chip type

[PATCH] tpm: Support for new chip type

[Marcel Selhorst]

Hello LKML,

after some corrections here is a newer patch supporting the Infineon Trusted Platform
Module SLD 9630 (TPM 1.1b), which is embedded on Intel-mainboards or in
HP/Fujitsu-Siemens/Toshiba-Notebooks.
The module fits the interfaces created by IBM and was patched against the
latest kernel-snapshot 2.6.13-rc2.
Further information about this module and a list of supported hardware can be
found here: http://www.prosec.rub.de/tpm

Best Regards,
Marcel Selhorst

Signed-off-by: Marcel Selhorst <selhorst@crypto.rub.de>
---

diff -uprN linux-2.6.12.2/drivers/char/tpm/Kconfig linux/drivers/char/tpm/Kconfig
--- linux-2.6.12.2/drivers/char/tpm/Kconfig	2005-06-29 23:00:53.000000000 +0000
+++ linux/drivers/char/tpm/Kconfig	2005-07-06 21:35:29.000000000 +0000
@@ -35,5 +35,18 @@ config TCG_ATMEL
 	  will be accessible from within Linux.  To compile this driver
 	  as a module, choose M here; the module will be called tpm_atmel.

+config TCG_INFINEON
+	tristate "Infineon Technologies SLD 9630 TPM Interface"
+	depends on TCG_TPM
+	---help---
+	  If you have a TPM security chip from Infineon Technologies
+	  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_infineon.
+	  Further information on this driver and the supported hardware
+	  can be found at http://www.prosec.rub.de/tpm
+	  Note: To get debugging output into the module, you have to enable
+	  CONFIG_DEBUG_KERNEL, CONFIG_DEBUG_INFO and CONFIG_PCI_DEBUG
+
 endmenu

diff -uprN linux-2.6.12.2/drivers/char/tpm/Makefile linux/drivers/char/tpm/Makefile
--- linux-2.6.12.2/drivers/char/tpm/Makefile	2005-06-29 23:00:53.000000000 +0000
+++ linux/drivers/char/tpm/Makefile	2005-07-06 21:35:29.000000000 +0000
@@ -4,4 +4,5 @@
 obj-$(CONFIG_TCG_TPM) += tpm.o
 obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
 obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o
+obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o

diff -uprN linux-2.6.12.2/drivers/char/tpm/tpm_infineon.c linux/drivers/char/tpm/tpm_infineon.c
--- linux-2.6.12.2/drivers/char/tpm/tpm_infineon.c	1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/char/tpm/tpm_infineon.c	2005-07-07 14:56:27.000000000 +0000
@@ -0,0 +1,505 @@
+/*
+ * Copyright (C) 2005
+ * Marcel Selhorst <selhorst@crypto.rub.de>
+ * Applied Data Security Group
+ * Ruhr-University Bochum, Germany
+ *
+ * Description:
+ * Device Driver for the Infineon Technologies
+ * SLD 9630 TT Trusted Platform Module
+ * Specifications at www.trustedcomputinggroup.org	
+ *
+ * Project-Homepage:
+ * http://www.prosec.rub.de/tpm
+ *
+ * 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.
+ *
+ */
+
+#include "tpm.h"
+
+/* Infineon specific delay definitions */
+enum infineon_tpm_delay {
+	TPM_MAX_WTX_PACKAGES = 50,	/* maximum number of WTX-packages */
+	TPM_WTX_MSLEEP_TIME = 20,	/* msleep-Time for WTX-packages */
+	TPM_MSLEEP_TIME = 3,	/* msleep-Time --> Interval to check status register */
+	TPM_MAX_TRIES = 5000	/* gives number of max. msleep()-calls before
+				   throwing timeout */
+};
+
+/* Infineon specific TPM data */
+enum infineon_tpm_specific {
+	TCPA_INFINEON_DEV_VEN_VALUE = 0x15D1,
+	TPM_DATA = (TPM_ADDR + 1) & 0xff
+};
+
+/* TPM header definitions */
+enum infineon_tpm_header {
+	TPM_VL_VER = 0x01,
+	TPM_VL_CHANNEL_CONTROL = 0x07,
+	TPM_VL_CHANNEL_PERSONALISATION = 0x0A,
+	TPM_VL_CHANNEL_TPM = 0x0B,
+	TPM_VL_CONTROL = 0x00,
+	TPM_INF_NAK = 0x15,
+	TPM_CTRL_WTX = 0x10,
+	TPM_CTRL_WTX_ABORT = 0x18,
+	TPM_CTRL_WTX_ABORT_ACK = 0x18,
+	TPM_CTRL_ERROR = 0x20,
+	TPM_CTRL_CHAININGACK = 0x40,
+	TPM_CTRL_CHAINING = 0x80,
+	TPM_CTRL_DATA = 0x04,
+	TPM_CTRL_DATA_CHA = 0x84,
+	TPM_CTRL_DATA_CHA_ACK = 0xC4
+};
+
+enum infineon_tpm_register {
+	WRFIFO = 0x00,
+	RDFIFO = 0x01,
+	STAT = 0x02,
+	CMD = 0x03
+};
+
+enum infineon_tpm_command_bits {
+	CMD_DIS = 0x00,
+	CMD_LP = 0x01,
+	CMD_RES = 0x02,
+	CMD_IRQC = 0x06
+};
+
+enum infineon_tpm_status_bits {
+	STAT_XFE = 0x00,
+	STAT_LPA = 0x01,
+	STAT_FOK = 0x02,
+	STAT_TOK = 0x03,
+	STAT_IRQA = 0x06,
+	STAT_RDA = 0x07
+};
+
+/* some outgoing values */
+enum infineon_tpm_values {
+	CHIP_ID1 = 0x20,
+	CHIP_ID2 = 0x21,
+	DAR = 0x30,
+	RESET_LP_IRQC_DISABLE = 0x41,
+	ENABLE_REGISTER_PAIR = 0x55,
+	IOLIMH = 0x60,
+	IOLIML = 0x61,
+	DISABLE_REGISTER_PAIR = 0xAA,
+	IDVENL = 0xF1,
+	IDVENH = 0xF2,
+	IDPDL = 0xF3,
+	IDPDH = 0xF4
+};
+
+static int number_of_wtx;
+
+static int empty_fifo(struct tpm_chip *chip, int clear_wrfifo)
+{
+	int status;
+	int check = 0;
+	int i;
+	int j = 0;
+
+	if (clear_wrfifo) {
+		for (i = 0; i < 4096; i++) {
+			status = inb(chip->vendor->base + WRFIFO);
+			if (status == 0xff) {
+				if (check == 5)
+					break;
+				else
+					check++;
+			}
+		}
+	}
+	/* Note: The values which are currently in the FIFO of the TPM
+	   are thrown away since there is no usage for them. Usually,
+	   this has nothing to say, since the TPM will give its answer immediately
+	   or will be aborted anyway, so the data here is usually garbage and useless.
+	   We have to clean this, because the next communication with the TPM would
+	   be rubbish, if there is still some old data in the Read FIFO.
+	 */
+	i = 0;
+	do {
+		status = inb(chip->vendor->base + RDFIFO);
+		status = inb(chip->vendor->base + STAT);
+		j++;
+		if (j == TPM_MAX_TRIES)
+			return -EIO;
+	} while ((status & (1 << STAT_RDA)) != 0);
+	return 0;
+}
+
+static int wait(struct tpm_chip *chip, int wait_for_bit)
+{
+
+	int status;
+	int i;
+	for (i = 0; i < TPM_MAX_TRIES; i++) {
+		status = inb(chip->vendor->base + STAT);
+		if (status & 1 << wait_for_bit)	/* check the status-register if wait_for_bit is set */
+			break;
+		msleep(TPM_MSLEEP_TIME);
+	}
+	if (i == TPM_MAX_TRIES) {	/* when timeout occurs, print information and return -EIO */
+		dev_err(&chip->pci_dev->dev, "Timeout in wait(");
+		if (wait_for_bit == STAT_XFE)
+			dev_err(&chip->pci_dev->dev, "STAT_XFE)\n");
+		if (wait_for_bit == STAT_RDA)
+			dev_err(&chip->pci_dev->dev, "STAT_RDA)\n");
+		return -EIO;
+	}
+	return 0;
+};
+
+static void wait_and_send(struct tpm_chip *chip, u8 sendbyte)
+{
+	wait(chip, STAT_XFE);
+	outb(sendbyte, chip->vendor->base + WRFIFO);
+}
+
+/* Note: WTX means Waiting-Time-Extension. Whenever the TPM
+needs more calculation time, it sends a WTX-package, which has to
+be acknowledged or aborted. This usually occurs if you are hammering
+the TPM with key creation. Set the maximum number of WTX-packages in
+the definitions above, if the number is reached, the waiting-time will be denied
+and the TPM command has to be resend.
+*/
+
+static void tpm_wtx(struct tpm_chip *chip)
+{
+	number_of_wtx++;
+	dev_info(&chip->pci_dev->dev, "Granting WTX (%02d / %02d)\n",
+		 number_of_wtx, TPM_MAX_WTX_PACKAGES);
+	wait_and_send(chip, TPM_VL_VER);
+	wait_and_send(chip, TPM_CTRL_WTX);
+	wait_and_send(chip, 0x00);
+	wait_and_send(chip, 0x00);
+	msleep(TPM_WTX_MSLEEP_TIME);
+}
+
+static void tpm_wtx_abort(struct tpm_chip *chip)
+{
+	dev_info(&chip->pci_dev->dev, "Aborting WTX\n");
+	wait_and_send(chip, TPM_VL_VER);
+	wait_and_send(chip, TPM_CTRL_WTX_ABORT);
+	wait_and_send(chip, 0x00);
+	wait_and_send(chip, 0x00);
+	number_of_wtx = 0;
+	msleep(TPM_WTX_MSLEEP_TIME);
+}
+
+static int tpm_inf_recv(struct tpm_chip *chip, u8 * buf, size_t count)
+{
+	int i;
+	int ret;
+	u32 size = 0;
+
+      recv_begin:
+	/* start reading header */
+	dev_dbg(&chip->pci_dev->dev, "Receiving header: ");
+
+	for (i = 0; i < 4; i++) {
+		ret = wait(chip, STAT_RDA);
+		if (ret)
+			return -EIO;
+
+		buf[i] = inb(chip->vendor->base + RDFIFO);
+		dev_dbg(&chip->pci_dev->dev, "%02x ", buf[i]);
+	}
+	dev_dbg(&chip->pci_dev->dev, "\n");
+
+	if (buf[0] != TPM_VL_VER) {
+		dev_err(&chip->pci_dev->dev,
+			"Wrong transport protocol implementation!\n");
+		return -EIO;
+	}
+
+	if (buf[1] == TPM_CTRL_DATA) {
+		/* size of the data received */
+		size = ((buf[2] << 8) | buf[3]);
+		dev_dbg(&chip->pci_dev->dev,
+			"Number of bytes to copy:  %d (0x%04x)\n", size, size);
+		dev_dbg(&chip->pci_dev->dev, "Receiving data: ");
+
+		for (i = 0; i < size; i++) {
+			wait(chip, STAT_RDA);
+			buf[i] = inb(chip->vendor->base + RDFIFO);
+			dev_dbg(&chip->pci_dev->dev, "%02x ", buf[i]);
+		}
+		dev_dbg(&chip->pci_dev->dev, "\n");
+
+		if ((size == 0x6D00) && (buf[1] == 0x80)) {
+			dev_err(&chip->pci_dev->dev,
+				"Error handling on vendor layer!\n");
+			return -EIO;
+		}
+
+		for (i = 0; i < size; i++)
+			buf[i] = buf[i + 6];
+
+		size = size - 6;
+		return size;
+	}
+
+	if (buf[1] == TPM_CTRL_WTX) {
+		dev_info(&chip->pci_dev->dev, "WTX-package received\n");
+		if (number_of_wtx < TPM_MAX_WTX_PACKAGES) {
+			tpm_wtx(chip);
+			goto recv_begin;
+		} else {
+			tpm_wtx_abort(chip);
+			goto recv_begin;
+		}
+	}
+	if (buf[1] == TPM_CTRL_WTX_ABORT_ACK) {
+		dev_info(&chip->pci_dev->dev, "WTX-abort acknowledged\n");
+		return size;
+	}
+
+	if (buf[1] == TPM_CTRL_ERROR) {
+		dev_err(&chip->pci_dev->dev, "ERROR-package received:\n");
+		if (buf[4] == TPM_INF_NAK)
+			dev_err(&chip->pci_dev->dev,
+				"-> Negative acknowledgement - retransmit commando!\n");
+		return -EIO;
+	}
+	return -EIO;
+}
+
+static int tpm_inf_send(struct tpm_chip *chip, u8 * buf, size_t count)
+{
+	int i;
+	int ret;
+	u8 count_high, count_low, count_4, count_3, count_2, count_1;
+	/* Disabling Reset, LP and IRQC */
+	outb(RESET_LP_IRQC_DISABLE, chip->vendor->base + CMD);
+
+	ret = empty_fifo(chip, 1);
+	if (ret) {
+		dev_err(&chip->pci_dev->dev, "Timeout while clearing FIFO\n");
+		return -EIO;
+	}
+
+	ret = wait(chip, STAT_XFE);
+	if (ret)
+		return -EIO;
+
+	count_4 = (count & 0xff000000) >> 24;
+	count_3 = (count & 0x00ff0000) >> 16;
+	count_2 = (count & 0x0000ff00) >> 8;
+	count_1 = (count & 0x000000ff);
+	count_high = ((count + 6) & 0xffffff00) >> 8;
+	count_low = ((count + 6) & 0x000000ff);
+
+	/* Sending Header */
+	dev_dbg(&chip->pci_dev->dev, "Sending header %02x %02x %02x %02x\n",
+		TPM_VL_VER, TPM_CTRL_DATA, count_high, count_low);
+
+	wait_and_send(chip, TPM_VL_VER);
+	wait_and_send(chip, TPM_CTRL_DATA);
+	wait_and_send(chip, count_high);
+	wait_and_send(chip, count_low);
+
+	count_high = 0;
+	count_low = 0;
+
+	count_high = (count & 0xffff0000);
+	count_low = (count & 0x0000ffff);
+
+	/* Sending Data Header */
+	dev_dbg(&chip->pci_dev->dev,
+		"Sending data   %02x %02x %02x %02x %02x %02x ", TPM_VL_VER,
+		TPM_VL_CHANNEL_TPM, count_4, count_3, count_2, count_1);
+
+	wait_and_send(chip, TPM_VL_VER);
+	wait_and_send(chip, TPM_VL_CHANNEL_TPM);
+	wait_and_send(chip, count_4);
+	wait_and_send(chip, count_3);
+	wait_and_send(chip, count_2);
+	wait_and_send(chip, count_1);
+
+	for (i = 0; i < count; i++) {
+		wait_and_send(chip, buf[i]);
+		dev_dbg(&chip->pci_dev->dev, "%02x ", buf[i]);
+	}
+	dev_dbg(&chip->pci_dev->dev,
+		"\nSending data successful -> %d (0x%04x) from %d (0x%04x) data-bytes written\n",
+		count, count, i, i);
+	return count;
+}
+static void tpm_inf_cancel(struct tpm_chip *chip)
+{
+	/* Nothing yet!
+	   This has something to do with the internal functions
+	   of the TPM. Abort isn't really necessary...
+	 */
+}
+
+static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL);
+static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL);
+static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL);
+static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel);
+
+static struct attribute *inf_attrs[] = {
+	&dev_attr_pubek.attr,
+	&dev_attr_pcrs.attr,
+	&dev_attr_caps.attr,
+	&dev_attr_cancel.attr,
+	NULL,
+};
+
+static struct attribute_group inf_attr_grp = {.attrs = inf_attrs };
+
+static struct file_operations inf_ops = {
+	.owner = THIS_MODULE,
+	.llseek = no_llseek,
+	.open = tpm_open,
+	.read = tpm_read,
+	.write = tpm_write,
+	.release = tpm_release,
+};
+
+static struct tpm_vendor_specific tpm_inf = {
+	.recv = tpm_inf_recv,
+	.send = tpm_inf_send,
+	.cancel = tpm_inf_cancel,
+	.req_complete_mask = 0,
+	.req_complete_val = 0,
+	.attr_group = &inf_attr_grp,
+	.miscdev = {.fops = &inf_ops,},
+};
+
+static int __init tpm_inf_probe(struct pci_dev *pci_dev,
+				const struct pci_device_id *pci_id)
+{
+
+	int rc = 0;
+	u8 ioh;
+	u8 iol;
+	int vendorid[2];
+	int version[2];
+	int productid[2];
+	int status = 0;
+
+	if (pci_enable_device(pci_dev))
+		return -EIO;
+
+	dev_dbg(&pci_dev->dev, "LPC-bus found at 0x%x\n", pci_id->device);
+
+	/* query chip for its vendor, its version number a.s.o. */
+
+	outb(ENABLE_REGISTER_PAIR, TPM_ADDR);
+	outb(IDVENL, TPM_ADDR);
+	vendorid[1] = inb(TPM_DATA);
+	outb(IDVENH, TPM_ADDR);
+	vendorid[0] = inb(TPM_DATA);
+	outb(IDPDL, TPM_ADDR);
+	productid[1] = inb(TPM_DATA);
+	outb(IDPDH, TPM_ADDR);
+	productid[0] = inb(TPM_DATA);
+	outb(CHIP_ID1, TPM_ADDR);
+	version[1] = inb(TPM_DATA);
+	outb(CHIP_ID2, TPM_ADDR);
+	version[0] = inb(TPM_DATA);
+
+	if ((vendorid[1] == (TCPA_INFINEON_DEV_VEN_VALUE & 0xFF))
+	    && ((vendorid[0] << 8) ==
+		(TCPA_INFINEON_DEV_VEN_VALUE & 0x00FF << 8))) {
+
+		/* read IO-ports from TPM */
+		outb(IOLIMH, TPM_ADDR);
+		ioh = inb(TPM_DATA);
+		outb(IOLIML, TPM_ADDR);
+		iol = inb(TPM_DATA);
+		tpm_inf.base = (ioh << 8) | iol;
+
+		if (tpm_inf.base == 0) {
+			dev_err(&pci_dev->dev, "No IO-ports set!\n");
+			pci_disable_device(pci_dev);
+			return -ENODEV;
+		}
+
+		/* activate register */
+		outb(DAR, TPM_ADDR);
+		outb(0x01, TPM_DATA);
+		outb(DAR, TPM_ADDR);
+		status = inb(TPM_DATA);
+		dev_dbg(&pci_dev->dev,
+			"Device activate register status : %x \n", status);
+		outb(DISABLE_REGISTER_PAIR, TPM_ADDR);
+
+		/* disable RESET, LP and IRQC */
+		outb(RESET_LP_IRQC_DISABLE, tpm_inf.base + CMD);
+
+		/* Finally, we're done, print some infos */
+		dev_info(&pci_dev->dev, "TPM found: "
+			 "io base 0x%x, "
+			 "chip version %02x%02x, "
+			 "vendor id %x%x (Infineon), "
+			 "product id %02x%02x"
+			 "%s\n",
+			 tpm_inf.base,
+			 version[0], version[1],
+			 vendorid[0], vendorid[1],
+			 productid[0], productid[1], ((productid[0] == 0)
+						      && (productid[1] ==
+							  6)) ?
+			 " (SLD 9630 TT 1.1)" : "");
+
+		rc = tpm_register_hardware(pci_dev, &tpm_inf);
+		if (rc < 0) {
+			pci_disable_device(pci_dev);
+			return -ENODEV;
+		}
+		return 0;
+
+	} else {
+		dev_info(&pci_dev->dev, "No Infineon TPM found!\n");
+		pci_disable_device(pci_dev);
+		return -ENODEV;
+	}
+}
+
+static struct pci_device_id tpm_pci_tbl[] __devinitdata = {
+	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0)},
+	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12)},
+	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0)},
+	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12)},
+	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0)},
+	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0)},
+	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1)},
+	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_2)},
+	{0,}
+};
+
+MODULE_DEVICE_TABLE(pci, tpm_pci_tbl);
+
+static struct pci_driver inf_pci_driver = {
+	.name = "tpm_inf",
+	.id_table = tpm_pci_tbl,
+	.probe = tpm_inf_probe,
+	.remove = __devexit_p(tpm_remove),
+	.suspend = tpm_pm_suspend,
+	.resume = tpm_pm_resume,
+};
+
+static int __init init_inf(void)
+{
+	return pci_register_driver(&inf_pci_driver);
+}
+
+static void __exit cleanup_inf(void)
+{
+	pci_unregister_driver(&inf_pci_driver);
+}
+
+module_init(init_inf);
+module_exit(cleanup_inf);
+
+MODULE_AUTHOR("Marcel Selhorst <selhorst@crypto.rub.de>");
+MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT");
+MODULE_VERSION("1.4");
+MODULE_LICENSE("GPL");

Re: [PATCH] tpm: Support for new chip type

[Philipp Matthias Hahn]

Hello!

On Fri, Jul 08, 2005 at 12:42:02AM +0200, Marcel Selhorst wrote:
> +++ linux/drivers/char/tpm/tpm_infineon.c	2005-07-07 14:56:27.000000000 +0000
...
> + * Specifications at www.trustedcomputinggroup.org	
Blanks at end of line

> +/* Infineon specific delay definitions */
> +enum infineon_tpm_delay {
> +	TPM_MAX_WTX_PACKAGES = 50,	/* maximum number of WTX-packages */
> +	TPM_WTX_MSLEEP_TIME = 20,	/* msleep-Time for WTX-packages */
> +	TPM_MSLEEP_TIME = 3,	/* msleep-Time --> Interval to check status register */
> +	TPM_MAX_TRIES = 5000	/* gives number of max. msleep()-calls before
> +				   throwing timeout */
> +};
These look like unrelated constants, perhaps #define would be nicer?

> +static int wait(struct tpm_chip *chip, int wait_for_bit)
> +{
> +
blank line

> +}
> +static void tpm_inf_cancel(struct tpm_chip *chip)
missing blank line

> +static int __init tpm_inf_probe(struct pci_dev *pci_dev,
> +				const struct pci_device_id *pci_id)
> +{
> +
blank lines
> +		return 0;
> +
> +	} else {

BYtE
Philipp
-- 
  / /  (_)__  __ ____  __ Philipp Hahn
 / /__/ / _ \/ // /\ \/ /
/____/_/_//_/\_,_/ /_/\_\ pmhahn@titan.lahn.de

Re: [PATCH] tpm: Support for new chip type

[Alexey Dobriyan]

On Friday 08 July 2005 02:42, Marcel Selhorst wrote:
> after some corrections here is a newer patch supporting the Infineon Trusted
> Platform Module SLD 9630 (TPM 1.1b), which is embedded on Intel-mainboards or
> in HP/Fujitsu-Siemens/Toshiba-Notebooks.

> --- linux-2.6.12.2/drivers/char/tpm/tpm_infineon.c
> +++ linux/drivers/char/tpm/tpm_infineon.c

> +static int empty_fifo(struct tpm_chip *chip, int clear_wrfifo)
> +{
> +	int status;
> +	int check = 0;
> +	int i;
> +	int j = 0;
> +
> +	if (clear_wrfifo) {
> +		for (i = 0; i < 4096; i++) {
> +			status = inb(chip->vendor->base + WRFIFO);
> +			if (status == 0xff) {
> +				if (check == 5)
> +					break;
> +				else
> +					check++;
> +			}
> +		}
> +	}
> +	/* Note: The values which are currently in the FIFO of the TPM
> +	   are thrown away since there is no usage for them. Usually,
> +	   this has nothing to say, since the TPM will give its answer immediately
> +	   or will be aborted anyway, so the data here is usually garbage and useless.
> +	   We have to clean this, because the next communication with the TPM would
> +	   be rubbish, if there is still some old data in the Read FIFO.
> +	 */

Could you reformat it a little to fit in 80 columns?

> +	i = 0;

i is used only in clear_wrfifo loop. Or sacrifice j instead.

> +	do {
> +		status = inb(chip->vendor->base + RDFIFO);
> +		status = inb(chip->vendor->base + STAT);
> +		j++;
> +		if (j == TPM_MAX_TRIES)
> +			return -EIO;
> +	} while ((status & (1 << STAT_RDA)) != 0);
> +	return 0;
> +}

> +static int wait(struct tpm_chip *chip, int wait_for_bit)
> +{

> +	if (i == TPM_MAX_TRIES) {	/* when timeout occurs, print information and return -EIO */

We see dev_err() calls, we see -EIO. So only "timeout occurs" should be left.

> +		dev_err(&chip->pci_dev->dev, "Timeout in wait(");
> +		if (wait_for_bit == STAT_XFE)
> +			dev_err(&chip->pci_dev->dev, "STAT_XFE)\n");
> +		if (wait_for_bit == STAT_RDA)
> +			dev_err(&chip->pci_dev->dev, "STAT_RDA)\n");
> +		return -EIO;
> +	}

> +/* Note: WTX means Waiting-Time-Extension. Whenever the TPM
> +needs more calculation time, it sends a WTX-package, which has to
> +be acknowledged or aborted. This usually occurs if you are hammering
> +the TPM with key creation. Set the maximum number of WTX-packages in
> +the definitions above, if the number is reached, the waiting-time will be denied
> +and the TPM command has to be resend.
> +*/

Be consistent with the rest of the driver:

	/* This style
	   is OK.
	 */

> +static int tpm_inf_recv(struct tpm_chip *chip, u8 * buf, size_t count)
> +{

> +      recv_begin:

Labels are placed at column zero usually.

> +	dev_dbg(&chip->pci_dev->dev, "Receiving header: ");
> +
> +	for (i = 0; i < 4; i++) {
> +		ret = wait(chip, STAT_RDA);
> +		if (ret)
> +			return -EIO;
> +
> +		buf[i] = inb(chip->vendor->base + RDFIFO);
> +		dev_dbg(&chip->pci_dev->dev, "%02x ", buf[i]);
> +	}
> +	dev_dbg(&chip->pci_dev->dev, "\n");

One of dev_dbg jobs is to print KERN_DEBUG, but only at the very beginning of
the line.

> +		dev_dbg(&chip->pci_dev->dev, "Receiving data: ");
> +
> +		for (i = 0; i < size; i++) {
> +			wait(chip, STAT_RDA);
> +			buf[i] = inb(chip->vendor->base + RDFIFO);
> +			dev_dbg(&chip->pci_dev->dev, "%02x ", buf[i]);
> +		}
> +		dev_dbg(&chip->pci_dev->dev, "\n");

dev_dbg() in the middle.

> +				"-> Negative acknowledgement - retransmit commando!\n");

command?

> +static int tpm_inf_send(struct tpm_chip *chip, u8 * buf, size_t count)
> +{

> +	count_high = 0;
> +	count_low = 0;

What's the point?

> +
> +	count_high = (count & 0xffff0000);
> +	count_low = (count & 0x0000ffff);

> +	dev_dbg(&chip->pci_dev->dev,
> +		"Sending data   %02x %02x %02x %02x %02x %02x ", TPM_VL_VER,
> +		TPM_VL_CHANNEL_TPM, count_4, count_3, count_2, count_1);
> +
> +	wait_and_send(chip, TPM_VL_VER);
> +	wait_and_send(chip, TPM_VL_CHANNEL_TPM);
> +	wait_and_send(chip, count_4);
> +	wait_and_send(chip, count_3);
> +	wait_and_send(chip, count_2);
> +	wait_and_send(chip, count_1);
> +
> +	for (i = 0; i < count; i++) {
> +		wait_and_send(chip, buf[i]);
> +		dev_dbg(&chip->pci_dev->dev, "%02x ", buf[i]);
> +	}

dev_dbg in the middle.

> +static int __init tpm_inf_probe(struct pci_dev *pci_dev,
> +				const struct pci_device_id *pci_id)
> +{

> +		dev_dbg(&pci_dev->dev,
> +			"Device activate register status : %x \n", status);

%x\n

Re: [PATCH] tpm: Support for new chip type

[Pavel Machek]

Hi!

> after some corrections here is a newer patch supporting the Infineon Trusted Platform
> Module SLD 9630 (TPM 1.1b), which is embedded on Intel-mainboards or in
> HP/Fujitsu-Siemens/Toshiba-Notebooks.
> The module fits the interfaces created by IBM and was patched against the
> latest kernel-snapshot 2.6.13-rc2.
> Further information about this module and a list of supported hardware can be
> found here: http://www.prosec.rub.de/tpm
> 
> Best Regards,
> Marcel Selhorst
> 
> Signed-off-by: Marcel Selhorst <selhorst@crypto.rub.de>

> diff -uprN linux-2.6.12.2/drivers/char/tpm/tpm_infineon.c linux/drivers/char/tpm/tpm_infineon.c
> --- linux-2.6.12.2/drivers/char/tpm/tpm_infineon.c	1970-01-01 00:00:00.000000000 +0000
> +++ linux/drivers/char/tpm/tpm_infineon.c	2005-07-07 14:56:27.000000000 +0000
> @@ -0,0 +1,505 @@
> +/*
> + * Copyright (C) 2005
> + * Marcel Selhorst <selhorst@crypto.rub.de>
> + * Applied Data Security Group
> + * Ruhr-University Bochum, Germany
> + *

Could you make this

> + * Copyright (C) 2005 Marcel Selhorst <selhorst@crypto.rub.de>
> + * Applied Data Security Group Ruhr-University Bochum, Germany

and make sure Description stands out a bit more (like maybe putting it
first?)

> + * Description:
> + * Device Driver for the Infineon Technologies
> + * SLD 9630 TT Trusted Platform Module
> + * Specifications at www.trustedcomputinggroup.org	
> + *
> + * Project-Homepage:
> + * http://www.prosec.rub.de/tpm
> + *
> + * 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.
> + *
> + */

> +#include "tpm.h"
> +
> +/* Infineon specific delay definitions */
> +enum infineon_tpm_delay {
> +	TPM_MAX_WTX_PACKAGES = 50,	/* maximum number of WTX-packages */
> +	TPM_WTX_MSLEEP_TIME = 20,	/* msleep-Time for WTX-packages */
> +	TPM_MSLEEP_TIME = 3,	/* msleep-Time --> Interval to check status register */
> +	TPM_MAX_TRIES = 5000	/* gives number of max. msleep()-calls before
> +				   throwing timeout */
> +};

> +/* Infineon specific TPM data */
> +enum infineon_tpm_specific {
> +	TCPA_INFINEON_DEV_VEN_VALUE = 0x15D1,
> +	TPM_DATA = (TPM_ADDR + 1) & 0xff
> +};

Ugh, is it just me or are you abusing enums a bit?
> +static int __init tpm_inf_probe(struct pci_dev *pci_dev,
> +				const struct pci_device_id *pci_id)
> +{
> +
> +	int rc = 0;
> +	u8 ioh;
> +	u8 iol;

Put these two on one line? Are you sure probe can't be called during
runtime for some pci hotplug case?
								Pavel
-- 
teflon -- maybe it is a trademark, but it should not be.

Re: [PATCH] tpm: Support for new chip type

[Vojtech Pavlik]

On Sat, Jul 09, 2005 at 09:19:04PM +0200, Pavel Machek wrote:
 
> Ugh, is it just me or are you abusing enums a bit?
> > +static int __init tpm_inf_probe(struct pci_dev *pci_dev,
> > +				const struct pci_device_id *pci_id)
> > +{
> > +
> > +	int rc = 0;
> > +	u8 ioh;
> > +	u8 iol;
> 
> Put these two on one line? Are you sure probe can't be called during
> runtime for some pci hotplug case?
 
__devinit should be used here, if for nothing else, then for sanity's
sake.

-- 
Vojtech Pavlik
SuSE Labs, SuSE CR

[PATCH] tpm: Support for new chip type

[Marcel Selhorst]

Hello LKML,

this patch supports the Infineon Trusted Platform Module SLD 9630 (TPM 1.1b),
which is embedded on Intel-mainboards or in HP/Fujitsu-Siemens/Toshiba-Notebooks.
The module fits the interfaces created by IBM and was patched against the
latest kernel-snapshot 2.6.13-rc1-mm1.
Further information about this module and a list of supported hardware can be
found here: http://www.prosec.rub.de/tpm

Best Regards,
Marcel Selhorst

Signed-off-by: Marcel Selhorst <selhorst@crypto.rub.de>
---

diff -uprN linux-2.6.13-rc1-mm1/drivers/char/tpm/Kconfig linux-2.6.13-rc-mm1-tpm_inf/drivers/char/tpm/Kconfig
--- linux-2.6.13-rc1-mm1/drivers/char/tpm/Kconfig	2005-06-29 23:00:53.000000000 +0000
+++ linux-2.6.13-rc-mm1-tpm_inf/drivers/char/tpm/Kconfig	2005-07-05 10:12:20.000000000 +0000
@@ -35,5 +35,18 @@ config TCG_ATMEL
 	  will be accessible from within Linux.  To compile this driver
 	  as a module, choose M here; the module will be called tpm_atmel.

+config TCG_INFINEON
+	tristate "Infineon Technologies SLD 9630 TPM Interface"
+	depends on TCG_TPM
+	---help---
+	  If you have a TPM security chip from Infineon Technologies
+	  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_infineon.
+	  Further information on this driver and the supported hardware
+	  can be found at http://www.prosec.rub.de/tpm
+	  Note: To get debugging output into the module, you have to enable
+	  CONFIG_DEBUG_KERNEL, CONFIG_DEBUG_INFO and CONFIG_PCI_DEBUG
+
 endmenu

diff -uprN linux-2.6.13-rc1-mm1/drivers/char/tpm/Makefile linux-2.6.13-rc-mm1-tpm_inf/drivers/char/tpm/Makefile
--- linux-2.6.13-rc1-mm1/drivers/char/tpm/Makefile	2005-06-29 23:00:53.000000000 +0000
+++ linux-2.6.13-rc-mm1-tpm_inf/drivers/char/tpm/Makefile	2005-07-05 10:12:20.000000000 +0000
@@ -4,4 +4,5 @@
 obj-$(CONFIG_TCG_TPM) += tpm.o
 obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
 obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o
+obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o

diff -uprN linux-2.6.13-rc1-mm1/drivers/char/tpm/tpm_infineon.c linux-2.6.13-rc-mm1-tpm_inf/drivers/char/tpm/tpm_infineon.c
--- linux-2.6.13-rc1-mm1/drivers/char/tpm/tpm_infineon.c	1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.13-rc-mm1-tpm_inf/drivers/char/tpm/tpm_infineon.c	2005-07-05 14:35:19.000000000 +0000
@@ -0,0 +1,488 @@
+/*
+ * Copyright (C) 2005
+ * Marcel Selhorst <selhorst@crypto.rub.de>
+ * Applied Data Security Group
+ * Ruhr-University Bochum, Germany
+ *
+ * Description:
+ * Device Driver for the Infineon Technologies
+ * SLD 9630 TT Trusted Platform Module
+ * Specifications at www.trustedcomputinggroup.org	
+ *
+ * Project-Homepage:
+ * http://www.prosec.rub.de/tpm
+ *
+ * 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.
+ *
+ */
+
+#include "tpm.h"
+
+/* Infineon Specific Delay Definitions */
+enum tpm_delay_stuff {
+	TPM_MAX_WTX_PACKAGES	= 50,	/* Sets the maximum number of WTX-Packages */
+	TPM_WTX_MSLEEP_TIME	= 20,	/* Sets the msleep-Time for WTX-Packages */
+	TPM_MSLEEP_TIME		= 3,	/* msleep-Time --> Interval to check status register */
+	TPM_MAX_TRIES		= 5000 	/* gives number of max. msleep()-calls before
+throwing timeout */
+};
+
+/* Infineon Specific TPM Data */
+enum tpm_infineon_specific {
+	TCPA_INFINEON_DEV_VEN_VALUE	= 0x15D1,
+	TPM_DATA			= (TPM_ADDR+1) & 0xff
+};
+
+/* TPM Header stuff */
+enum tpm_infineon_header {
+	TPM_VL_VER			= 0x01,
+	TPM_VL_CHANNEL_CONTROL		= 0x07,
+	TPM_VL_CHANNEL_PERSONALISATION 	= 0x0A,
+	TPM_VL_CHANNEL_TPM		= 0x0B,
+	TPM_VL_CONTROL			= 0x00,
+	TPM_INF_NAK			= 0x15,
+	TPM_CTRL_WTX			= 0x10,
+	TPM_CTRL_WTX_ABORT		= 0x18,
+	TPM_CTRL_WTX_ABORT_ACK		= 0x18,
+	TPM_CTRL_ERROR			= 0x20,
+	TPM_CTRL_CHAININGACK		= 0x40,
+	TPM_CTRL_CHAINING		= 0x80,
+	TPM_CTRL_DATA			= 0x04,
+	TPM_CTRL_DATA_CHA		= 0x84,
+	TPM_CTRL_DATA_CHA_ACK		= 0xC4
+};
+
+/* Register */
+enum tpm_register {
+	WRFIFO	= 0x00,
+	RDFIFO	= 0x01,
+	STAT	= 0x02,
+	CMD	= 0x03
+};
+
+/* Command Bits */
+enum tpm_command_bits {
+	CMD_DIS		= 0x00,
+	CMD_LP		= 0x01,
+	CMD_RES		= 0x02,
+	CMD_IRQC	= 0x06
+};
+
+/* Status Bits */
+enum tpm_status_bits {
+	STAT_XFE 	= 0x00,
+	STAT_LPA 	= 0x01,
+	STAT_FOK 	= 0x02,
+	STAT_TOK 	= 0x03,
+	STAT_IRQA 	= 0x06,
+	STAT_RDA 	= 0x07
+};
+
+/* Some outgoing values */
+enum infineon_tpm_values {
+	CHIP_ID1		= 0x20,
+	CHIP_ID2		= 0x21,
+	DAR			= 0x30,
+	RESET_LP_IRQC_DISABLE	= 0x41,
+	ENABLE_REGISTER_PAIR	= 0x55,
+	IOLIMH			= 0x60,
+	IOLIML			= 0x61,
+	DISABLE_REGISTER_PAIR	= 0xAA,
+	IDVENL			= 0xF1,
+	IDVENH			= 0xF2,
+	IDPDL			= 0xF3,
+	IDPDH			= 0xF4
+};
+
+/* Global variable to count the Waiting-Time-Extensions */
+static int number_of_wtx = 0;	
+
+static int empty_fifo(struct tpm_chip *chip, int clear_wrfifo) {
+	int status;
+	int check=0;
+	int i=0;
+	int j=0;
+	
+	if (clear_wrfifo) {
+	    for (i=0; i<4096; i++) {
+		status = inb(chip->vendor->base+WRFIFO);
+		if (status == 0xff) {
+		    if (check==5)
+			break;
+		    else
+			check++;
+		}
+	    }
+	}
+	/* Note: The Values which are currently in the FIFO of the TPM
+	are thrown away since there is no usage for them. Usually,
+	this has nothing to say, since the TPM will give its answer immidiately
+	or will be aborted anyway, so the data here is usually garbage and useless.
+	We have to clean this, because the next communication with the TPM would
+	be rubbish, if there is still some old data in the Read FIFO.
+	*/
+	i = 0;
+	do {
+	    status = inb(chip->vendor->base+RDFIFO);
+	    status = inb(chip->vendor->base+STAT);
+	    j++;
+	    if (j==TPM_MAX_TRIES)
+		return -EIO;
+	} while ((status & (1<<STAT_RDA)) != 0);
+	return(0);
+}
+
+static int wait(struct tpm_chip *chip, int wait_for_bit) {
+
+  int status;
+  int i = 0;
+  for (i = 0; i < TPM_MAX_TRIES; i++) {		/* Check the TPM_TIMEOUT-Variable in the definitions in Infineon.h */
+      status = inb(chip->vendor->base + STAT);
+      if (status & 1<<wait_for_bit)		/* Check the Status-Register for the XFE-Bit */
+          break;
+      msleep(TPM_MSLEEP_TIME);
+    }
+  if (i == TPM_MAX_TRIES) {			/* In Case of an error, print information */
+      dev_err(&chip->pci_dev->dev,": Timeout in wait(");
+      if (wait_for_bit==STAT_XFE) dev_err(&chip->pci_dev->dev,"STAT_XFE)\n");
+      if (wait_for_bit==STAT_RDA) dev_err(&chip->pci_dev->dev,"STAT_RDA)\n");
+      return -EIO;
+  }
+  return(0);
+};
+
+static void wait_and_send(struct tpm_chip *chip, u8 sendbyte) {
+    wait(chip,STAT_XFE);
+    outb(sendbyte,chip->vendor->base+WRFIFO);
+}
+
+/* Note: WTX means Waiting-Time-Extension. Whenever the TPM
+needs more calculation time, it sends a WTX-package, which has to
+be acknowledged or aborted. This usually occurs if you are hammering
+the TPM with key creation. Set the maximum number of WTX-packages in
+the definitions above, if the number is reached, the Waiting-Time will be denied
+and the TPM command has to be resend.
+*/
+
+static void tpm_wtx(struct tpm_chip *chip) {
+	number_of_wtx++;
+	dev_info(&chip->pci_dev->dev,": Granting WTX (%02d / %02d)\n",number_of_wtx,TPM_MAX_WTX_PACKAGES);
+	wait_and_send(chip,TPM_VL_VER);
+	wait_and_send(chip,TPM_CTRL_WTX);
+	wait_and_send(chip,0x00);
+	wait_and_send(chip,0x00);
+	msleep(TPM_WTX_MSLEEP_TIME);
+}
+
+static void tpm_wtx_abort(struct tpm_chip *chip) {
+	dev_info(&chip->pci_dev->dev,": Sending WTX Abort\n");
+	wait_and_send(chip,TPM_VL_VER);
+	wait_and_send(chip,TPM_CTRL_WTX_ABORT);
+	wait_and_send(chip,0x00);
+	wait_and_send(chip,0x00);
+	number_of_wtx = 0;
+	dev_info(&chip->pci_dev->dev,": Waiting for Abort-Acknowledge\n");
+	msleep(TPM_WTX_MSLEEP_TIME);
+}
+
+static int tpm_inf_recv(struct tpm_chip *chip, u8 *buf, size_t count) {
+	int i;
+	int ret;
+	u32 size = 0;
+
+recv_begin:	
+	/* start reading header */
+	dev_dbg(&chip->pci_dev->dev,": Receiving Header: ");
+
+	for (i=0; i<4 ; i++) {
+	    ret = wait(chip,STAT_RDA);
+		if (ret)
+		    return -EIO;
+		
+	    buf[i]=inb(chip->vendor->base+RDFIFO);
+	    dev_dbg(&chip->pci_dev->dev,"%02x ",buf[i]);
+	}
+	    dev_dbg(&chip->pci_dev->dev,"\n");	
+	
+	if (buf[0] != TPM_VL_VER) {
+	    dev_err(&chip->pci_dev->dev,": Wrong Transport Protol Implementation!\n");
+	    return -EIO;
+	}
+
+	if (buf[1] == TPM_CTRL_DATA) {
+	    /* size of the data received */
+	    size = ((buf[2] << 8) | buf[3]);
+	    dev_dbg(&chip->pci_dev->dev,": Number of Bytes to Copy:  %d (0x%04x)\n",size,size);
+	    dev_dbg(&chip->pci_dev->dev,": Receiving Data-Bytes: ");
+
+	    for (i=0; i<size; i++) {
+		wait(chip,STAT_RDA);
+		buf[i]=inb(chip->vendor->base+RDFIFO);
+		dev_dbg(&chip->pci_dev->dev,"%02x ",buf[i]);
+	    }
+	    dev_dbg(&chip->pci_dev->dev,"\n");
+	
+	    if ((size == 0x6D00) && (buf[1] == 0x80)) {
+		dev_err(&chip->pci_dev->dev,": Error Handling on Vendor-Layer!\n");
+		return -EIO;
+	    }
+	
+	    for (i=0;i<size;i++)
+		buf[i]=buf[i+6];
+
+	    size=size-6;
+	    return (size);
+	}
+	
+	if (buf[1] == TPM_CTRL_WTX) {
+	    dev_info(&chip->pci_dev->dev,": WTX-package received\n");
+	    if (number_of_wtx < TPM_MAX_WTX_PACKAGES) {
+		tpm_wtx(chip);
+		goto recv_begin;
+	    } else {
+	    	tpm_wtx_abort(chip);
+		goto recv_begin;
+	    }
+	}
+	if (buf[1] == TPM_CTRL_WTX_ABORT_ACK) {
+	    dev_info(&chip->pci_dev->dev,": WTX-Abort-Acknowledgement-package received\n");
+		return size;
+	}
+
+	if (buf[1] == TPM_CTRL_ERROR) {
+	    dev_err(&chip->pci_dev->dev,": ERROR-package received:\n");
+	    if (buf[4] == TPM_INF_NAK)
+	        dev_err(&chip->pci_dev->dev,": -> Negative Acknowledgement - Please retransmit commando!\n");
+	    return -EIO;
+	}
+	return -EIO;
+}
+
+static int tpm_inf_send(struct tpm_chip *chip, u8 *buf, size_t count) {
+	int i;
+	int ret;
+	u8 count_high,count_low,count_4,count_3,count_2,count_1;
+	/* Disabling Reset, LP and IRQC */
+	outb(RESET_LP_IRQC_DISABLE,chip->vendor->base+CMD);	
+
+	ret = empty_fifo(chip,1);
+	    if (ret) {
+		dev_err(&chip->pci_dev->dev,"Timeout while clearing FIFOs\n");
+		return -EIO;
+	    }
+
+	ret = wait(chip,STAT_XFE);
+	    if (ret)
+		return -EIO;
+
+	count_4=(count & 0xff000000)>>24;
+	count_3=(count & 0x00ff0000)>>16;
+	count_2=(count & 0x0000ff00)>>8;
+	count_1=(count & 0x000000ff);
+	count_high = ((count+6) & 0xffffff00)>>8;
+	count_low = ((count+6) & 0x000000ff);
+
+	/* Sending Header */
+	dev_dbg(&chip->pci_dev->dev,": Sending Header %02x %02x %02x %02x\n",TPM_VL_VER,TPM_CTRL_DATA,count_high,count_low);
+
+	wait_and_send(chip,TPM_VL_VER);
+	wait_and_send(chip,TPM_CTRL_DATA);
+	wait_and_send(chip,count_high);
+	wait_and_send(chip,count_low);
+	
+	count_high=0;
+	count_low=0;
+
+	count_high = (count & 0xffff0000);
+	count_low = (count & 0x0000ffff);
+
+	/* Sending Data Header */
+	dev_dbg(&chip->pci_dev->dev,": Sending Data   %02x %02x %02x %02x %02x %02x ",TPM_VL_VER,TPM_VL_CHANNEL_TPM,count_4,count_3,count_2,count_1);		
+
+	wait_and_send(chip,TPM_VL_VER);
+	wait_and_send(chip,TPM_VL_CHANNEL_TPM);
+	wait_and_send(chip,count_4);
+	wait_and_send(chip,count_3);
+	wait_and_send(chip,count_2);
+	wait_and_send(chip,count_1);
+
+	for (i = 0; i < count; i++) {
+	    wait_and_send(chip,buf[i]);
+	    dev_dbg(&chip->pci_dev->dev,"%02x ",buf[i]);
+	}
+	dev_dbg(&chip->pci_dev->dev,"\n");
+	dev_dbg(&chip->pci_dev->dev,": Sending Data successful -> %d (0x%04x) from %d (0x%04x) Data-Bytes written\n",count,count,i,i);
+	return count;
+}
+static void tpm_inf_cancel(struct tpm_chip *chip) {
+    /* Nothing yet!
+    This has something to do with the internal functions
+    of the TPM. Abort isn't really necessary...
+    */
+}
+
+static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL);
+static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL);
+static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL);
+static DEVICE_ATTR(cancel, S_IWUSR|S_IWGRP, NULL, tpm_store_cancel);
+
+static struct attribute * inf_attrs[] = {
+	&dev_attr_pubek.attr,
+	&dev_attr_pcrs.attr,
+	&dev_attr_caps.attr,
+	&dev_attr_cancel.attr,
+	0,
+};
+
+static struct attribute_group inf_attr_grp = { .attrs = inf_attrs };
+
+static struct file_operations inf_ops = {
+	.owner = THIS_MODULE,
+	.llseek = no_llseek,
+	.open = tpm_open,
+	.read = tpm_read,
+	.write = tpm_write,
+	.release = tpm_release,
+};
+
+static struct tpm_vendor_specific tpm_inf = {
+	.recv = tpm_inf_recv,
+	.send = tpm_inf_send,
+	.cancel = tpm_inf_cancel,
+	.req_complete_mask = 0,
+	.req_complete_val = 0,
+	.attr_group = &inf_attr_grp,
+	.miscdev = { .fops = &inf_ops, },
+};
+
+int __init tpm_inf_probe(struct pci_dev *pci_dev, const struct pci_device_id *pci_id) {
+
+	int rc = 0;
+	u8 ioh;
+	u8 iol;
+	int vendor[4];
+	int version[2];
+	int status = 0;
+
+	if (pci_enable_device(pci_dev))
+		return -EIO;
+
+	dev_dbg(&pci_dev->dev,": LPC-Bus found at 0x%x\n",pci_id->device);	
+
+	/* query chip for its vendor, its version number a.s.o. */
+
+	outb(ENABLE_REGISTER_PAIR, TPM_ADDR);
+	outb(IDVENL, TPM_ADDR);
+	vendor[1] = inb(TPM_DATA) ;
+	outb(IDVENH, TPM_ADDR);
+	vendor[0] = inb(TPM_DATA) ;
+	outb(IDPDL, TPM_ADDR);
+	vendor[3] = inb(TPM_DATA) ;
+	outb(IDPDH, TPM_ADDR);
+	vendor[2] = inb(TPM_DATA) ;
+	outb(CHIP_ID1, TPM_ADDR);
+	version[1] = inb(TPM_DATA) ;
+	outb(CHIP_ID2, TPM_ADDR);
+	version[0] = inb(TPM_DATA) ;
+
+	if ((vendor[1] == (TCPA_INFINEON_DEV_VEN_VALUE & 0xFF)) && ((vendor[0] << 8) == (TCPA_INFINEON_DEV_VEN_VALUE & 0x00FF << 8))) {
+
+	    /* Read IOPorts from TPM */
+	    outb(IOLIMH, TPM_ADDR);
+	    ioh = inb(TPM_DATA);
+	    dev_dbg(&pci_dev->dev,": Current Values in IOLIMH: %02x\n",ioh);
+	    outb(IOLIML, TPM_ADDR);
+	    iol = inb(TPM_DATA);
+	    dev_dbg(&pci_dev->dev,": Current Values in IOLIML: %02x\n",iol);	
+	    tpm_inf.base = (ioh<<8) | iol;
+	
+	    if (tpm_inf.base == 0) {
+	    dev_err(&pci_dev->dev,": No IO-Ports set!\n");
+	    pci_disable_device(pci_dev);
+	    return -ENODEV;
+	    }
+
+	    /* Activate Register */
+	    outb(DAR,TPM_ADDR);
+	    outb(0x01,TPM_DATA);
+	    outb(DAR,TPM_ADDR);
+	    status = inb (TPM_DATA);
+	    dev_dbg(&pci_dev->dev,": Device Activate Register Status : %x \n",status);
+	    outb(DISABLE_REGISTER_PAIR, TPM_ADDR);
+
+	    /* Disabling reset, LP and IRQC */
+	    outb(RESET_LP_IRQC_DISABLE,tpm_inf.base+CMD);		
+	    dev_dbg(&pci_dev->dev,": Disabling Reset, LP and IRQC\n");
+	    dev_dbg(&pci_dev->dev,": Setting WRFIFO: %04x\n",tpm_inf.base+WRFIFO);
+	    dev_dbg(&pci_dev->dev,": Setting RDFIFO: %04x\n",tpm_inf.base+RDFIFO);
+	    dev_dbg(&pci_dev->dev,": Setting STAT  : %04x\n",tpm_inf.base+STAT);
+	    dev_dbg(&pci_dev->dev,": Setting CMD   : %04x\n",tpm_inf.base+CMD);
+
+	    /* Finally, we're done, print some infos */	
+	    dev_info(&pci_dev->dev,"************************************************\n");
+	    dev_info(&pci_dev->dev,"*    TPM found with IO-Base 0x%x             *\n",tpm_inf.base);
+	    dev_info(&pci_dev->dev,"*    Chip    ID %02x%02x                           *\n",version[0], version[1]);
+	    dev_info(&pci_dev->dev,"*    Vendor  ID %x%x (Infineon)                *\n",vendor[0], vendor[1]);
+	    if ((vendor[2] == 0) && (vendor[3] == 6))
+		dev_info(&pci_dev->dev,"*    Product ID %02x%02x (SLD 9630 TT 1.1)         *\n",vendor[2],vendor[3]);
+	    else
+		dev_info(&pci_dev->dev,"*    Product ID %02x%02x                           *\n",vendor[2],vendor[3]);
+	    dev_info(&pci_dev->dev,"************************************************\n");
+
+	    /* Let's register our hardware */
+	    dev_dbg(&pci_dev->dev,"Registering TPM-Infineon-Driver: %x\n",rc);	
+	    rc = tpm_register_hardware(pci_dev, &tpm_inf);	
+	    if (rc < 0) {
+		pci_disable_device(pci_dev);
+		return -ENODEV;
+	    }
+	    return 0;
+
+	} else {
+	    dev_err(&pci_dev->dev,": No Infineon TPM found! Sorry! \n");
+	    pci_disable_device(pci_dev);
+	    return -ENODEV;
+    }
+}
+
+static struct pci_device_id tpm_pci_tbl [] __devinitdata = {
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_2)},
+        {0,}
+};
+
+MODULE_DEVICE_TABLE(pci, tpm_pci_tbl);
+
+static struct pci_driver inf_pci_driver = {
+	.name = "tpm_inf",
+	.id_table = tpm_pci_tbl,
+	.probe = tpm_inf_probe,
+	.remove = __devexit_p(tpm_remove),
+	.suspend = tpm_pm_suspend,
+	.resume = tpm_pm_resume,
+};
+
+static int __init init_inf(void) {
+	return pci_register_driver(&inf_pci_driver);
+}
+
+static void __exit cleanup_inf(void) {
+	pci_unregister_driver(&inf_pci_driver);
+}
+
+module_init(init_inf);
+module_exit(cleanup_inf);
+
+MODULE_AUTHOR("Marcel Selhorst (selhorst@crypto.rub.de)");
+MODULE_DESCRIPTION("Infineon TPM Driver");
+MODULE_VERSION("1.4");
+MODULE_LICENSE("GPL");

Re: [PATCH] tpm: Support for new chip type

[Alexey Dobriyan]

On Tuesday 05 July 2005 16:49, Marcel Selhorst wrote:
> this patch supports the Infineon Trusted Platform Module SLD 9630 (TPM 1.1b),
> which is embedded on Intel-mainboards or in HP/Fujitsu-Siemens/Toshiba-Notebooks.

Please feed it to scripts/Lindent. It will at least place all curly bracers
right.

> --- linux-2.6.13-rc1-mm1/drivers/char/tpm/tpm_infineon.c
> +++ linux-2.6.13-rc-mm1-tpm_inf/drivers/char/tpm/tpm_infineon.c

> +/* Register */
> +enum tpm_register {

> +/* Command Bits */
> +enum tpm_command_bits {

> +/* Status Bits */
> +enum tpm_status_bits {

IMO, useless comments.

> +/* Global variable to count the Waiting-Time-Extensions */

Well, we see it's a variable and it's global in this file.

> +static int number_of_wtx = 0;	

You can also remove " = 0" and make it go to .bss.

> +static int empty_fifo(struct tpm_chip *chip, int clear_wrfifo) {

> +	int i=0;

Unneeded initialisation.

> +	/* Note: The Values which are currently in the FIFO of the TPM

values

> +	are thrown away since there is no usage for them. Usually,
> +	this has nothing to say, since the TPM will give its answer immidiately

immediately

> +	return(0);

return 0;

> +static int wait(struct tpm_chip *chip, int wait_for_bit) {

> +  int i = 0;

Unneeded initialisation.

> +  for (i = 0; i < TPM_MAX_TRIES; i++) {		/* Check the TPM_TIMEOUT-Variable in the definitions in Infineon.h */

There is no Infineon.h

> +  return(0);

return 0; everywhere, please.

> +static int tpm_inf_recv(struct tpm_chip *chip, u8 *buf, size_t count) {

> +	    return (size);

return size;

> +static struct attribute * inf_attrs[] = {
> +	0,

NULL

> +int __init tpm_inf_probe(struct pci_dev *pci_dev, const struct pci_device_id *pci_id) {

static

> +	    /* Finally, we're done, print some infos */	
> +	    dev_info(&pci_dev->dev,"************************************************\n");
> +	    dev_info(&pci_dev->dev,"*    TPM found with IO-Base 0x%x             *\n",tpm_inf.base);
> +	    dev_info(&pci_dev->dev,"*    Chip    ID %02x%02x                           *\n",version[0], version[1]);
> +	    dev_info(&pci_dev->dev,"*    Vendor  ID %x%x (Infineon)                *\n",vendor[0], vendor[1]);
> +	    if ((vendor[2] == 0) && (vendor[3] == 6))
> +		dev_info(&pci_dev->dev,"*    Product ID %02x%02x (SLD 9630 TT 1.1)         *\n",vendor[2],vendor[3]);
> +	    else
> +		dev_info(&pci_dev->dev,"*    Product ID %02x%02x                           *\n",vendor[2],vendor[3]);
> +	    dev_info(&pci_dev->dev,"************************************************\n");

Remove this silly banner.

	dev_info(&pci_dev->dev, ": TPM found: "
				"io base 0x%x, "
				"chip id %02x%02x, "
				"vendor id %x%x (Infineon), "
				"product id %02x%02x"
				"%s\n",
		tpm_inf.base,
		version[0], version[1],
		vendor[0], vendor[1],
		vendor[2],vendor[3],
		((vendor[2] == 0) && (vendor[3] == 6)) ? " (SLD 9630 TT 1.1)" : "");

should be enough. BTW, care to explain why something called "chip id" is in
something called "version" and something called "product id" in in something
called "vendor"?

> +	    /* Let's register our hardware */

Useless comment.

> +	    dev_dbg(&pci_dev->dev,"Registering TPM-Infineon-Driver: %x\n",rc);	

Will always print 0. Could you please also remove Studly Caps from debug, info
and error messages?

> +	    rc = tpm_register_hardware(pci_dev, &tpm_inf);	
> +	    if (rc < 0) {
> +		pci_disable_device(pci_dev);
> +		return -ENODEV;
> +	    }
> +	    return 0;
> +
> +	} else {
> +	    dev_err(&pci_dev->dev,": No Infineon TPM found! Sorry! \n");

Trailing space. Why be sorry? :-)

> +MODULE_AUTHOR("Marcel Selhorst (selhorst@crypto.rub.de)");

People usually enclose emails in <>.