Commit d04a248f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tpmdd-next-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd 

Pull tpm updates from Jarkko Sakkinen:
 "Support for a new TPM device and fixes and Git URL change (infraded ->
  korg)"

* tag 'tpmdd-next-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  MAINTAINERS: TPM DEVICE DRIVER: Update GIT
  tpm_tis: Add a check for invalid status
  tpm: use %*ph to print small buffer
  dt-bindings: Add SynQucer TPM MMIO as a trivial device
  tpm: tis: add support for MMIO TPM on SynQuacer
parents bbf5c979 7b9be800

Documentation/devicetree/bindings/trivial-devices.yaml

+2 −0
Original line number Diff line number Diff line
@@ -326,6 +326,8 @@ properties: 
          - silabs,si7020

            # Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply

          - skyworks,sky81452

            # Socionext SynQuacer TPM MMIO module

          - socionext,synquacer-tpm-mmio

            # i2c serial eeprom  (24cxx)

          - st,24c256

            # Ambient Light Sensor with SMBUS/Two Wire Serial Interface

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -17605,7 +17605,7 @@ L: linux-integrity@vger.kernel.org 
S:	Maintained

W:	https://kernsec.org/wiki/index.php/Linux_Kernel_Integrity

Q:	https://patchwork.kernel.org/project/linux-integrity/list/

T:	git git://git.infradead.org/users/jjs/linux-tpmdd.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git

F:	drivers/char/tpm/















TRACING

































drivers/char/tpm/Kconfig



+12
−0






























Original line number
Diff line number
Diff line








@@ -74,6 +74,18 @@ config TCG_TIS_SPI_CR50













	  If you have a H1 secure module running Cr50 firmware on SPI bus,















	  say Yes and it will be accessible from within Linux.





























config TCG_TIS_SYNQUACER













	tristate "TPM Interface Specification 1.2 Interface / TPM 2.0 FIFO Interface (MMIO - SynQuacer)"













	depends on ARCH_SYNQUACER













	select TCG_TIS_CORE













	help













	  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













	  specification (TPM2.0) say Yes and it will be accessible from













	  within Linux on Socionext SynQuacer platform.













	  To compile this driver as a module, choose  M here;













	  the module will be called tpm_tis_synquacer.





























config TCG_TIS_I2C_ATMEL















	tristate "TPM Interface Specification 1.2 Interface (I2C - Atmel)"















	depends on I2C

































drivers/char/tpm/Makefile



+1
−0






























Original line number
Diff line number
Diff line








@@ -21,6 +21,7 @@ tpm-$(CONFIG_EFI) += eventlog/efi.o













tpm-$(CONFIG_OF) += eventlog/of.o















obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o















obj-$(CONFIG_TCG_TIS) += tpm_tis.o













obj-$(CONFIG_TCG_TIS_SYNQUACER) += tpm_tis_synquacer.o































obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o















tpm_tis_spi-y := tpm_tis_spi_main.o

































drivers/char/tpm/tpm-sysfs.c



+10
−21






























Original line number
Diff line number
Diff line








@@ -56,31 +56,20 @@ static ssize_t pubek_show(struct device *dev, struct device_attribute *attr,













	out = (struct tpm_readpubek_out *)&tpm_buf.data[10];















	str +=















	    sprintf(str,













		    "Algorithm: %02X %02X %02X %02X\n"













		    "Encscheme: %02X %02X\n"













		    "Sigscheme: %02X %02X\n"













		    "Parameters: %02X %02X %02X %02X "













		    "%02X %02X %02X %02X "













		    "%02X %02X %02X %02X\n"













		    "Algorithm: %4ph\n"













		    "Encscheme: %2ph\n"













		    "Sigscheme: %2ph\n"













		    "Parameters: %12ph\n"















		    "Modulus length: %d\n"















		    "Modulus:\n",













		    out->algorithm[0], out->algorithm[1], out->algorithm[2],













		    out->algorithm[3],













		    out->encscheme[0], out->encscheme[1],













		    out->sigscheme[0], out->sigscheme[1],













		    out->parameters[0], out->parameters[1],













		    out->parameters[2], out->parameters[3],













		    out->parameters[4], out->parameters[5],













		    out->parameters[6], out->parameters[7],













		    out->parameters[8], out->parameters[9],













		    out->parameters[10], out->parameters[11],













		    out->algorithm,













		    out->encscheme,













		    out->sigscheme,













		    out->parameters,















		    be32_to_cpu(out->keysize));





























	for (i = 0; i < 256; i++) {













		str += sprintf(str, "%02X ", out->modulus[i]);













		if ((i + 1) % 16 == 0)













			str += sprintf(str, "\n");













	}













	for (i = 0; i < 256; i += 16)













		str += sprintf(str, "%16ph\n", &out->modulus[i]);































out_buf:















	tpm_buf_destroy(&tpm_buf);









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE