Skip to contentSkip to conversation

Move tpm_tis_i2c to tpm_tis_infineon and convert last tpm driver to use DM_TPM

PATCH Superseded Christophe Ricard 2 participants 15 messages Sep 20, 2015 – Oct 6, 2015

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover Move tpm_tis_i2c to tpm_tis_infineon and convert last tpm driver to use DM_TPM

Hi Simon,

This patch serie move tpm_tis_i2c driver to tpm_tis_infineon. It also convert the latest tpm driver tpm_atmel_twi to DM_TPM.

In this version i am only adding mention to Tom Rini review

Best Regards
Christophe

Changes in v3:
- Adding mention to Tom Rini review

Christophe Ricard (4):
dm: tpm: Move tpm_tis_i2c to tpm_i2c_infineon
dm: tpm: Add Driver Model support for tpm_atmel_twi driver
dm: tpm: Remove every compilation switch for TPM driver model
dm: tpm: Every TPM drivers should depends on DM_TPM

 README                                            |  4 +-
 common/cmd_tpm.c                                  | 13 +---
 configs/nyan-big_defconfig                        |  2 +-
 configs/peach-pi_defconfig                        |  2 +-
 configs/peach-pit_defconfig                       |  2 +-
 configs/snow_defconfig                            |  2 +-
 configs/spring_defconfig                          |  2 +-
 drivers/tpm/Kconfig                               | 10 +--
 drivers/tpm/Makefile                              |  2 +-
 drivers/tpm/tpm_atmel_twi.c                       | 74 ++++++++++++++++-------
 drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} |  5 +-
 drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} |  0
 include/tis.h                                     | 60 ------------------
 include/tpm.h                                     |  6 --
 lib/tpm.c                                         | 20 +-----
 15 files changed, 72 insertions(+), 132 deletions(-)
 rename drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} (99%)
 rename drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} (100%)
 delete mode 100644 include/tis.h
Signature · 1 line
2.1.4
#1 lore raw

PATCH v3 1/4 dm: tpm: Move tpm_tis_i2c to tpm_i2c_infineon

As there is no TCG specification or recommendation for i2c TPM 1.2, move tpm_tis_i2c driver to tpm_i2c_infineon. Other tpm vendors like Atmel or STMicroelectronics may have a different transport protocol for i2c.

---

Changes in v3:
- Adding mention to Tom Rini review

 README                                            | 4 ++--
 configs/nyan-big_defconfig                        | 2 +-
 configs/peach-pi_defconfig                        | 2 +-
 configs/peach-pit_defconfig                       | 2 +-
 configs/snow_defconfig                            | 2 +-
 configs/spring_defconfig                          | 2 +-
 drivers/tpm/Kconfig                               | 4 ++--
 drivers/tpm/Makefile                              | 2 +-
 drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} | 4 ++--
 drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} | 0
 10 files changed, 12 insertions(+), 12 deletions(-)
 rename drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} (99%)
 rename drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} (100%)
README +2 -2
index 1acc355..f8fb46a 100644
@@ -1490,8 +1490,8 @@ The following options need to be configured:
 		CONFIG_TPM
 		Support TPM devices.
 
-		CONFIG_TPM_TIS_I2C
-		Support for i2c bus TPM devices. Only one device
+		CONFIG_TPM_TIS_INFINEON
+		Support for Infineon i2c bus TPM devices. Only one device
 		per system is supported at this time.
 
 			CONFIG_TPM_TIS_I2C_BURST_LIMITATION
configs/nyan-big_defconfig +1 -1
index 6464c37..04c6a21 100644
@@ -18,7 +18,7 @@ CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_DM_TPM=y
-CONFIG_TPM_TIS_I2C=y
+CONFIG_TPM_TIS_INFINEON=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_DISPLAY_PORT=y
 CONFIG_VIDEO_TEGRA124=y
configs/peach-pi_defconfig +1 -1
index 56a5185..1a0837e 100644
@@ -15,7 +15,7 @@ CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_DM_TPM=y
-CONFIG_TPM_TIS_I2C=y
+CONFIG_TPM_TIS_INFINEON=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
configs/peach-pit_defconfig +1 -1
index 1934bf3..6567226 100644
@@ -15,7 +15,7 @@ CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_DM_TPM=y
-CONFIG_TPM_TIS_I2C=y
+CONFIG_TPM_TIS_INFINEON=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
configs/snow_defconfig +1 -1
index 32c7c5d..583a838 100644
@@ -20,7 +20,7 @@ CONFIG_DEBUG_UART_S5P=y
 CONFIG_DEBUG_UART_BASE=0x12c30000
 CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_DM_TPM=y
-CONFIG_TPM_TIS_I2C=y
+CONFIG_TPM_TIS_INFINEON=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_LDO=y
configs/spring_defconfig +1 -1
index b20bfed..112afa1 100644
@@ -20,7 +20,7 @@ CONFIG_DEBUG_UART_S5P=y
 CONFIG_DEBUG_UART_BASE=0x12c30000
 CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_DM_TPM=y
-CONFIG_TPM_TIS_I2C=y
+CONFIG_TPM_TIS_INFINEON=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_LDO=y
drivers/tpm/Kconfig +2 -2
index 6bc8fdd..dacb847 100644
@@ -31,7 +31,7 @@ config TPM_ATMEL_TWI
 	  to the device using the standard TPM Interface Specification (TIS)
 	  protocol
 
-config TPM_TIS_I2C
+config TPM_TIS_INFINEON
 	bool "Enable support for Infineon SLB9635/45 TPMs on I2C"
 	depends on TPM && DM_I2C
 	help
@@ -42,7 +42,7 @@ config TPM_TIS_I2C
 
 config TPM_TIS_I2C_BURST_LIMITATION
 	bool "Enable I2C burst length limitation"
-	depends on TPM_TIS_I2C
+	depends on TPM_TIS_INFINEON
 	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
drivers/tpm/Makefile +1 -1
index 0d328f8..5748145 100644
@@ -6,6 +6,6 @@
 obj-$(CONFIG_DM_TPM) += tpm-uclass.o
 
 obj-$(CONFIG_TPM_ATMEL_TWI) += tpm_atmel_twi.o
-obj-$(CONFIG_TPM_TIS_I2C) += tpm_tis_i2c.o
+obj-$(CONFIG_TPM_TIS_INFINEON) += tpm_tis_infineon.o
 obj-$(CONFIG_TPM_TIS_LPC) += tpm_tis_lpc.o
 obj-$(CONFIG_TPM_TIS_SANDBOX) += tpm_tis_sandbox.o
drivers/tpm/tpm_tis_infineon.c renamed from drivers/tpm/tpm_tis_i2c.c +2 -2
similarity index 99%
rename from drivers/tpm/tpm_tis_i2c.c
rename to drivers/tpm/tpm_tis_infineon.c
index 9afe46c..88eb786 100644
@@ -31,7 +31,7 @@
 #include <linux/types.h>
 #include <linux/unaligned/be_byteshift.h>
 
