dm: Convert TPM drivers to driver model

This is not used anymore by any board so drop it.

Signed-off-by Simon Glass <[email protected]>

---

  drivers/tpm/tpm.c         | 108 ++--------------------------------------------
  drivers/tpm/tpm_private.h |   4 +-
  drivers/tpm/tpm_tis_i2c.c |  74 +------------------------------
  3 files changed, 7 insertions(+), 179 deletions(-)

drivers/tpm/tpm.c +4 -104

index a650892..24997f6 100644
@@ -49,13 +49,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
  /* TPM configuration */
  struct tpm {
-#ifdef CONFIG_DM_I2C
  	struct udevice *dev;
-#else
-	int i2c_bus;
-	int slave_addr;
-	int old_bus;
-#endif
  	char inited;
  } tpm;
 

@@ -441,7 +435,6 @@ out:
  	return rc;
  }
 
-#ifdef CONFIG_DM_I2C
  static int tpm_open_dev(struct udevice *dev)
  {
  	int rc;

@@ -449,24 +442,12 @@ static int tpm_open_dev(struct udevice *dev)
  	debug("%s: start\n", __func__);
  	if (g_chip.is_open)
  		return -EBUSY;
-	rc = tpm_vendor_init_dev(dev);
+	rc = tpm_vendor_init(dev);
  	if (rc < 0)
  		g_chip.is_open = 0;
  	return rc;
  }
-#else
-static 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;
-}
-#endif
  static void tpm_close(void)
  {
  	if (g_chip.is_open) {

@@ -475,42 +456,6 @@ static void tpm_close(void)
  	}
  }
 
-static int tpm_select(void)
-{
-#ifndef CONFIG_DM_I2C
-	int ret;
-
-	tpm.old_bus = i2c_get_bus_num();
-	if (tpm.old_bus != tpm.i2c_bus) {
-		ret = i2c_set_bus_num(tpm.i2c_bus);
-		if (ret) {
-			debug("%s: Fail to set i2c bus %d\n", __func__,
-			      tpm.i2c_bus);
-			return -1;
-		}
-	}
-#endif
-	return 0;
-}
-
-static int tpm_deselect(void)
-{
-#ifndef CONFIG_DM_I2C
-	int ret;
-
-	if (tpm.old_bus != i2c_get_bus_num()) {
-		ret = i2c_set_bus_num(tpm.old_bus);
-		if (ret) {
-			debug("%s: Fail to restore i2c bus %d\n",
-			      __func__, tpm.old_bus);
-			return -1;
-		}
-	}
-	tpm.old_bus = -1;
-#endif
-	return 0;
-}
-
  /**
   * Decode TPM configuration.
   *

@@ -520,8 +465,11 @@ static int tpm_deselect(void)
  static int tpm_decode_config(struct tpm *dev)
  {
  	const void *blob = gd->fdt_blob;
+	struct udevice *bus;
+	int chip_addr;
  	int parent;
  	int node;
+	int ret;
 
  	node = fdtdec_next_compatible(blob, 0, COMPAT_INFINEON_SLB9635_TPM);
  	if (node < 0) {

@@ -537,10 +485,6 @@ static int tpm_decode_config(struct tpm *dev)
  		debug("%s: Cannot find node parent\n", __func__);
  		return -1;
  	}
-#ifdef CONFIG_DM_I2C
-	struct udevice *bus;
-	int chip_addr;
-	int ret;
 
  	/*
  	 * TODO(sjg at chromium.org): Remove this when driver model supports

@@ -569,15 +513,6 @@ static int tpm_decode_config(struct tpm *dev)
  		      fdt_get_name(blob, node, NULL), ret);
  		return ret;
  	}
-#else
-	int i2c_bus;
-
-	i2c_bus = i2c_get_bus_num_fdt(parent);
-	if (i2c_bus < 0)
-		return -1;
-	dev->i2c_bus = i2c_bus;
-	dev->slave_addr = fdtdec_get_addr(blob, node, "reg");
-#endif
 
  	return 0;
  }

@@ -602,22 +537,6 @@ int tis_init(void)
  	if (tpm_decode_config(&tpm))
  		return -1;
 
-	if (tpm_select())
-		return -1;
-
-#ifndef CONFIG_DM_I2C
-	/*
-	 * Probe TPM twice; the first probing might fail because TPM is asleep,
-	 * and the probing can wake up TPM.
-	 */
-	if (i2c_probe(tpm.slave_addr) && i2c_probe(tpm.slave_addr)) {
-		debug("%s: fail to probe i2c addr 0x%x\n", __func__,
-		      tpm.slave_addr);
-		return -1;
-	}
-#endif
-
-	tpm_deselect();
  	debug("%s: done\n", __func__);
 
  	tpm.inited = 1;

@@ -632,16 +551,7 @@ int tis_open(void)
  	if (!tpm.inited)
  		return -1;
 
-	if (tpm_select())
-		return -1;
-
-#ifdef CONFIG_DM_I2C
  	rc = tpm_open_dev(tpm.dev);
-#else
-	rc = tpm_open(tpm.slave_addr);
-#endif
-
-	tpm_deselect();
 
  	return rc;
  }

@@ -651,13 +561,8 @@ int tis_close(void)
  	if (!tpm.inited)
  		return -1;
 
-	if (tpm_select())
-		return -1;
-
  	tpm_close();
 
-	tpm_deselect();
-
  	return 0;
  }
 

@@ -675,13 +580,8 @@ int tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size,
 
  	memcpy(buf, sendbuf, sbuf_size);
 
-	if (tpm_select())
-		return -1;
-
  	len = tpm_transmit(buf, sbuf_size);
 
