[GIT,PULL] tpmdd updates for Linux v5.5

Pull-request

git://git.infradead.org/users/jjs/linux-tpmdd.git tags/tpmdd-next-20191112

Message

Jarkko Sakkinen Nov. 12, 2019, 7:55 p.m. UTC

1. Support for Cr50 fTPM.
2. Support for fTPM on AMD Zen+ CPUs.
3. TPM 2.0 trusted keys code relocated from drivers/char/tpm to
   security/keys.

/Jarkko

The following changes since commit eb094f06963bb0fd8134c6a9b805d4ad0002a7d4:

  Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2019-11-12 10:53:24 -0800)

are available in the Git repository at:

  git://git.infradead.org/users/jjs/linux-tpmdd.git tags/tpmdd-next-20191112

for you to fetch changes up to 0b40dbcbba923b5379bd1d601edd6d51e23fe72c:

  KEYS: trusted: Remove set but not used variable 'keyhndl' (2019-11-12 21:45:37 +0200)

----------------------------------------------------------------
tpmdd update for Linux v5.5

----------------------------------------------------------------
Andrey Pronin (2):
      dt-bindings: tpm: document properties for cr50
      tpm: tpm_tis_spi: Support cr50 devices

Hans de Goede (1):
      tpm: Switch to platform_get_irq_optional()

Ivan Lazeev (1):
      tpm_crb: fix fTPM on AMD Zen+ CPUs

James Bottomley (1):
      tpm: use GFP_KERNEL instead of GFP_HIGHMEM for tpm_buf

Jarkko Sakkinen (1):
      tpm: Remove duplicate code from caps_show() in tpm-sysfs.c

Jerry Snitselaar (2):
      tpm: provide a way to override the chip returned durations
      tpm_tis: override durations for STM tpm with firmware 1.2.8.28

Stephen Boyd (4):
      tpm: Add a flag to indicate TPM power is managed by firmware
      tpm: tpm_tis_spi: Introduce a flow control callback
      tpm: tpm_tis_spi: Cleanup includes
      tpm: tpm_tis_spi: Drop THIS_MODULE usage from driver struct

Sumit Garg (4):
      tpm: Move tpm_buf code to include/linux/
      KEYS: Use common tpm_buf for trusted and asymmetric keys
      KEYS: trusted: Create trusted keys subsystem
      KEYS: trusted: Move TPM2 trusted keys code

Tadeusz Struk (1):
      tpm: add check after commands attribs tab allocation

zhengbin (1):
      KEYS: trusted: Remove set but not used variable 'keyhndl'

 .../bindings/security/tpm/google,cr50.txt          |  19 ++
 crypto/asymmetric_keys/asym_tpm.c                  | 101 +++----
 drivers/char/tpm/Kconfig                           |   7 +
 drivers/char/tpm/Makefile                          |   4 +-
 drivers/char/tpm/tpm-interface.c                   |  64 +---
 drivers/char/tpm/tpm-sysfs.c                       |  45 +--
 drivers/char/tpm/tpm.h                             | 248 +---------------
 drivers/char/tpm/tpm1-cmd.c                        |  15 +
 drivers/char/tpm/tpm2-cmd.c                        | 311 +-------------------
 drivers/char/tpm/tpm_crb.c                         | 123 +++++---
 drivers/char/tpm/tpm_tis.c                         |   2 +-
 drivers/char/tpm/tpm_tis_core.c                    |  79 +++++
 drivers/char/tpm/tpm_tis_spi.c                     | 143 +++++----
 drivers/char/tpm/tpm_tis_spi.h                     |  53 ++++
 drivers/char/tpm/tpm_tis_spi_cr50.c                | 322 +++++++++++++++++++++
 include/Kbuild                                     |   1 -
 include/keys/{trusted.h => trusted_tpm.h}          |  49 +---
 include/linux/tpm.h                                | 250 ++++++++++++++--
 security/keys/Makefile                             |   2 +-
 security/keys/trusted-keys/Makefile                |   8 +
 .../{trusted.c => trusted-keys/trusted_tpm1.c}     |  98 +++----
 security/keys/trusted-keys/trusted_tpm2.c          | 314 ++++++++++++++++++++
 22 files changed, 1371 insertions(+), 887 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/security/tpm/google,cr50.txt
 create mode 100644 drivers/char/tpm/tpm_tis_spi.h
 create mode 100644 drivers/char/tpm/tpm_tis_spi_cr50.c
 rename include/keys/{trusted.h => trusted_tpm.h} (77%)
 create mode 100644 security/keys/trusted-keys/Makefile
 rename security/keys/{trusted.c => trusted-keys/trusted_tpm1.c} (94%)
 create mode 100644 security/keys/trusted-keys/trusted_tpm2.c

Comments

Jason Gunthorpe Nov. 12, 2019, 7:58 p.m. UTC | #1

On Tue, Nov 12, 2019 at 09:55:42PM +0200, Jarkko Sakkinen wrote:
> 1. Support for Cr50 fTPM.
> 2. Support for fTPM on AMD Zen+ CPUs.
> 3. TPM 2.0 trusted keys code relocated from drivers/char/tpm to
>    security/keys.

Just to be clear, this is for the next merge window right?

Jason

Jarkko Sakkinen Nov. 14, 2019, 4:41 p.m. UTC | #2

On Tue, Nov 12, 2019 at 03:58:26PM -0400, Jason Gunthorpe wrote:
> On Tue, Nov 12, 2019 at 09:55:42PM +0200, Jarkko Sakkinen wrote:
> > 1. Support for Cr50 fTPM.
> > 2. Support for fTPM on AMD Zen+ CPUs.
> > 3. TPM 2.0 trusted keys code relocated from drivers/char/tpm to
> >    security/keys.
> 
> Just to be clear, this is for the next merge window right?

v5.5-rc1

/Jarkko

[e-mail] Nov. 25, 2019, 10:45 p.m. UTC | #3

The pull request you sent on Tue, 12 Nov 2019 21:55:42 +0200:

> git://git.infradead.org/users/jjs/linux-tpmdd.git tags/tpmdd-next-20191112

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/54f0e54011c9e83277e84ec2f60696285066dfa9

Thank you!