-#include "tpm_tis_i2c.h"
+#include "tpm_tis_infineon.h"
 #include "tpm_internal.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -614,7 +614,7 @@ static const struct udevice_id tpm_tis_i2c_ids[] = {
 };
 
 U_BOOT_DRIVER(tpm_tis_i2c) = {
-	.name   = "tpm_tis_i2c",
+	.name   = "tpm_tis_infineon",
 	.id     = UCLASS_TPM,
 	.of_match = tpm_tis_i2c_ids,
 	.ops    = &tpm_tis_i2c_ops,
drivers/tpm/tpm_tis_infineon.h renamed from drivers/tpm/tpm_tis_i2c.h +0 -0
similarity index 100%
rename from drivers/tpm/tpm_tis_i2c.h
rename to drivers/tpm/tpm_tis_infineon.h
Signature · 1 line
2.1.4
#2 lore raw

PATCH v3 1/4 dm: tpm: Move tpm_tis_i2c to tpm_i2c_infineon

Quoted 11 lines · Christophe Ricard

As there is no TCG specification or recommendation for i2c TPM 1.2, move tpm_tis_i2c driver to tpm_i2c_infineon. Other tpm vendors like Atmel or STMicroelectronics may have a different transport protocol for i2c.

---

Changes in v3:
- Adding mention to Tom Rini review

Quoted 13 lines
 README                                            | 4 ++--
 configs/nyan-big_defconfig                        | 2 +-
 configs/peach-pi_defconfig                        | 2 +-
 configs/peach-pit_defconfig                       | 2 +-
 configs/snow_defconfig                            | 2 +-
 configs/spring_defconfig                          | 2 +-
 drivers/tpm/Kconfig                               | 4 ++--
 drivers/tpm/Makefile                              | 2 +-
 drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} | 4 ++--
 drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} | 0
 10 files changed, 12 insertions(+), 12 deletions(-)
 rename drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} (99%)
 rename drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} (100%)
#3 lore raw

PATCH v3 2/4 dm: tpm: Add Driver Model support for tpm_atmel_twi driver

In reply to Christophe Ricard

tpm_atmel_twi can fit perfectly to the new UCLASS_TPM class.

---

Changes in v3: None

 drivers/tpm/Kconfig         |  2 +-
 drivers/tpm/tpm_atmel_twi.c | 74 ++++++++++++++++++++++++++++++++-------------
 2 files changed, 54 insertions(+), 22 deletions(-)
drivers/tpm/Kconfig +1 -1
index dacb847..ff2cdbe 100644
@@ -24,7 +24,7 @@ config TPM_TIS_SANDBOX
 
 config TPM_ATMEL_TWI
 	bool "Enable Atmel TWI TPM device driver"
-	depends on TPM
+	depends on TPM && DM_I2C
 	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
drivers/tpm/tpm_atmel_twi.c +53 -21

136 lines not on this page · raw message

Signature · 1 line
2.1.4
#4 lore raw

PATCH v3 2/4 dm: tpm: Add Driver Model support for tpm_atmel_twi driver

Quoted 11 lines · Christophe Ricard

tpm_atmel_twi can fit perfectly to the new UCLASS_TPM class.

---

Changes in v3: None

 drivers/tpm/Kconfig         |  2 +-
 drivers/tpm/tpm_atmel_twi.c | 74 ++++++++++++++++++++++++++++++++-------------
 2 files changed, 54 insertions(+), 22 deletions(-)
#5 lore raw

PATCH v3 2/4 dm: tpm: Add Driver Model support for tpm_atmel_twi driver

Hi Christophe,

Quoted 8 lines · Simon Glass
Quoted 6 lines · Christophe Ricard

tpm_atmel_twi can fit perfectly to the new UCLASS_TPM class.

---

Quoted 7 lines
Quoted 5 lines

Changes in v3: None

 drivers/tpm/Kconfig         |  2 +-
 drivers/tpm/tpm_atmel_twi.c | 74 ++++++++++++++++++++++++++++++++-------------
 2 files changed, 54 insertions(+), 22 deletions(-)

I get errors with this patch:

03: dm: tpm: Add Driver Model support for tpm_atmel_twi driver
powerpc: + controlcenterd_36BIT_SDCARD
controlcenterd_36BIT_SDCARD_DEVELOP controlcenterd_TRAILBLAZER controlcenterd_TRAILBLAZER_DEVELOP
+common/built-in.o: In function `do_tpm_raw_transfer':
+build/../common/cmd_tpm.c:504: undefined reference to tis_sendrecv' +lib/built-in.o: In function tpm_sendrecv_command':
+build/../lib/tpm.c:253: undefined reference to tis_sendrecv' +lib/built-in.o: In function tpm_init':
+build/../lib/tpm.c:276: undefined reference to tis_init' +build/../lib/tpm.c:280: undefined reference to tis_open'

Regards,
Simon

#6 lore raw

PATCH v3 2/4 dm: tpm: Add Driver Model support for tpm_atmel_twi driver

Hi Simon,

This error is coming from the fact that no driver model is available for powerpc and the config file mention in the error log (controlcenterd_36BIT_SDCARD, controlcenterd_36BIT_SDCARD_DEVELOP, controlcenterd_TRAILBLAZER, controlcenterd_TRAILBLAZER_DEVELOP).

Do you think converting atmel driver to dm_tpm without dm_i2c dependency is acceptable as a first step ? It would help to clean the TPM driver model.

Do you think it make sense to convert powerpc i2c driver to i2c_dm ?

Best Regards
Christophe

2015-10-04 18:25 GMT+02:00 Simon Glass <[email protected]>:

Quoted 37 lines

Hi Christophe,

Quoted 4 lines · Simon Glass
Quoted 2 lines · Christophe Ricard

tpm_atmel_twi can fit perfectly to the new UCLASS_TPM class.

Quoted 8 lines
Quoted 8 lines

---

Changes in v3: None

 drivers/tpm/Kconfig         |  2 +-
 drivers/tpm/tpm_atmel_twi.c | 74

++++++++++++++++++++++++++++++++-------------

Quoted 3 lines
Quoted 1 line
 2 files changed, 54 insertions(+), 22 deletions(-)

I get errors with this patch:

03: dm: tpm: Add Driver Model support for tpm_atmel_twi driver
powerpc: + controlcenterd_36BIT_SDCARD
controlcenterd_36BIT_SDCARD_DEVELOP controlcenterd_TRAILBLAZER controlcenterd_TRAILBLAZER_DEVELOP

(quoted diff) +7 -0
+common/built-in.o: In function `do_tpm_raw_transfer':
+build/../common/cmd_tpm.c:504: undefined reference to `tis_sendrecv'
+lib/built-in.o: In function `tpm_sendrecv_command':
+build/../lib/tpm.c:253: undefined reference to `tis_sendrecv'
+lib/built-in.o: In function `tpm_init':
+build/../lib/tpm.c:276: undefined reference to `tis_init'
+build/../lib/tpm.c:280: undefined reference to `tis_open'

Regards,
Simon

#7 lore raw

PATCH v3 2/4 dm: tpm: Add Driver Model support for tpm_atmel_twi driver

Hi Christophe,

Quoted 11 lines · Christophe Ricard

Hi Simon,

This error is coming from the fact that no driver model is available for powerpc and the config file mention in the error log (controlcenterd_36BIT_SDCARD, controlcenterd_36BIT_SDCARD_DEVELOP, controlcenterd_TRAILBLAZER, controlcenterd_TRAILBLAZER_DEVELOP).

Do you think converting atmel driver to dm_tpm without dm_i2c dependency is acceptable as a first step ? It would help to clean the TPM driver model.

Do you think it make sense to convert powerpc i2c driver to i2c_dm ?

Yes that seems like the best idea.

Regards,
Simon

Quoted 44 lines

Best Regards
Christophe

2015-10-04 18:25 GMT+02:00 Simon Glass <[email protected]>:

Quoted 37 lines

Hi Christophe,

Quoted 8 lines · Simon Glass
Quoted 6 lines · Christophe Ricard

tpm_atmel_twi can fit perfectly to the new UCLASS_TPM class.

---

Quoted 8 lines
Quoted 6 lines

Changes in v3: None

 drivers/tpm/Kconfig         |  2 +-
 drivers/tpm/tpm_atmel_twi.c | 74
++++++++++++++++++++++++++++++++-------------
 2 files changed, 54 insertions(+), 22 deletions(-)

