Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41a5e1cf authored by Christophe Ricard's avatar Christophe Ricard Committed by Jarkko Sakkinen
Browse files

tpm/tpm_tis: Split tpm_tis driver into a core and TCG TIS compliant phy 



To avoid code duplication between the old tpm_tis and the new and future
native tcg tis driver(ie: spi, i2c...), the tpm_tis driver was reworked,
so that all common logic is extracted and can be reused from all drivers.

The core methods can also be used from other TIS like drivers.

itpm workaround is now managed with a specific tis flag
TPM_TIS_ITPM_POSSIBLE.

This commit is based on the initial work by Peter Huewe.

Signed-off-by: default avatarPeter Huewe <peter.huewe@infineon.com>
Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarStefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: default avatarStefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 92eb0f73

drivers/char/tpm/Kconfig

+7 −0
Original line number Original line Diff line number Diff line
@@ -24,9 +24,16 @@ menuconfig TCG_TPM 




if TCG_TPM

if TCG_TPM





config TCG_TIS_CORE

	tristate

	---help---

	TCG TIS TPM core driver. It implements the TPM TCG TIS logic and hooks

	into the TPM kernel APIs. Physical layers will register against it.



config TCG_TIS

config TCG_TIS

	tristate "TPM Interface Specification 1.2 Interface / TPM 2.0 FIFO Interface"

	tristate "TPM Interface Specification 1.2 Interface / TPM 2.0 FIFO Interface"

	depends on X86

	depends on X86

	select TCG_TIS_CORE

	---help---

	---help---

	  If you have a TPM security chip that is compliant with the

	  If you have a TPM security chip that is compliant with the

	  TCG TIS 1.2 TPM specification (TPM1.2) or the TCG PTP FIFO

	  TCG TIS 1.2 TPM specification (TPM1.2) or the TCG PTP FIFO

drivers/char/tpm/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ ifdef CONFIG_TCG_IBMVTPM 
	tpm-y += tpm_eventlog.o tpm_of.o

	tpm-y += tpm_eventlog.o tpm_of.o

endif

endif

endif

endif

obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o

obj-$(CONFIG_TCG_TIS) += tpm_tis.o

obj-$(CONFIG_TCG_TIS) += tpm_tis.o

obj-$(CONFIG_TCG_TIS_I2C_ATMEL) += tpm_i2c_atmel.o

obj-$(CONFIG_TCG_TIS_I2C_ATMEL) += tpm_i2c_atmel.o

obj-$(CONFIG_TCG_TIS_I2C_INFINEON) += tpm_i2c_infineon.o

obj-$(CONFIG_TCG_TIS_I2C_INFINEON) += tpm_i2c_infineon.o