-	tpm_deselect();
-
  	if (len < 10) {
  		*rbuf_len = 0;
  		return -1;

drivers/tpm/tpm_private.h +1 -3

index 8894c98..daaf8b8 100644
@@ -129,10 +129,8 @@ struct tpm_cmd_t {
 
  struct tpm_chip *tpm_register_hardware(const struct tpm_vendor_specific *);
 
-int tpm_vendor_init(uint32_t dev_addr);
-
  struct udevice;
-int tpm_vendor_init_dev(struct udevice *dev);
+int tpm_vendor_init(struct udevice *dev);
 
  void tpm_vendor_cleanup(struct tpm_chip *chip);
 

drivers/tpm/tpm_tis_i2c.c +2 -72

index ee4dfea..a7082e6 100644
@@ -50,9 +50,6 @@
 
  DECLARE_GLOBAL_DATA_PTR;
 
-/* Address of the TPM on the I2C bus */
-#define TPM_I2C_ADDR		0x20
-
  /* Max buffer size supported by our tpm */
  #define TPM_DEV_BUFSIZE		1260
 

@@ -73,13 +70,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
  #define TPM_HEADER_SIZE		10
 
-/*
- * Expected value for DIDVID register
- *
- * The only device the system knows about at this moment is Infineon slb9635.
- */
-#define TPM_TIS_I2C_DID_VID	0x000b15d1L
-
  enum tis_access {
  	TPM_ACCESS_VALID		= 0x80,
  	TPM_ACCESS_ACTIVE_LOCALITY	= 0x20,

@@ -123,21 +113,11 @@ static const char * const chip_name[] = {
 
  /* Structure to store I2C TPM specific stuff */
  struct tpm_dev {
-#ifdef CONFIG_DM_I2C
  	struct udevice *dev;
-#else
-	uint addr;
-#endif
  	u8 buf[TPM_DEV_BUFSIZE + sizeof(u8)];  /* Max buffer size + addr */
  	enum i2c_chip_type chip_type;
  };
 
-static struct tpm_dev tpm_dev = {
-#ifndef CONFIG_DM_I2C
-	.addr = TPM_I2C_ADDR
-#endif
-};
-
  static struct tpm_dev tpm_dev;
 
  /*

@@ -163,12 +143,7 @@ static int iic_tpm_read(u8 addr, u8 *buffer, size_t len)
  	if ((tpm_dev.chip_type == SLB9635) || (tpm_dev.chip_type == UNKNOWN)) {
  		/* slb9635 protocol should work in both cases */
  		for (count = 0; count < MAX_COUNT; count++) {
-#ifdef CONFIG_DM_I2C
  			rc = dm_i2c_write(tpm_dev.dev, 0, (uchar *)&addrbuf, 1);
-#else
-			rc = i2c_write(tpm_dev.addr, 0, 0,
-				       (uchar *)&addrbuf, 1);
-#endif
  			if (rc == 0)
  				break;  /* Success, break to skip sleep */
  			udelay(SLEEP_DURATION);

@@ -182,11 +157,7 @@ static int iic_tpm_read(u8 addr, u8 *buffer, size_t len)
  		 */
  		for (count = 0; count < MAX_COUNT; count++) {
  			udelay(SLEEP_DURATION);
-#ifdef CONFIG_DM_I2C
  			rc = dm_i2c_read(tpm_dev.dev, 0, buffer, len);
-#else
-			rc = i2c_read(tpm_dev.addr, 0, 0, buffer, len);
-#endif
  			if (rc == 0)
  				break;  /* success, break to skip sleep */
  		}

@@ -199,11 +170,7 @@ static int iic_tpm_read(u8 addr, u8 *buffer, size_t len)
  		 * be safe on the safe side.
  		 */
  		for (count = 0; count < MAX_COUNT; count++) {
-#ifdef CONFIG_DM_I2C
  			rc = dm_i2c_read(tpm_dev.dev, addr, buffer, len);
-#else
-			rc = i2c_read(tpm_dev.addr, addr, 1, buffer, len);
-#endif
  			if (rc == 0)
  				break;  /* break here to skip sleep */
  			udelay(SLEEP_DURATION);

@@ -224,20 +191,8 @@ static int iic_tpm_write_generic(u8 addr, u8 *buffer, size_t len,
  	int rc = 0;
  	int count;
 
-	/* Prepare send buffer */
-#ifndef CONFIG_DM_I2C
-	tpm_dev.buf[0] = addr;
-	memcpy(&(tpm_dev.buf[1]), buffer, len);
-	buffer = tpm_dev.buf;
-	len++;
-#endif
-
  	for (count = 0; count < max_count; count++) {
-#ifdef CONFIG_DM_I2C
  		rc = dm_i2c_write(tpm_dev.dev, addr, buffer, len);
-#else
-		rc = i2c_write(tpm_dev.addr, 0, 0, buffer, len);
-#endif
  		if (rc == 0)
  			break;  /* Success, break to skip sleep */
  		udelay(sleep_time);

@@ -597,12 +552,13 @@ static enum i2c_chip_type tpm_vendor_chip_type(void)
  	return UNKNOWN;
  }
 
-static int tpm_vendor_init_common(void)
+int tpm_vendor_init(struct udevice *dev)
  {
  	struct tpm_chip *chip;
  	u32 vendor;
  	u32 expected_did_vid;
 
+	tpm_dev.dev = dev;
  	tpm_dev.chip_type = tpm_vendor_chip_type();
 
  	chip = tpm_register_hardware(&tpm_tis_i2c);

@@ -651,32 +607,6 @@ static int tpm_vendor_init_common(void)
  	return 0;
  }
 
-#ifdef CONFIG_DM_I2C
-/* Initialisation of i2c tpm */
-int tpm_vendor_init_dev(struct udevice *dev)
-{
-	tpm_dev.dev = dev;
-	return tpm_vendor_init_common();
-}
-#else
-/* Initialisation of i2c tpm */
-int tpm_vendor_init(uint32_t dev_addr)
-{
-	uint old_addr;
-	int rc = 0;
-
-	old_addr = tpm_dev.addr;
-	if (dev_addr != 0)
-		tpm_dev.addr = dev_addr;
-
-	rc = tpm_vendor_init_common();
-	if (rc)
-		tpm_dev.addr = old_addr;
-
-	return rc;
-}
-#endif
-
  void tpm_vendor_cleanup(struct tpm_chip *chip)
  {
  	release_locality(chip, chip->vendor.locality, 1);

Hi Simon,

In here you are removing usage of i2c_read/i2c_write for dm_i2c_read/dm_i2c_write.
This require boards to support DM_I2C which is not the case with example beagleboard or boards using omap.

Will you drop all drivers not supporting DM in the future ?

Other than that i have proposed about the same change here:
http://lists.denx.de/pipermail/u-boot/2015-August/222598.html

Acked-by Christophe Ricard <[email protected]>

Best Regards
Christophe

Quoted 12 lines · Simon Glass

This is not used anymore by any board so drop it.

Signed-off-by Simon Glass <[email protected]>

---

  drivers/tpm/tpm.c         | 108
++--------------------------------------------
  drivers/tpm/tpm_private.h |   4 +-
  drivers/tpm/tpm_tis_i2c.c |  74 +------------------------------
  3 files changed, 7 insertions(+), 179 deletions(-)

The address of the I2C TPM is now defined in the device tree so there is no need for the CONFIG options.

Remove them from the README and board config to avoid confusion.

Signed-off-by Simon Glass <[email protected]>

---

  README                           | 6 ------
  include/configs/exynos5-common.h | 2 --
  2 files changed, 8 deletions(-)

README +0 -6

index 1bcb63c..b55175a 100644
@@ -1496,12 +1496,6 @@ The following options need to be configured:
  		Support for i2c bus TPM devices. Only one device
  		per system is supported at this time.
 
-			CONFIG_TPM_TIS_I2C_BUS_NUMBER
-			Define the the i2c bus number for the TPM device
-
-			CONFIG_TPM_TIS_I2C_SLAVE_ADDRESS
-			Define the TPM's address on the i2c bus
-
  			CONFIG_TPM_TIS_I2C_BURST_LIMITATION
  			Define the burst count bytes upper limit
 

include/configs/exynos5-common.h +0 -2

index e710f41..fb5ee0d 100644
@@ -58,8 +58,6 @@
  #define CONFIG_TPM
  #define CONFIG_CMD_TPM
  #define CONFIG_TPM_TIS_I2C
-#define CONFIG_TPM_TIS_I2C_BUS_NUMBER	3
-#define CONFIG_TPM_TIS_I2C_SLAVE_ADDR	0x20
 
  /* MMC SPL */
  #define COPY_BL2_FNPTR_ADDR	0x02020030

Add new Kconfig options for TPMs in preparation for moving boards to use Kconfig for TPM configuration.

Signed-off-by Simon Glass <[email protected]>

---

  common/Kconfig      | 12 ++++++++++++
  drivers/tpm/Kconfig | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  lib/Kconfig         | 10 ++++++++++
  3 files changed, 74 insertions(+)

common/Kconfig +12 -0

index 40cd69e..05faae9 100644
@@ -618,4 +618,16 @@ config CMD_REGULATOR
 
  endmenu
 
+menu "Security commands"
+config CMD_TPM
+	bool "Enable the 'tpm' command"
+	depends on TPM
+	help
+	  This provides a means to talk to a TPM from the command line. A wide
+	  range of commands if provided - see 'tpm help' for details. The
+	  command requires a suitable TPM on your board and the correct driver
+	  must be enabled.
+
+endmenu
+
  endmenu

drivers/tpm/Kconfig +42 -0

index f408b8a..993d2d7 100644
@@ -1,7 +1,59 @@
  config TPM_TIS_SANDBOX
  	bool "Enable sandbox TPM driver"
+	depends on SANDBOX
  	help
  	  This driver emulates a TPM, providing access to base functions
  	  such as reading and writing TPM private data. This is enough to
  	  support Chrome OS verified boot. Extend functionality is not
  	  implemented.
+
+config TPM_ATMEL_TWI
+	bool "Enable Atmel TWI TPM device driver"
+	depends on TPM
+	help
+	  This driver supports an Atmel TPM device connected on the I2C bus.
+	  The usual tpm operations and the 'tpm' command can be used to talk
+	  to the device using the standard TPM Interface Specification (TIS)
+	  protocol
+
+config TPM_TIS_I2C
+	bool "Enable support for Infineon SLB9635/45 TPMs on I2C"
+	depends on TPM && DM_I2C
+	help
+	  This driver supports Infineon TPM devices connected on the I2C bus.
+	  The usual tpm operations and the 'tpm' command can be used to talk
+	  to the device using the standard TPM Interface Specification (TIS)
+	  protocol
+
+config TPM_TIS_I2C_BURST_LIMITATION
+	bool "Enable I2C burst length limitation"
+	depends on TPM_TIS_I2C
+	help
+	  Some broken TPMs have a limitation on the number of bytes they can
+	  receive in one message. Enable this option to allow you to set this
+	  option. The can allow a broken TPM to be used by splitting messages
+	  into separate pieces.
+
+config TPM_TIS_I2C_BURST_LIMITATION_LEN
+	int "Length"
+	depends on TPM_TIS_I2C_BURST_LIMITATION
+	help
+	  Use this to set the burst limitation length
+
+config TPM_TIS_LPC
+	bool "Enable support for Infineon SLB9635/45 TPMs on LPC"
+	depends on TPM && X86
+	help
+	  This driver supports Infineon TPM devices connected on the I2C bus.
+	  The usual tpm operations and the 'tpm' command can be used to talk
+	  to the device using the standard TPM Interface Specification (TIS)

lib/Kconfig +3 -0

index 884218a..0673072 100644
@@ -54,6 +54,16 @@ source lib/dhry/Kconfig
 
  source lib/rsa/Kconfig
 
+config TPM
+	bool "Trusted Platform Module (TPM) Support"
+	help

Hi Simon,

Quoted 107 lines · Simon Glass

Add new Kconfig options for TPMs in preparation for moving boards to use Kconfig for TPM configuration.

Signed-off-by Simon Glass <[email protected]>

---

  common/Kconfig      | 12 ++++++++++++
  drivers/tpm/Kconfig | 52
++++++++++++++++++++++++++++++++++++++++++++++++++++
  lib/Kconfig         | 10 ++++++++++
  3 files changed, 74 insertions(+)

common/Kconfig +5 -0

index 40cd69e..05faae9 100644
@@ -618,4 +618,16 @@ config CMD_REGULATOR
    endmenu
  +menu "Security commands"
+config CMD_TPM
+       bool "Enable the 'tpm' command"
+       depends on TPM
+       help
+         This provides a means to talk to a TPM from the command line. A

wide

common/Kconfig +2 -0

+         range of commands if provided - see 'tpm help' for details. The
+         command requires a suitable TPM on your board and the correct

driver

common/Kconfig +4 -0

+         must be enabled.
+
+endmenu
+
  endmenu

drivers/tpm/Kconfig +7 -0

index f408b8a..993d2d7 100644
@@ -1,7 +1,59 @@
  config TPM_TIS_SANDBOX
        bool "Enable sandbox TPM driver"
+       depends on SANDBOX
        help
          This driver emulates a TPM, providing access to base functions
          such as reading and writing TPM private data. This is enough to
          support Chrome OS verified boot. Extend functionality is not
          implemented.
+
+config TPM_ATMEL_TWI
+       bool "Enable Atmel TWI TPM device driver"
+       depends on TPM
+       help
+         This driver supports an Atmel TPM device connected on the I2C

bus.
+ The usual tpm operations and the 'tpm' command can be used to
talk
+ to the device using the standard TPM Interface Specification
(TIS)

drivers/tpm/Kconfig +7 -0

+         protocol
+
+config TPM_TIS_I2C
+       bool "Enable support for Infineon SLB9635/45 TPMs on I2C"
+       depends on TPM && DM_I2C
+       help
+         This driver supports Infineon TPM devices connected on the I2C

bus.
+ The usual tpm operations and the 'tpm' command can be used to
talk
+ to the device using the standard TPM Interface Specification
(TIS)

drivers/tpm/Kconfig +7 -0

+         protocol
+
+config TPM_TIS_I2C_BURST_LIMITATION
+       bool "Enable I2C burst length limitation"
+       depends on TPM_TIS_I2C
+       help
+         Some broken TPMs have a limitation on the number of bytes they

can
+ receive in one message. Enable this option to allow you to set
this
+ option. The can allow a broken TPM to be used by splitting
messages

drivers/tpm/Kconfig +13 -0

+         into separate pieces.
+
+config TPM_TIS_I2C_BURST_LIMITATION_LEN
+       int "Length"
+       depends on TPM_TIS_I2C_BURST_LIMITATION
+       help
+         Use this to set the burst limitation length
+
+config TPM_TIS_LPC
+       bool "Enable support for Infineon SLB9635/45 TPMs on LPC"
+       depends on TPM && X86
+       help
+         This driver supports Infineon TPM devices connected on the I2C

bus.
+ The usual tpm operations and the 'tpm' command can be used to
talk
+ to the device using the standard TPM Interface Specification
(TIS)

drivers/tpm/Kconfig +7 -0

+         protocol
+
+config TPM_AUTH_SESSIONS
+       bool "Enable TPM authentication session support"
+       depends on TPM
+       help
+         Enable support for authorised (AUTH1) commands as specified in

drivers/tpm/Kconfig line 59

Quoted 5 lines

the
+ TCG Main Specification 1.2. OIAP-authorised versions of the
commands

drivers/tpm/Kconfig +2 -0

+         TPM_LoadKey2 and TPM_GetPubKey are provided. Both features are
+         available using the 'tpm' command, too.

Won't you put all TPM drivers in a "TPM support" menu showing "Device Drivers" parent ?

Quoted 17 lines

lib/Kconfig +3 -0

index 884218a..0673072 100644
@@ -54,6 +54,16 @@ source lib/dhry/Kconfig
    source lib/rsa/Kconfig
  +config TPM
+       bool "Trusted Platform Module (TPM) Support"
+       help
+         This enables support for TPMs which can be used to provide

security

lib/Kconfig +2 -0

+         features for your board. The TPM can be connected via LPC or I2C
+         and a sandbox TPM is provided for testing purposes. Use the

'tpm'

lib/Kconfig +2 -0

+         command to interactive the TPM. Driver model support is provided
+         for the low-level TPM interface, but only one TPM is supported

lib/Kconfig source lib/dhry/Kconfig · line 69

Quoted 5 lines

at

lib/Kconfig +2 -0

+         a time by the TPM library.
+
  menu "Hashing Support"
    config SHA1

Best Regards
Christophe

Convert all TPM options to Kconfig and tidy up.

Signed-off-by Simon Glass <[email protected]>

---

  configs/chromebook_link_defconfig                     | 2 ++
  configs/chromebox_panther_defconfig                   | 2 ++
  configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig | 4 ++++
  configs/controlcenterd_36BIT_SDCARD_defconfig         | 4 ++++
  configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig  | 4 ++++
  configs/controlcenterd_TRAILBLAZER_defconfig          | 4 ++++
  configs/coreboot-x86_defconfig                        | 2 ++
  configs/peach-pi_defconfig                            | 3 +++
  configs/peach-pit_defconfig                           | 3 +++
  configs/sandbox_defconfig                             | 2 ++
  configs/snow_defconfig                                | 3 +++
  configs/spring_defconfig                              | 3 +++
  include/configs/controlcenterd.h                      | 7 -------
  include/configs/efi-x86.h                             | 2 --
  include/configs/exynos5-common.h                      | 5 -----
  include/configs/x86-common.h                          | 2 --
  16 files changed, 36 insertions(+), 16 deletions(-)

configs/chromebook_link_defconfig +2 -0

index b987f3f..b0fc5ca 100644
@@ -17,9 +17,11 @@ CONFIG_SPI_FLASH=y
  CONFIG_CMD_CROS_EC=y
  CONFIG_CROS_EC=y
  CONFIG_CROS_EC_LPC=y
+CONFIG_TPM_TIS_LPC=y
  CONFIG_VIDEO_VESA=y
  CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
  CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
  CONFIG_DM_RTC=y
  CONFIG_USE_PRIVATE_LIBGCC=y
  CONFIG_SYS_VSNPRINTF=y
+CONFIG_TPM=y

configs/chromebox_panther_defconfig +2 -0

index e82c8ec..e7ef8fe 100644
@@ -17,9 +17,11 @@ CONFIG_SPI_FLASH=y
  CONFIG_CMD_CROS_EC=y
  CONFIG_CROS_EC=y
  CONFIG_CROS_EC_LPC=y
+CONFIG_TPM_TIS_LPC=y
  CONFIG_VIDEO_VESA=y
  CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
  CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
  CONFIG_DM_RTC=y
  CONFIG_USE_PRIVATE_LIBGCC=y
  CONFIG_SYS_VSNPRINTF=y
+CONFIG_TPM=y

configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig +4 -0

index 37ead03..c8ab862 100644
@@ -4,4 +4,8 @@ CONFIG_TARGET_CONTROLCENTERD=y
  CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD,DEVELOP"
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
+CONFIG_CMD_TPM=y
  CONFIG_SPI_FLASH=y
+CONFIG_TPM_ATMEL_TWI=y
+CONFIG_TPM_AUTH_SESSIONS=y
+CONFIG_TPM=y

configs/controlcenterd_36BIT_SDCARD_defconfig +4 -0

index 7166edb..21c0eab 100644
@@ -4,4 +4,8 @@ CONFIG_TARGET_CONTROLCENTERD=y
  CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD"
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
+CONFIG_CMD_TPM=y
  CONFIG_SPI_FLASH=y
+CONFIG_TPM_ATMEL_TWI=y
+CONFIG_TPM_AUTH_SESSIONS=y
+CONFIG_TPM=y

configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig +4 -0

index d99fcd4..c3a0920 100644
@@ -6,3 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH,DEVELOP"
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
  # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TPM=y
+CONFIG_TPM_ATMEL_TWI=y
+CONFIG_TPM_AUTH_SESSIONS=y
+CONFIG_TPM=y

configs/controlcenterd_TRAILBLAZER_defconfig +4 -0

index 3557aea..08aae9a 100644
@@ -6,3 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH"
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
  # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TPM=y
+CONFIG_TPM_ATMEL_TWI=y
+CONFIG_TPM_AUTH_SESSIONS=y
+CONFIG_TPM=y

configs/coreboot-x86_defconfig +2 -0

index 581df0a..fc6410b 100644
@@ -12,5 +12,7 @@ CONFIG_CMD_BOOTSTAGE=y
  CONFIG_OF_CONTROL=y
  CONFIG_DM_PCI=y
  CONFIG_SPI_FLASH=y
+CONFIG_TPM_TIS_LPC=y
  CONFIG_USE_PRIVATE_LIBGCC=y
  CONFIG_SYS_VSNPRINTF=y
+CONFIG_TPM=y

configs/peach-pi_defconfig +3 -0

index 94ba3f8..5df93b9 100644
@@ -7,11 +7,13 @@ CONFIG_SPL=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_PMIC=y
  CONFIG_CMD_REGULATOR=y
+CONFIG_CMD_TPM=y
  CONFIG_SPI_FLASH=y
  CONFIG_CMD_CROS_EC=y
  CONFIG_CROS_EC=y
  CONFIG_CROS_EC_SPI=y
  CONFIG_CROS_EC_KEYB=y
+CONFIG_TPM_TIS_I2C=y
  CONFIG_DM_I2C=y
  CONFIG_DM_I2C_COMPAT=y
  CONFIG_I2C_CROS_EC_TUNNEL=y

@@ -30,4 +32,5 @@ CONFIG_SOUND_MAX98095=y
  CONFIG_SOUND_WM8994=y
  CONFIG_USB=y
  CONFIG_DM_USB=y
+CONFIG_TPM=y
  CONFIG_ERRNO_STR=y

configs/peach-pit_defconfig +3 -0

index 229b712..e5921ff 100644
@@ -7,11 +7,13 @@ CONFIG_SPL=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_PMIC=y
  CONFIG_CMD_REGULATOR=y
+CONFIG_CMD_TPM=y
  CONFIG_SPI_FLASH=y
  CONFIG_CMD_CROS_EC=y
  CONFIG_CROS_EC=y
  CONFIG_CROS_EC_SPI=y
  CONFIG_CROS_EC_KEYB=y
+CONFIG_TPM_TIS_I2C=y
  CONFIG_DM_I2C=y
  CONFIG_DM_I2C_COMPAT=y
  CONFIG_I2C_CROS_EC_TUNNEL=y

@@ -30,4 +32,5 @@ CONFIG_SOUND_MAX98095=y
  CONFIG_SOUND_WM8994=y
  CONFIG_USB=y
  CONFIG_DM_USB=y
+CONFIG_TPM=y
  CONFIG_ERRNO_STR=y

configs/sandbox_defconfig +2 -0

index 85ff95d..b68d688 100644
@@ -11,6 +11,7 @@ CONFIG_BOOTSTAGE=y
  CONFIG_BOOTSTAGE_REPORT=y
  CONFIG_CMD_PMIC=y
  CONFIG_CMD_REGULATOR=y
+CONFIG_CMD_TPM=y
  CONFIG_OF_CONTROL=y
  CONFIG_OF_HOSTFILE=y
  CONFIG_CLK=y

@@ -49,6 +50,7 @@ CONFIG_DM_MMC=y
  CONFIG_DM_RTC=y
  CONFIG_SYS_VSNPRINTF=y
  CONFIG_CMD_DHRYSTONE=y
+CONFIG_TPM=y
  CONFIG_ERRNO_STR=y
  CONFIG_UNIT_TEST=y
  CONFIG_UT_TIME=y

configs/snow_defconfig +3 -0

index 3466d96..0f7a764 100644
@@ -8,6 +8,7 @@ CONFIG_SPL=y
  CONFIG_CMD_SOUND=y
  CONFIG_CMD_PMIC=y
  CONFIG_CMD_REGULATOR=y
+CONFIG_CMD_TPM=y
  CONFIG_SPI_FLASH=y
  CONFIG_CMD_CROS_EC=y
  CONFIG_CROS_EC=y

@@ -17,6 +18,7 @@ CONFIG_DEBUG_UART=y
  CONFIG_DEBUG_UART_S5P=y
  CONFIG_DEBUG_UART_BASE=0x12c30000
  CONFIG_DEBUG_UART_CLOCK=100000000
+CONFIG_TPM_TIS_I2C=y
  CONFIG_DM_I2C=y
  CONFIG_DM_I2C_COMPAT=y
  CONFIG_I2C_CROS_EC_LDO=y

@@ -40,4 +42,5 @@ CONFIG_SOUND_MAX98095=y
  CONFIG_SOUND_WM8994=y
  CONFIG_USB=y
  CONFIG_DM_USB=y
+CONFIG_TPM=y
  CONFIG_ERRNO_STR=y

configs/spring_defconfig +3 -0

index 8e8ec44..1b3daa4 100644
@@ -8,6 +8,7 @@ CONFIG_SPL=y
  CONFIG_CMD_SOUND=y
  CONFIG_CMD_PMIC=y
  CONFIG_CMD_REGULATOR=y
+CONFIG_CMD_TPM=y
  CONFIG_SPI_FLASH=y
  CONFIG_CMD_CROS_EC=y
  CONFIG_CROS_EC=y

@@ -17,6 +18,7 @@ CONFIG_DEBUG_UART=y
  CONFIG_DEBUG_UART_S5P=y
  CONFIG_DEBUG_UART_BASE=0x12c30000
  CONFIG_DEBUG_UART_CLOCK=100000000
+CONFIG_TPM_TIS_I2C=y
  CONFIG_DM_I2C=y
  CONFIG_DM_I2C_COMPAT=y
  CONFIG_I2C_CROS_EC_LDO=y

@@ -39,4 +41,5 @@ CONFIG_SOUND_MAX98095=y
  CONFIG_SOUND_WM8994=y
  CONFIG_USB=y
  CONFIG_DM_USB=y
+CONFIG_TPM=y
  CONFIG_ERRNO_STR=y

include/configs/controlcenterd.h +0 -7

index 8f829ed..9a1f6d0 100644
@@ -226,14 +226,7 @@
  #define CONFIG_SF_DEFAULT_MODE		0
  #endif
 
-/*
- * TPM
- */
-#define CONFIG_TPM_ATMEL_TWI
-#define CONFIG_TPM
-#define CONFIG_TPM_AUTH_SESSIONS
  #define CONFIG_SHA1
-#define CONFIG_CMD_TPM
 
  /*
   * MMC

include/configs/efi-x86.h +0 -2

index 5779cfd..1c955d9 100644
@@ -11,8 +11,6 @@
 
  #undef CONFIG_CMD_SF_TEST
 
-#undef CONFIG_TPM
-#undef CONFIG_TPM_TIS_LPC
  #undef CONFIG_TPM_TIS_BASE_ADDRESS
 
  #undef CONFIG_CMD_IMLS

include/configs/exynos5-common.h +0 -5

index fb5ee0d..4866836 100644
@@ -54,11 +54,6 @@
  #define CONFIG_CMD_DTT
  #define CONFIG_TMU_CMD_DTT
 
-/* TPM */
-#define CONFIG_TPM
-#define CONFIG_CMD_TPM
-#define CONFIG_TPM_TIS_I2C
-
  /* MMC SPL */
  #define COPY_BL2_FNPTR_ADDR	0x02020030
  #define CONFIG_SUPPORT_EMMC_BOOT

include/configs/x86-common.h +0 -2

index 349b06c..27d3043 100644
@@ -47,8 +47,6 @@
  #endif
 
  /* Generic TPM interfaced through LPC bus */
-#define CONFIG_TPM
-#define CONFIG_TPM_TIS_LPC
  #define CONFIG_TPM_TIS_BASE_ADDRESS        0xfed40000
 
  /*-----------------------------------------------------------------------

Add an SPDX header to two drivers that don't have it.

Signed-off-by Simon Glass <[email protected]>

---

  drivers/tpm/tpm_atmel_twi.c | 15 +++------------
  drivers/tpm/tpm_tis_i2c.c   | 18 +-----------------
  2 files changed, 4 insertions(+), 29 deletions(-)

drivers/tpm/tpm_atmel_twi.c +3 -12

index 361a772..205d7a5 100644
@@ -1,18 +1,9 @@
  /*
- * 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 <[email protected]>
   *
- * 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>

drivers/tpm/tpm_tis_i2c.c +1 -17

index a7082e6..a43e80d 100644
@@ -17,23 +17,7 @@
   *
   * 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
+ * SPDX-License-Identifier:	GPL-2.0
   */
 
  #include <common.h>

The current Infineon I2C TPM driver is written in two parts, intended to support use with other I2C devices. However we don't have any users and the Atmel I2C TPM device does not use this file.

We should simplify this and remove the unused abstration. As a first step, move the code into one file.

Also the name tpm_private.h suggests that the header file is generic to all TPMs but it is not. Rename it indicate that it relates only to this driver

Signed-off-by Simon Glass <[email protected]>

---

  drivers/tpm/Makefile                         |   2 -
  drivers/tpm/tpm.c                            | 594 ---------------------------
  drivers/tpm/tpm_tis_i2c.c                    | 548 +++++++++++++++++++++++-
  drivers/tpm/{tpm_private.h => tpm_tis_i2c.h} |  24 +-
  4 files changed, 550 insertions(+), 618 deletions(-)

delete mode 100644 drivers/tpm/tpm.c
rename drivers/tpm/{tpm_private.h => tpm_tis_i2c.h} (73%)

drivers/tpm/Makefile +0 -2

index 150570e..597966c 100644
@@ -3,9 +3,7 @@
  # SPDX-License-Identifier:	GPL-2.0+
  #
 
-# TODO: Merge tpm_tis_lpc.c with tpm.c
  obj-$(CONFIG_TPM_ATMEL_TWI) += tpm_atmel_twi.o
-obj-$(CONFIG_TPM_TIS_I2C) += tpm.o
  obj-$(CONFIG_TPM_TIS_I2C) += tpm_tis_i2c.o
  obj-$(CONFIG_TPM_TIS_LPC) += tpm_tis_lpc.o
  obj-$(CONFIG_TPM_TIS_SANDBOX) += tpm_tis_sandbox.o

drivers/tpm/tpm.c deleted +0 -594

deleted file mode 100644
index 24997f6..0000000
@@ -1,594 +0,0 @@
-/*
- * Copyright (C) 2011 Infineon Technologies
- *
- * Authors:
- * Peter Huewe <[email protected]>
- *
- * 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 <config.h>
-#include <common.h>
-#include <dm.h>
-#include <linux/compiler.h>
-#include <fdtdec.h>
-#include <i2c.h>
-#include <tpm.h>
-#include <asm-generic/errno.h>
-#include <linux/types.h>
-#include <linux/unaligned/be_byteshift.h>
-
-#include "tpm_private.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/* TPM configuration */
-struct tpm {
-	struct udevice *dev;
-	char inited;
-} tpm;
-
-/* Global structure for tpm chip data */
-static struct tpm_chip g_chip;
-
-enum tpm_duration {
-	TPM_SHORT = 0,
-	TPM_MEDIUM = 1,
-	TPM_LONG = 2,
-	TPM_UNDEFINED,
-};
-
-/* Extended error numbers from linux (see errno.h) */
-#define ECANCELED	125	/* Operation Canceled */
-
-/* Timer frequency. Corresponds to msec timer resolution*/
-#define HZ		1000
-
-#define TPM_MAX_ORDINAL			243
-#define TPM_MAX_PROTECTED_ORDINAL	12
-#define TPM_PROTECTED_ORDINAL_MASK	0xFF
-
-#define TPM_CMD_COUNT_BYTE	2
-#define TPM_CMD_ORDINAL_BYTE	6
-
-/*
- * 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 */
-static 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;
-}
-
-static ssize_t tpm_transmit(const unsigned char *buf, size_t bufsiz)
-{
-	int 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) {
-		error("no data\n");
-		return -ENODATA;
-	}
-	if (count > bufsiz) {
-		error("invalid count value %x %zx\n", count, bufsiz);
-		return -E2BIG;
-	}
-
-	debug("Calling send\n");
-	rc = chip->vendor.send(chip, (u8 *)buf, count);
-	debug("   ... done calling send\n");
-	if (rc < 0) {
-		error("tpm_transmit: tpm_send: error %d\n", rc);
-		goto out;
-	}
-
-	if (chip->vendor.irq)
-		goto out_recv;
-
-	start = get_timer(0);
-	stop = tpm_calc_ordinal_duration(chip, ordinal);
-	do {
-		debug("waiting for status... %ld %ld\n", start, stop);
-		u8 status = chip->vendor.status(chip);
-		if ((status & chip->vendor.req_complete_mask) ==
-		    chip->vendor.req_complete_val) {
-			debug("...got it;\n");
-			goto out_recv;
-		}
-
-		if (status == chip->vendor.req_canceled) {
-			error("Operation Canceled\n");
-			rc = -ECANCELED;
-			goto out;
-		}
-		udelay(TPM_TIMEOUT * 1000);
-	} while (get_timer(start) < stop);
-
-	chip->vendor.cancel(chip);
-	error("Operation Timed out\n");
-	rc = -ETIME;
-	goto out;
-
-out_recv:
-	debug("out_recv: reading response...\n");
-	rc = chip->vendor.recv(chip, (u8 *)buf, TPM_BUFSIZE);
-	if (rc < 0)
-		error("tpm_transmit: tpm_recv: error %d\n", rc);
-
-out:
-	return rc;
-}
-
-static int tpm_open_dev(struct udevice *dev)
-{
-	int rc;
-
-	debug("%s: start\n", __func__);
-	if (g_chip.is_open)
-		return -EBUSY;
-	rc = tpm_vendor_init(dev);
-	if (rc < 0)
-		g_chip.is_open = 0;
-	return rc;
-}
-
-static void tpm_close(void)
-{
-	if (g_chip.is_open) {
-		tpm_vendor_cleanup(&g_chip);
-		g_chip.is_open = 0;
-	}
-}
-
-/**
- * Decode TPM configuration.
- *
- * @param dev	Returns a configuration of TPM device
- * @return 0 if ok, -1 on error
- */
-static int tpm_decode_config(struct tpm *dev)
-{
-	const void *blob = gd->fdt_blob;
-	struct udevice *bus;
-	int chip_addr;
-	int parent;
-	int node;
-	int ret;
-
-	node = fdtdec_next_compatible(blob, 0, COMPAT_INFINEON_SLB9635_TPM);
-	if (node < 0) {
-		node = fdtdec_next_compatible(blob, 0,
-				COMPAT_INFINEON_SLB9645_TPM);
-	}
-	if (node < 0) {
-		debug("%s: Node not found\n", __func__);
-		return -1;
-	}
-	parent = fdt_parent_offset(blob, node);
-	if (parent < 0) {
-		debug("%s: Cannot find node parent\n", __func__);
-		return -1;
-	}
-
-	/*
-	 * TODO(sjg at chromium.org): Remove this when driver model supports
-	 * TPMs
-	 */
-	ret = uclass_get_device_by_of_offset(UCLASS_I2C, parent, &bus);
-	if (ret) {
-		debug("Cannot find bus for node '%s: ret=%d'\n",
-		      fdt_get_name(blob, parent, NULL), ret);
-		return ret;
-	}
-
-	chip_addr = fdtdec_get_int(blob, node, "reg", -1);
-	if (chip_addr == -1) {
-		debug("Cannot find reg property for node '%s: ret=%d'\n",
-		      fdt_get_name(blob, node, NULL), ret);
-		return ret;
-	}
-	/*
-	 * TODO(sjg at chromium.org): Older TPMs will need to use the older method
-	 * in iic_tpm_read() so the offset length needs to be 0 here.
-	 */
-	ret = i2c_get_chip(bus, chip_addr, 1, &dev->dev);
-	if (ret) {
-		debug("Cannot find device for node '%s: ret=%d'\n",
-		      fdt_get_name(blob, node, NULL), ret);
-		return ret;
-	}
-
-	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 tis_init(void)
-{
-	if (tpm.inited)
-		return 0;
-
-	if (tpm_decode_config(&tpm))
-		return -1;
-
-	debug("%s: done\n", __func__);
-
-	tpm.inited = 1;
-
-	return 0;
-}
-
-int tis_open(void)
-{
-	int rc;
-
-	if (!tpm.inited)
-		return -1;
-
-	rc = tpm_open_dev(tpm.dev);
-
-	return rc;
-}
-
-int tis_close(void)
-{
-	if (!tpm.inited)
-		return -1;
-
-	tpm_close();
-
-	return 0;
-}
-
-int tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size,
-		uint8_t *recvbuf, size_t *rbuf_len)
-{
-	int len;
-	uint8_t buf[4096];
-
-	if (!tpm.inited)
-		return -1;
-
-	if (sizeof(buf) < sbuf_size)
-		return -1;
-
-	memcpy(buf, sendbuf, sbuf_size);
-
-	len = tpm_transmit(buf, sbuf_size);
-
-	if (len < 10) {
-		*rbuf_len = 0;
-		return -1;
-	}
-
-	memcpy(recvbuf, buf, len);
-	*rbuf_len = len;
-
-	return 0;
-}

drivers/tpm/tpm_tis_i2c.c +547 -1

index a43e80d..2b3ce8c 100644
@@ -30,7 +30,7 @@
  #include <linux/types.h>
  #include <linux/unaligned/be_byteshift.h>
 
-#include "tpm_private.h"
+#include "tpm_tis_i2c.h"
 
  DECLARE_GLOBAL_DATA_PTR;
 

@@ -95,6 +95,304 @@ static const char * const chip_name[] = {
  #define	TPM_DATA_FIFO(l)		(0x0005 | ((l) << 4))
  #define	TPM_DID_VID(l)			(0x0006 | ((l) << 4))
 
+enum tpm_duration {
+	TPM_SHORT = 0,
+	TPM_MEDIUM = 1,
+	TPM_LONG = 2,
+	TPM_UNDEFINED,
+};
+
+/* Extended error numbers from linux (see errno.h) */
+#define ECANCELED	125	/* Operation Canceled */
+
+/* Timer frequency. Corresponds to msec timer resolution*/
+#define HZ		1000
+
+#define TPM_MAX_ORDINAL			243
+#define TPM_MAX_PROTECTED_ORDINAL	12
+#define TPM_PROTECTED_ORDINAL_MASK	0xFF
+
+#define TPM_CMD_COUNT_BYTE	2
+#define TPM_CMD_ORDINAL_BYTE	6
+
+/*
+ * 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,
+};
+
+/* TPM configuration */
+struct tpm {
+	struct udevice *dev;
+	char inited;
+} tpm;
+
+/* Global structure for tpm chip data */
+static struct tpm_chip g_chip;
+
  /* Structure to store I2C TPM specific stuff */
  struct tpm_dev {
  	struct udevice *dev;

@@ -595,3 +893,251 @@ void tpm_vendor_cleanup(struct tpm_chip *chip)
  {
  	release_locality(chip, chip->vendor.locality, 1);
  }
+
+/* Returns max number of milliseconds to wait */
+static 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;
+}
+
+static ssize_t tpm_transmit(const unsigned char *buf, size_t bufsiz)
+{
+	int 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) {
+		error("no data\n");
+		return -ENODATA;
+	}
+	if (count > bufsiz) {
+		error("invalid count value %x %zx\n", count, bufsiz);
+		return -E2BIG;
+	}
+
+	debug("Calling send\n");
+	rc = chip->vendor.send(chip, (u8 *)buf, count);
+	debug("   ... done calling send\n");
+	if (rc < 0) {
+		error("tpm_transmit: tpm_send: error %d\n", rc);
+		goto out;
+	}
+
+	if (chip->vendor.irq)
+		goto out_recv;
+
+	start = get_timer(0);
+	stop = tpm_calc_ordinal_duration(chip, ordinal);
+	do {
+		debug("waiting for status... %ld %ld\n", start, stop);
+		u8 status = chip->vendor.status(chip);
+		if ((status & chip->vendor.req_complete_mask) ==
+		    chip->vendor.req_complete_val) {
+			debug("...got it;\n");
+			goto out_recv;
+		}
+
+		if (status == chip->vendor.req_canceled) {
+			error("Operation Canceled\n");
+			rc = -ECANCELED;
+			goto out;
+		}
+		udelay(TPM_TIMEOUT * 1000);
+	} while (get_timer(start) < stop);
+
+	chip->vendor.cancel(chip);
+	error("Operation Timed out\n");
+	rc = -ETIME;
+	goto out;
+
+out_recv:
+	debug("out_recv: reading response...\n");
+	rc = chip->vendor.recv(chip, (u8 *)buf, TPM_BUFSIZE);
+	if (rc < 0)
+		error("tpm_transmit: tpm_recv: error %d\n", rc);
+
+out:
+	return rc;
+}
+
+static int tpm_open_dev(struct udevice *dev)
+{
+	int rc;
+
+	debug("%s: start\n", __func__);
+	if (g_chip.is_open)
+		return -EBUSY;
+	rc = tpm_vendor_init(dev);
+	if (rc < 0)
+		g_chip.is_open = 0;
+	return rc;
+}
+
+static void tpm_close(void)
+{
+	if (g_chip.is_open) {
+		tpm_vendor_cleanup(&g_chip);
+		g_chip.is_open = 0;
+	}
+}
+
+/**
+ * Decode TPM configuration.
+ *
+ * @param dev	Returns a configuration of TPM device
+ * @return 0 if ok, -1 on error
+ */
+static int tpm_decode_config(struct tpm *dev)
+{
+	const void *blob = gd->fdt_blob;
+	struct udevice *bus;
+	int chip_addr;
+	int parent;
+	int node;
+	int ret;
+
+	node = fdtdec_next_compatible(blob, 0, COMPAT_INFINEON_SLB9635_TPM);
+	if (node < 0) {
+		node = fdtdec_next_compatible(blob, 0,
+				COMPAT_INFINEON_SLB9645_TPM);
+	}
+	if (node < 0) {
+		debug("%s: Node not found\n", __func__);
+		return -1;
+	}
+	parent = fdt_parent_offset(blob, node);
+	if (parent < 0) {
+		debug("%s: Cannot find node parent\n", __func__);
+		return -1;
+	}
+
+	/*
+	 * TODO(sjg at chromium.org): Remove this when driver model supports
+	 * TPMs
+	 */
+	ret = uclass_get_device_by_of_offset(UCLASS_I2C, parent, &bus);
+	if (ret) {
+		debug("Cannot find bus for node '%s: ret=%d'\n",
+		      fdt_get_name(blob, parent, NULL), ret);
+		return ret;
+	}
+
+	chip_addr = fdtdec_get_int(blob, node, "reg", -1);
+	if (chip_addr == -1) {
+		debug("Cannot find reg property for node '%s: ret=%d'\n",
+		      fdt_get_name(blob, node, NULL), ret);
+		return ret;
+	}
+	/*
+	 * TODO(sjg at chromium.org): Older TPMs will need to use the older method
+	 * in iic_tpm_read() so the offset length needs to be 0 here.
+	 */
+	ret = i2c_get_chip(bus, chip_addr, 1, &dev->dev);
+	if (ret) {
+		debug("Cannot find device for node '%s: ret=%d'\n",
+		      fdt_get_name(blob, node, NULL), ret);
+		return ret;
+	}
+
+	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 tis_init(void)
+{
+	if (tpm.inited)
+		return 0;
+
+	if (tpm_decode_config(&tpm))
+		return -1;
+
+	debug("%s: done\n", __func__);
+
+	tpm.inited = 1;
+
+	return 0;
+}
+
+int tis_open(void)
+{
+	int rc;
+
+	if (!tpm.inited)
+		return -1;
+
+	rc = tpm_open_dev(tpm.dev);
+
+	return rc;
+}
+
+int tis_close(void)
+{
+	if (!tpm.inited)
+		return -1;
+
+	tpm_close();
+
+	return 0;
+}
+
+int tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size,
+		uint8_t *recvbuf, size_t *rbuf_len)
+{
+	int len;
+	uint8_t buf[4096];
+
+	if (!tpm.inited)
+		return -1;
+
+	if (sizeof(buf) < sbuf_size)
+		return -1;
+
+	memcpy(buf, sendbuf, sbuf_size);
+
+	len = tpm_transmit(buf, sbuf_size);
+
+	if (len < 10) {
+		*rbuf_len = 0;
+		return -1;
+	}
+
+	memcpy(recvbuf, buf, len);
+	*rbuf_len = len;
+
+	return 0;
+}

drivers/tpm/tpm_tis_i2c.h renamed from drivers/tpm/tpm_private.h +3 -21

similarity index 73%
rename from drivers/tpm/tpm_private.h
rename to drivers/tpm/tpm_tis_i2c.h
index daaf8b8..75fa829 100644
@@ -13,28 +13,11 @@
   * 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
+ * SPDX-License-Identifier:	GPL-2.0
   */
 
-#ifndef _TPM_PRIVATE_H_
-#define _TPM_PRIVATE_H_
+#ifndef _TPM_TIS_I2C_H
+#define _TPM_TIS_I2C_H
 
  #include <linux/compiler.h>
  #include <linux/types.h>

@@ -134,5 +117,4 @@ int tpm_vendor_init(struct udevice *dev);
 
  void tpm_vendor_cleanup(struct tpm_chip *chip);
 
-
  #endif

Hi Simon,

I would basically disagree with this one.
The code from tpm.c you are merging into tpm_tis_i2c may not only be used by tpm_tis_i2c as it is using data from TPM standards (e.g: Trusted computing group) that should be used by other TPM drivers.
You can find in chapter 17 how the table tpm_protected_ordinal_duration, tpm_ordinal_duration were build.
(https://www.trustedcomputinggroup.org/files/resource_files/E14876A3-1A4B-B294-D086297A1ED38F96/mainP2Structrev103.pdf).

This come from a Linux port.

As a result, we can imagine tis_sendrecv as a generic function where tpm_transmit manage the way tpm commands are sent following specification giving the hand to drivers thanks to the tpm_vendor_specific field {send,recv} for handling the communication over a specified or proprietary transport protocol.
As an example in tpm_tis_lpc, a 1s command duration might be too short or too long for some commands and might be really hard to debug in case someone decide to had a new TPM command support in u-boot.
Also 1s might be enought for the current commands or for evaluated TPM but it may require a longer duration for some other.
By reading the duration TPM capability, that will be just generic.

Also tpm_tis_i2c is Infineon specific and does not fit to any TCG standard for TPM1.2, i would recommand to rename this driver tpm_i2c_infineon to be inline with Linux naming and not confuse a future user on what it support.

At the end from my delivery tentative, a Linux port as well, you may see that i also rely on those functions. However I am not doing any check on the command duration. This is to be improved...

May you prefer an approach that would not lead to duplicated code ?

Best Regards
Christophe

Quoted 26 lines · Simon Glass

The current Infineon I2C TPM driver is written in two parts, intended to support use with other I2C devices. However we don't have any users and the
Atmel I2C TPM device does not use this file.

We should simplify this and remove the unused abstration. As a first step, move the code into one file.

Also the name tpm_private.h suggests that the header file is generic to all
TPMs but it is not. Rename it indicate that it relates only to this driver

Signed-off-by Simon Glass <[email protected]>

---

  drivers/tpm/Makefile                         |   2 -
  drivers/tpm/tpm.c                            | 594
---------------------------
  drivers/tpm/tpm_tis_i2c.c                    | 548
+++++++++++++++++++++++-
  drivers/tpm/{tpm_private.h => tpm_tis_i2c.h} |  24 +-
  4 files changed, 550 insertions(+), 618 deletions(-)

delete mode 100644 drivers/tpm/tpm.c
rename drivers/tpm/{tpm_private.h => tpm_tis_i2c.h} (73%)

Hi Christophe,

Quoted 12 lines · christophe.ricard

Hi Simon,

I would basically disagree with this one.
The code from tpm.c you are merging into tpm_tis_i2c may not only be used by tpm_tis_i2c as it is using data from TPM standards (e.g: Trusted computing group) that should be used by other TPM drivers.
You can find in chapter 17 how the table tpm_protected_ordinal_duration, tpm_ordinal_duration were build.
(https://www.trustedcomputinggroup.org/files/resource_files/E14876A3-1A4B-B294-D086297A1ED38F96/mainP2Structrev103.pdf).

This come from a Linux port.

Quoted 11 lines

As a result, we can imagine tis_sendrecv as a generic function where tpm_transmit manage the way tpm commands are sent following specification giving the hand to drivers thanks to the tpm_vendor_specific field {send,recv} for handling the communication over a specified or proprietary transport protocol.
As an example in tpm_tis_lpc, a 1s command duration might be too short or too long for some commands and might be really hard to debug in case someone decide to had a new TPM command support in u-boot.
Also 1s might be enought for the current commands or for evaluated TPM but it may require a longer duration for some other.
By reading the duration TPM capability, that will be just generic.

But this code is only used by the Infineon driver.

Quoted 4 lines

Also tpm_tis_i2c is Infineon specific and does not fit to any TCG standard for TPM1.2, i would recommand to rename this driver tpm_i2c_infineon to be inline with Linux naming and not confuse a future user on what it support.

Yes we should do that.

Quoted 5 lines

At the end from my delivery tentative, a Linux port as well, you may see that i also rely on those functions. However I am not doing any check on the command duration. This is to be improved...

May you prefer an approach that would not lead to duplicated code ?

I wonder if the timing of each command can be attached to the uclass and handled there. We might have a function like:

tpm_xfer()

which sends data to the TPM and receives a rseponse. This can be implemented by the uclass.

Then the driver interface (which I currently have as xfer()) could be send() and receive(). The time delay measurement could happen in the uclass.

So in summary:

tpm-uclass.c:
tpm_xfer()
- calls driver->send()
- checks timeout based on data supplied by the driver -calls driver->receive()
- checks timeout based on data supplied by the driver
- returns result

Then the drivers only need to implement simple send and receive functions.

The function methods in struct tpm_vendor_specific just call local functions. Change the code to use a direct call.

Signed-off-by Simon Glass <[email protected]>

---

  drivers/tpm/tpm_tis_i2c.c | 12 ++++--------
  drivers/tpm/tpm_tis_i2c.h |  4 ----
  2 files changed, 4 insertions(+), 12 deletions(-)

drivers/tpm/tpm_tis_i2c.c +4 -8

index 2b3ce8c..5615ffc 100644
@@ -810,10 +810,6 @@ out_err:
  }
 
  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,

@@ -940,7 +936,7 @@ static ssize_t tpm_transmit(const unsigned char *buf, size_t bufsiz)
  	}
 
  	debug("Calling send\n");
-	rc = chip->vendor.send(chip, (u8 *)buf, count);
+	rc = tpm_tis_i2c_send(chip, (u8 *)buf, count);
  	debug("   ... done calling send\n");
  	if (rc < 0) {
  		error("tpm_transmit: tpm_send: error %d\n", rc);

@@ -954,7 +950,7 @@ static ssize_t tpm_transmit(const unsigned char *buf, size_t bufsiz)
  	stop = tpm_calc_ordinal_duration(chip, ordinal);
  	do {
  		debug("waiting for status... %ld %ld\n", start, stop);
-		u8 status = chip->vendor.status(chip);
+		u8 status = tpm_tis_i2c_status(chip);
  		if ((status & chip->vendor.req_complete_mask) ==
  		    chip->vendor.req_complete_val) {
  			debug("...got it;\n");

@@ -969,14 +965,14 @@ static ssize_t tpm_transmit(const unsigned char *buf, size_t bufsiz)
  		udelay(TPM_TIMEOUT * 1000);
  	} while (get_timer(start) < stop);
 
-	chip->vendor.cancel(chip);
+	tpm_tis_i2c_ready(chip);
  	error("Operation Timed out\n");
  	rc = -ETIME;
  	goto out;
 
  out_recv:
  	debug("out_recv: reading response...\n");
-	rc = chip->vendor.recv(chip, (u8 *)buf, TPM_BUFSIZE);
+	rc = tpm_tis_i2c_recv(chip, (u8 *)buf, TPM_BUFSIZE);
  	if (rc < 0)
  		error("tpm_transmit: tpm_recv: error %d\n", rc);
 

drivers/tpm/tpm_tis_i2c.h +0 -4

index 75fa829..426c519 100644
@@ -40,10 +40,6 @@ struct tpm_vendor_specific {
  	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 */

Hi Simon,

As per my comment on patch 6, i would disagree as well on this one. It tpm_vendor_specific structure is convenient for ST33ZP24 for example.

Best Regards
Christophe

Hi Christophe,

Quoted 2 lines · christophe.ricard

Hi Simon,

Quoted 6 lines

As per my comment on patch 6, i would disagree as well on this one. It tpm_vendor_specific structure is convenient for ST33ZP24 for example.

Best Regards
Christophe

As things stand they are only used in one place. I think we should work out the best uclass API for the TPM and then go with that.

Hi Simon,

Quoted 14 lines · Simon Glass

Hi Christophe,

Quoted 9 lines · christophe.ricard

Hi Simon,

As per my comment on patch 6, i would disagree as well on this one. It tpm_vendor_specific structure is convenient for ST33ZP24 for example.

Best Regards
Christophe

Quoted 2 lines

As things stand they are only used in one place. I think we should work out the best uclass API for the TPM and then go with that.

I agree with that.
How do you want to proceed ? Do you agree to integrate the results of our exchanges for a new round ?

This function is misnamed since it only applies to a single driver. Merge its fields into its parent.

Signed-off-by Simon Glass <[email protected]>

---

  drivers/tpm/tpm_tis_i2c.c | 79 ++++++++++++++++++-----------------------------
  drivers/tpm/tpm_tis_i2c.h | 16 +++-------
  2 files changed, 35 insertions(+), 60 deletions(-)

drivers/tpm/tpm_tis_i2c.c +30 -49

index 5615ffc..3c4e6c5 100644
@@ -531,7 +531,7 @@ static int check_locality(struct tpm_chip *chip, int loc)
  		return rc;
 
  	if ((buf & mask) == mask) {
-		chip->vendor.locality = loc;
+		chip->locality = loc;
  		return loc;
  	}
 

@@ -567,7 +567,7 @@ static int request_locality(struct tpm_chip *chip, int loc)
 
  	/* Wait for burstcount */
  	start = get_timer(0);
-	stop = chip->vendor.timeout_a;
+	stop = chip->timeout_a;
  	do {
  		if (check_locality(chip, loc) >= 0)
  			return loc;

@@ -582,7 +582,7 @@ 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)
+	if (iic_tpm_read(TPM_STS(chip->locality), &buf, 1) < 0)
  		return 0;
  	else
  		return buf;

@@ -596,7 +596,7 @@ static void tpm_tis_i2c_ready(struct tpm_chip *chip)
  	u8 buf = TPM_STS_COMMAND_READY;
 
  	debug("%s\n", __func__);
-	rc = iic_tpm_write_long(TPM_STS(chip->vendor.locality), &buf, 1);
+	rc = iic_tpm_write_long(TPM_STS(chip->locality), &buf, 1);
  	if (rc)
  		debug("%s: rc=%d\n", __func__, rc);
  }

@@ -610,10 +610,10 @@ static ssize_t get_burstcount(struct tpm_chip *chip)
  	/* Wait for burstcount */
  	/* XXX: Which timeout value? Spec has 2 answers (c & d) */
  	start = get_timer(0);
-	stop = chip->vendor.timeout_d;
+	stop = chip->timeout_d;
  	do {
  		/* Note: STS is little endian */
-		addr = TPM_STS(chip->vendor.locality) + 1;
+		addr = TPM_STS(chip->locality) + 1;
  		if (iic_tpm_read(addr, buf, 3) < 0)
  			burstcnt = 0;
  		else

@@ -666,7 +666,7 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)
  		if (burstcnt > (count - size))
  			burstcnt = count - size;
 
-		rc = iic_tpm_read(TPM_DATA_FIFO(chip->vendor.locality),
+		rc = iic_tpm_read(TPM_DATA_FIFO(chip->locality),
  				&(buf[size]), burstcnt);
  		if (rc == 0)
  			size += burstcnt;

@@ -708,7 +708,7 @@ static int tpm_tis_i2c_recv(struct tpm_chip *chip, u8 *buf, size_t count)
  		goto out;
  	}
 
-	wait_for_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c, &status);
+	wait_for_stat(chip, TPM_STS_VALID, chip->timeout_c, &status);
  	if (status & TPM_STS_DATA_AVAIL) {  /* Retry? */
  		error("Error left over data\n");
  		size = -EIO;

@@ -722,7 +722,7 @@ out:
  	 * so we sleep rather than keeping the bus busy
  	 */
  	udelay(2000);
-	release_locality(chip, chip->vendor.locality, 0);
+	release_locality(chip, chip->locality, 0);
 
  	return size;
  }

@@ -746,7 +746,7 @@ static int tpm_tis_i2c_send(struct tpm_chip *chip, u8 *buf, size_t len)
  	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) {
+				  chip->timeout_b, &status) < 0) {
  			rc = -ETIME;
  			goto out_err;
  		}

@@ -768,7 +768,7 @@ static int tpm_tis_i2c_send(struct tpm_chip *chip, u8 *buf, size_t len)
  			burstcnt = CONFIG_TPM_TIS_I2C_BURST_LIMITATION;
  #endif /* CONFIG_TPM_TIS_I2C_BURST_LIMITATION */
 
-		rc = iic_tpm_write(TPM_DATA_FIFO(chip->vendor.locality),
+		rc = iic_tpm_write(TPM_DATA_FIFO(chip->locality),
  				&(buf[count]), burstcnt);
  		if (rc == 0)
  			count += burstcnt;

@@ -779,7 +779,7 @@ static int tpm_tis_i2c_send(struct tpm_chip *chip, u8 *buf, size_t len)
  				goto out_err;
  			}
  			rc = wait_for_stat(chip, TPM_STS_VALID,
-					   chip->vendor.timeout_c, &status);
+					   chip->timeout_c, &status);
  			if (rc)
  				goto out_err;
 

@@ -791,7 +791,7 @@ static int tpm_tis_i2c_send(struct tpm_chip *chip, u8 *buf, size_t len)
  	}
 
  	/* Go and do it */
-	iic_tpm_write(TPM_STS(chip->vendor.locality), &sts, 1);
+	iic_tpm_write(TPM_STS(chip->locality), &sts, 1);
  	debug("done\n");
 
  	return len;

@@ -804,18 +804,11 @@ out_err:
  	 * so we sleep rather than keeping the bus busy
  	 */
  	udelay(2000);
-	release_locality(chip, chip->vendor.locality, 0);
+	release_locality(chip, chip->locality, 0);
 
  	return rc;
  }
 
-static struct tpm_vendor_specific tpm_tis_i2c = {
-	.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,
-};
-
-
  static enum i2c_chip_type tpm_vendor_chip_type(void)
  {
  #ifdef CONFIG_OF_CONTROL

@@ -832,25 +825,25 @@ static enum i2c_chip_type tpm_vendor_chip_type(void)
 
  int tpm_vendor_init(struct udevice *dev)
  {
-	struct tpm_chip *chip;
+	struct tpm_chip *chip = &g_chip;
  	u32 vendor;
  	u32 expected_did_vid;
 
  	tpm_dev.dev = dev;
  	tpm_dev.chip_type = tpm_vendor_chip_type();
-
-	chip = tpm_register_hardware(&tpm_tis_i2c);
-	if (chip < 0)
-		return -ENODEV;
+	chip->is_open = 1;
 
  	/* Disable interrupts (not supported) */
-	chip->vendor.irq = 0;
+	chip->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;
+	chip->timeout_a = TIS_SHORT_TIMEOUT;
+	chip->timeout_b = TIS_LONG_TIMEOUT;
+	chip->timeout_c = TIS_SHORT_TIMEOUT;
+	chip->timeout_d = TIS_SHORT_TIMEOUT;
+	chip->req_complete_mask = TPM_STS_DATA_AVAIL | TPM_STS_VALID;
+	chip->req_complete_val = TPM_STS_DATA_AVAIL | TPM_STS_VALID;
+	chip->req_canceled = TPM_STS_COMMAND_READY;
 
  	if (request_locality(chip, 0) < 0)
  		return  -ENODEV;

@@ -887,7 +880,7 @@ int tpm_vendor_init(struct udevice *dev)
 
  void tpm_vendor_cleanup(struct tpm_chip *chip)
  {
-	release_locality(chip, chip->vendor.locality, 1);
+	release_locality(chip, chip->locality, 1);
  }
 
  /* Returns max number of milliseconds to wait */

@@ -906,7 +899,7 @@ static unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip,
  	}
 
  	if (duration_idx != TPM_UNDEFINED)
-		duration = chip->vendor.duration[duration_idx];
+		duration = chip->duration[duration_idx];
 
  	if (duration <= 0)
  		return 2 * 60 * HZ; /* Two minutes timeout */

@@ -943,7 +936,7 @@ static ssize_t tpm_transmit(const unsigned char *buf, size_t bufsiz)
  		goto out;
  	}
 
-	if (chip->vendor.irq)
+	if (chip->irq)
  		goto out_recv;
 
  	start = get_timer(0);

@@ -951,13 +944,13 @@ static ssize_t tpm_transmit(const unsigned char *buf, size_t bufsiz)
  	do {
  		debug("waiting for status... %ld %ld\n", start, stop);
  		u8 status = tpm_tis_i2c_status(chip);
-		if ((status & chip->vendor.req_complete_mask) ==
-		    chip->vendor.req_complete_val) {
+		if ((status & chip->req_complete_mask) ==
+		    chip->req_complete_val) {
  			debug("...got it;\n");
  			goto out_recv;
  		}
 
-		if (status == chip->vendor.req_canceled) {
+		if (status == chip->req_canceled) {
  			error("Operation Canceled\n");
  			rc = -ECANCELED;
  			goto out;

@@ -1062,18 +1055,6 @@ static int tpm_decode_config(struct tpm *dev)
  	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 tis_init(void)
  {
  	if (tpm.inited)

drivers/tpm/tpm_tis_i2c.h +5 -11

index 426c519..2a4ad77 100644
@@ -35,21 +35,17 @@ enum tpm_timeout {
 
  struct tpm_chip;
 
-struct tpm_vendor_specific {
-	const u8 req_complete_mask;
-	const u8 req_complete_val;
-	const u8 req_canceled;
+struct tpm_chip {
+	int is_open;
+	u8 req_complete_mask;
+	u8 req_complete_val;
+	u8 req_canceled;
  	int irq;
  	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;

@@ -106,8 +102,6 @@ struct tpm_cmd_t {
  	union tpm_cmd_params params;
  } __packed;
 
-struct tpm_chip *tpm_register_hardware(const struct tpm_vendor_specific *);
-
  struct udevice;
  int tpm_vendor_init(struct udevice *dev);