I get errors with this patch:

03: dm: tpm: Add Driver Model support for tpm_atmel_twi driver
powerpc: + controlcenterd_36BIT_SDCARD
controlcenterd_36BIT_SDCARD_DEVELOP controlcenterd_TRAILBLAZER controlcenterd_TRAILBLAZER_DEVELOP

(quoted diff) +7 -0
+common/built-in.o: In function `do_tpm_raw_transfer':
+build/../common/cmd_tpm.c:504: undefined reference to `tis_sendrecv'
+lib/built-in.o: In function `tpm_sendrecv_command':
+build/../lib/tpm.c:253: undefined reference to `tis_sendrecv'
+lib/built-in.o: In function `tpm_init':
+build/../lib/tpm.c:276: undefined reference to `tis_init'
+build/../lib/tpm.c:280: undefined reference to `tis_open'

Regards,
Simon

#8 lore raw

PATCH v3 3/4 dm: tpm: Remove every compilation switch for TPM driver model

In reply to Christophe Ricard

As every TPM drivers support UCLASS_TPM, we can only rely on DM_TPM functions.

This simplify a bit the code.

---

Changes in v3: None

 common/cmd_tpm.c               | 13 +--------
 drivers/tpm/tpm_tis_infineon.c |  1 -
 include/tis.h                  | 60 ------------------------------------------
 include/tpm.h                  |  6 -----
 lib/tpm.c                      | 20 +++-----------
 5 files changed, 4 insertions(+), 96 deletions(-)
 delete mode 100644 include/tis.h
common/cmd_tpm.c +1 -12
index 97501cc..add6bfb 100644
@@ -443,7 +443,6 @@ TPM_COMMAND_NO_ARG(tpm_force_clear)
 TPM_COMMAND_NO_ARG(tpm_physical_enable)
 TPM_COMMAND_NO_ARG(tpm_physical_disable)
 
-#ifdef CONFIG_DM_TPM
 static int get_tpm(struct udevice **devp)
 {
 	int rc;
@@ -476,11 +475,11 @@ static int do_tpm_info(cmd_tbl_t *cmdtp, int flag, int argc,
 
 	return 0;
 }
-#endif
 
 static int do_tpm_raw_transfer(cmd_tbl_t *cmdtp, int flag,
 		int argc, char * const argv[])
 {
+	struct udevice *dev;
 	void *command;
 	uint8_t response[1024];
 	size_t count, response_length = sizeof(response);
@@ -492,17 +491,11 @@ static int do_tpm_raw_transfer(cmd_tbl_t *cmdtp, int flag,
 		return CMD_RET_FAILURE;
 	}
 
-#ifdef CONFIG_DM_TPM
-	struct udevice *dev;
-
 	rc = get_tpm(&dev);
 	if (rc)
 		return rc;
 
 	rc = tpm_xfer(dev, command, count, response, &response_length);
-#else
-	rc = tis_sendrecv(command, count, response, &response_length);
-#endif
 	free(command);
 	if (!rc) {
 		puts("tpm response:\n");
@@ -657,9 +650,7 @@ TPM_COMMAND_NO_ARG(tpm_end_oiap)
 	U_BOOT_CMD_MKENT(cmd, 0, 1, do_tpm_ ## cmd, "", "")
 
 static cmd_tbl_t tpm_commands[] = {
-#ifdef CONFIG_DM_TPM
 	U_BOOT_CMD_MKENT(info, 0, 1, do_tpm_info, "", ""),
-#endif
 	U_BOOT_CMD_MKENT(init, 0, 1,
 			do_tpm_init, "", ""),
 	U_BOOT_CMD_MKENT(startup, 0, 1,
@@ -730,9 +721,7 @@ U_BOOT_CMD(tpm, CONFIG_SYS_MAXARGS, 1, do_tpm,
 "cmd args...\n"
 "    - Issue TPM command <cmd> with arguments <args...>.\n"
 "Admin Startup and State Commands:\n"
-#ifdef CONFIG_DM_TPM
 "  info - Show information about the TPM\n"
-#endif
 "  init\n"
 "    - Put TPM into a state where it waits for 'startup' command.\n"
 "  startup mode\n"
drivers/tpm/tpm_tis_infineon.c +0 -1
index 88eb786..f57c328 100644
@@ -24,7 +24,6 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <i2c.h>
-#include <tis.h>
 #include <tpm.h>
 #include <asm-generic/errno.h>
 #include <linux/compiler.h>
include/tis.h deleted +0 -60

60 lines not on this page · raw message

include/tpm.h +0 -6
index 086b672..9a6585d 100644
@@ -8,8 +8,6 @@
 #ifndef __TPM_H
 #define __TPM_H
 
-#include <tis.h>
-
 /*
  * Here is a partial implementation of TPM commands.  Please consult TCG Main
  * Specification for definitions of TPM commands.
@@ -196,8 +194,6 @@ struct tpm_permanent_flags {
 	u8	disable_full_da_logic_info;
 } __packed;
 
-#ifdef CONFIG_DM_TPM
-
 /* Max buffer size supported by our tpm */
 #define TPM_DEV_BUFSIZE		1260
 
@@ -375,8 +371,6 @@ int tpm_get_desc(struct udevice *dev, char *buf, int size);
 int tpm_xfer(struct udevice *dev, const uint8_t *sendbuf, size_t send_size,
 	     uint8_t *recvbuf, size_t *recv_size);
 
-#endif /* CONFIG_DM_TPM */
-
 /**
  * Initialize TPM device.  It must be called before any TPM commands.
  *
lib/tpm.c +3 -17
index 5d5f707..8a62216 100644
@@ -7,7 +7,6 @@
 
 #include <common.h>
 #include <dm.h>
-#include <tis.h>
 #include <tpm.h>
 #include <asm/unaligned.h>
 #include <u-boot/sha1.h>
@@ -230,6 +229,8 @@ static uint32_t tpm_return_code(const void *response)
 static uint32_t tpm_sendrecv_command(const void *command,
 		void *response, size_t *size_ptr)
 {
+	struct udevice *dev;
+	int ret;
 	uint8_t response_buffer[COMMAND_BUFFER_SIZE];
 	size_t response_length;
 	uint32_t err;
@@ -240,19 +241,13 @@ static uint32_t tpm_sendrecv_command(const void *command,
 		response = response_buffer;
 		response_length = sizeof(response_buffer);
 	}
-#ifdef CONFIG_DM_TPM
-	struct udevice *dev;
-	int ret;
 
 	ret = uclass_first_device(UCLASS_TPM, &dev);
 	if (ret)
 		return ret;
 	err = tpm_xfer(dev, command, tpm_command_size(command),
 		       response, &response_length);
-#else
-	err = tis_sendrecv(command, tpm_command_size(command),
-			response, &response_length);
-#endif
+
 	if (err < 0)
 		return TPM_LIB_ERROR;
 	if (size_ptr)
@@ -264,21 +259,12 @@ static uint32_t tpm_sendrecv_command(const void *command,
 int tpm_init(void)
 {
 	int err;
-
-#ifdef CONFIG_DM_TPM
 	struct udevice *dev;
 
 	err = uclass_first_device(UCLASS_TPM, &dev);
 	if (err)
 		return err;
 	return tpm_open(dev);
-#else
-	err = tis_init();
-	if (err)
-		return err;
-
-	return tis_open();
-#endif
 }
 
 uint32_t tpm_startup(enum tpm_startup_type mode)
Signature · 1 line
2.1.4
#9 lore raw

PATCH v3 3/4 dm: tpm: Remove every compilation switch for TPM driver model

Quoted 11 lines · Christophe Ricard

As every TPM drivers support UCLASS_TPM, we can only rely on DM_TPM functions.

This simplify a bit the code.

---

Changes in v3: None

Quoted 7 lines
 common/cmd_tpm.c               | 13 +--------
 drivers/tpm/tpm_tis_infineon.c |  1 -
 include/tis.h                  | 60 ------------------------------------------
 include/tpm.h                  |  6 -----
 lib/tpm.c                      | 20 +++-----------
 5 files changed, 4 insertions(+), 96 deletions(-)
 delete mode 100644 include/tis.h
#10 lore raw

PATCH v3 3/4 dm: tpm: Remove every compilation switch for TPM driver model

Hi Christophe,

Quoted 21 lines · Simon Glass
Quoted 11 lines · Christophe Ricard

As every TPM drivers support UCLASS_TPM, we can only rely on DM_TPM functions.

This simplify a bit the code.

---

Changes in v3: None

Quoted 7 lines
 common/cmd_tpm.c               | 13 +--------
 drivers/tpm/tpm_tis_infineon.c |  1 -
 include/tis.h                  | 60 ------------------------------------------
 include/tpm.h                  |  6 -----
 lib/tpm.c                      | 20 +++-----------
 5 files changed, 4 insertions(+), 96 deletions(-)
 delete mode 100644 include/tis.h
Quoted 1 line

I get errors with this patch:

04: dm: tpm: Remove every compilation switch for TPM driver model
x86: + coreboot-x86 chromebook_link chromebox_panther
-build/../common/cmd_tpm.c:504: undefined reference to tis_sendrecv' -build/../lib/tpm.c:253: undefined reference to tis_sendrecv' -build/../lib/tpm.c:276: undefined reference to tis_init' -build/../lib/tpm.c:280: undefined reference to tis_open' +common/built-in.o: In function `get_tpm':
+build/../common/cmd_tpm.c:450: undefined reference to uclass_first_device' +common/built-in.o: In function do_tpm_info':
+build/../common/cmd_tpm.c:469: undefined reference to tpm_get_desc' +build/../common/cmd_tpm.c:498: undefined reference to tpm_xfer' +build/../lib/tpm.c:245: undefined reference to uclass_first_device' +build/../lib/tpm.c:248: undefined reference to tpm_xfer' +build/../lib/tpm.c:264: undefined reference to uclass_first_device' +build/../lib/tpm.c:267: undefined reference to tpm_open' +../drivers/tpm/tpm_tis_lpc.c:19:17: fatal error: tis.h: No such file or directory
+ #include <tis.h>
+compilation terminated.
+make[3]: *** [drivers/tpm/tpm_tis_lpc.o] Error 1
+make[2]: *** [drivers/tpm] Error 2
+make[1]: *** [drivers] Error 2

Regards,
Simon

#11 lore raw

PATCH v3 4/4 dm: tpm: Every TPM drivers should depends on DM_TPM

In reply to Christophe Ricard

Every TPM drivers should now depends on DM_TPM and not only TPM.

---

Changes in v3: None

 drivers/tpm/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/tpm/Kconfig +3 -3
index ff2cdbe..3ab652c 100644
@@ -24,7 +24,7 @@ config TPM_TIS_SANDBOX
 
 config TPM_ATMEL_TWI
 	bool "Enable Atmel TWI TPM device driver"
-	depends on TPM && DM_I2C
+	depends on DM_TPM && DM_I2C
 	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
@@ -33,7 +33,7 @@ config TPM_ATMEL_TWI
 
 config TPM_TIS_INFINEON
 	bool "Enable support for Infineon SLB9635/45 TPMs on I2C"
-	depends on TPM && DM_I2C
+	depends on DM_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
@@ -57,7 +57,7 @@ config TPM_TIS_I2C_BURST_LIMITATION_LEN
 
 config TPM_TIS_LPC
 	bool "Enable support for Infineon SLB9635/45 TPMs on LPC"
-	depends on TPM && X86
+	depends on DM_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
Signature · 1 line
2.1.4
#13 lore raw

v3 cover Move tpm_tis_i2c to tpm_tis_infineon and convert last tpm driver to use DM_TPM

In reply to Christophe Ricard

Hi Simon,

Any news on this patch serie ?

Best Regards
Christophe

Quoted 39 lines · Christophe Ricard

Hi Simon,

This patch serie move tpm_tis_i2c driver to tpm_tis_infineon. It also convert the latest tpm driver tpm_atmel_twi to DM_TPM.

In this version i am only adding mention to Tom Rini review

Best Regards
Christophe

Changes in v3:
- Adding mention to Tom Rini review

Christophe Ricard (4):
dm: tpm: Move tpm_tis_i2c to tpm_i2c_infineon
dm: tpm: Add Driver Model support for tpm_atmel_twi driver
dm: tpm: Remove every compilation switch for TPM driver model
dm: tpm: Every TPM drivers should depends on DM_TPM

  README                                            |  4 +-
  common/cmd_tpm.c                                  | 13 +---
  configs/nyan-big_defconfig                        |  2 +-
  configs/peach-pi_defconfig                        |  2 +-
  configs/peach-pit_defconfig                       |  2 +-
  configs/snow_defconfig                            |  2 +-
  configs/spring_defconfig                          |  2 +-
  drivers/tpm/Kconfig                               | 10 +--
  drivers/tpm/Makefile                              |  2 +-
  drivers/tpm/tpm_atmel_twi.c                       | 74 ++++++++++++++++-------
  drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} |  5 +-
  drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} |  0
  include/tis.h                                     | 60 ------------------
  include/tpm.h                                     |  6 --
  lib/tpm.c                                         | 20 +-----
  15 files changed, 72 insertions(+), 132 deletions(-)

rename drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} (99%) rename drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} (100%) delete mode 100644 include/tis.h

#14 lore raw

v3 cover Move tpm_tis_i2c to tpm_tis_infineon and convert last tpm driver to use DM_TPM

Hi Christophe,

Quoted 4 lines · Christophe Ricard

Hi Simon,

Any news on this patch serie ?

I think we need to wait until the merge window opens in a few weeks to apply it.

Quoted 4 lines

Best Regards
Christophe

Quoted 44 lines
Quoted 42 lines · Christophe Ricard

Hi Simon,

This patch serie move tpm_tis_i2c driver to tpm_tis_infineon. It also convert the latest tpm driver tpm_atmel_twi to DM_TPM.

In this version i am only adding mention to Tom Rini review

Best Regards
Christophe

Changes in v3:
- Adding mention to Tom Rini review

Christophe Ricard (4):
dm: tpm: Move tpm_tis_i2c to tpm_i2c_infineon
dm: tpm: Add Driver Model support for tpm_atmel_twi driver
dm: tpm: Remove every compilation switch for TPM driver model
dm: tpm: Every TPM drivers should depends on DM_TPM

  README                                            |  4 +-
  common/cmd_tpm.c                                  | 13 +---
  configs/nyan-big_defconfig                        |  2 +-
  configs/peach-pi_defconfig                        |  2 +-
  configs/peach-pit_defconfig                       |  2 +-
  configs/snow_defconfig                            |  2 +-
  configs/spring_defconfig                          |  2 +-
  drivers/tpm/Kconfig                               | 10 +--
  drivers/tpm/Makefile                              |  2 +-
  drivers/tpm/tpm_atmel_twi.c                       | 74
++++++++++++++++-------
  drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} |  5 +-
  drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} |  0
  include/tis.h                                     | 60
------------------
  include/tpm.h                                     |  6 --
  lib/tpm.c                                         | 20 +-----
  15 files changed, 72 insertions(+), 132 deletions(-)

rename drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} (99%) rename drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} (100%) delete mode 100644 include/tis.h

Regards,
Simon