Skip to contentSkip to conversation

tpmdd updates for v5.12-rc1

GIT PULL Jarkko Sakkinen 3 participants 7 messages Jan 29, 2021 – Feb 2, 2021 Keys-trusted

lore
Share & tools
lore

Jarkko Sakkinen

author maintainer
#0 lore raw

Hi,

This contains bug fixes for tpm_tis driver, which had a racy wait for hardware state change to be ready to send a command to the TPM chip. The bug has existed already since 2006, but has only made itself known in recent past.

There's also couple of new features:

1. Cr50 I2C driver.
2. Sysfs exports of PCR registers in TPM 2.0 chips.

/Jarkko

The following changes since commit 909b447dcc45db2f9bd5f495f1d16c419812e6df:

Merge tag 'net-5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2021-01-28 15:24:43 -0800)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tags/tpmdd-next-v5.12-rc1

for you to fetch changes up to 6171fb34b146ecb5ccc6864e1c34526941fe5d83:

tpm_tis: Clean up locality release (2021-01-29 02:27:15 +0200)

----------------------------------------------------------------
tpmdd updates for Linux v5.12-rc1

----------------------------------------------------------------
Andrew Zaborowski (1):
keys: Update comment for restrict_link_by_key_or_keyring_chain

Duncan Laurie (1):
char: tpm: add i2c driver for cr50

Gustavo A. R. Silva (1):
tpm: Fix fall-through warnings for Clang

James Bottomley (4):
tpm: add sysfs exports for all banks of PCR registers
ABI: add sysfs description for tpm exports of PCR registers
tpm_tis: Fix check_locality for correct locality acquisition
tpm_tis: Clean up locality release

Sebastian Andrzej Siewior (1):
tpm: Remove tpm_dev_wq_lock

 Documentation/ABI/stable/sysfs-class-tpm |  14 +
 crypto/asymmetric_keys/restrict.c        |   7 +-
 drivers/char/tpm/Kconfig                 |  10 +
 drivers/char/tpm/Makefile                |   2 +
 drivers/char/tpm/eventlog/tpm1.c         |   1 +
 drivers/char/tpm/tpm-dev-common.c        |   1 -
 drivers/char/tpm/tpm-sysfs.c             | 179 +++++++
 drivers/char/tpm/tpm_tis_core.c          |  50 +-
 drivers/char/tpm/tpm_tis_i2c_cr50.c      | 790 +++++++++++++++++++++++++++++++
 include/linux/tpm.h                      |   9 +-
 10 files changed, 1011 insertions(+), 52 deletions(-)
 create mode 100644 drivers/char/tpm/tpm_tis_i2c_cr50.c
#1 lore raw
Quoted 5 lines · Jarkko Sakkinen

This contains bug fixes for tpm_tis driver, which had a racy wait for hardware state change to be ready to send a command to the TPM chip. The bug has existed already since 2006, but has only made itself known in recent past.

Hmm. Is this for the next merge window? The subject line implies that, as does the addition of the cr50 driver.

But the commentary about fixes implies that at least part of it should be in 5.11?

Linus

author maintainer
#2 lore raw
Quoted 7 lines · Linus Torvalds
Quoted 5 lines · Jarkko Sakkinen

This contains bug fixes for tpm_tis driver, which had a racy wait for hardware state change to be ready to send a command to the TPM chip. The bug has existed already since 2006, but has only made itself known in recent past.

Quoted 5 lines

Hmm. Is this for the next merge window? The subject line implies that, as does the addition of the cr50 driver.

But the commentary about fixes implies that at least part of it should be in 5.11?

This was meant for 5.12 but the timing was *way* too early. I'll take this one back. Just to unambiguity reasons I'll use tpmdd-next-v5.12-rc1-v2 tag for my final v5.12 PR, once I send it.

I considered a bit, and I really think that it would make a lot of sense to do a late 5.11 just containing the two commits from James, namely:

1. tpm_tis: Fix check_locality for correct locality acquisition
2. tpm_tis: Clean up locality release

James: Does this make sense to you?

Quoted 1 line

Linus

/Jarkko

maintainer
#3 lore raw
Quoted 18 lines · Jarkko Sakkinen
Quoted 7 lines · Linus Torvalds
Quoted 4 lines · Jarkko Sakkinen

This contains bug fixes for tpm_tis driver, which had a racy wait for hardware state change to be ready to send a command to the TPM chip. The bug has existed already since 2006, but has only made itself known in recent past.

Quoted 5 lines

Hmm. Is this for the next merge window? The subject line implies that, as does the addition of the cr50 driver.

But the commentary about fixes implies that at least part of it should be in 5.11?

This was meant for 5.12 but the timing was *way* too early. I'll take this one back. Just to unambiguity reasons I'll use tpmdd-next-v5.12- rc1-v2 tag for my final v5.12 PR, once I send it.

Quoted 8 lines

I considered a bit, and I really think that it would make a lot of sense to do a late 5.11 just containing the two commits from James, namely:

1. tpm_tis: Fix check_locality for correct locality acquisition
2. tpm_tis: Clean up locality release

James: Does this make sense to you?

Yes, that's fine with me. It will quiet the warning we've had several bug reports about, so it's definitely a bug fix.

James

author maintainer
#4 lore raw
Quoted 23 lines · James Bottomley
Quoted 22 lines · Jarkko Sakkinen
Quoted 7 lines · Linus Torvalds
Quoted 4 lines · Jarkko Sakkinen

This contains bug fixes for tpm_tis driver, which had a racy wait for hardware state change to be ready to send a command to the TPM chip. The bug has existed already since 2006, but has only made itself known in recent past.

Quoted 5 lines

Hmm. Is this for the next merge window? The subject line implies that, as does the addition of the cr50 driver.

But the commentary about fixes implies that at least part of it should be in 5.11?

This was meant for 5.12 but the timing was *way* too early. I'll take this one back. Just to unambiguity reasons I'll use tpmdd-next-v5.12- rc1-v2 tag for my final v5.12 PR, once I send it.

I considered a bit, and I really think that it would make a lot of sense to do a late 5.11 just containing the two commits from James, namely:

Quoted 7 lines
Quoted 4 lines

1. tpm_tis: Fix check_locality for correct locality acquisition
2. tpm_tis: Clean up locality release

James: Does this make sense to you?

Yes, that's fine with me. It will quiet the warning we've had several bug reports about, so it's definitely a bug fix.

Thanks, this is exactly what I wanted to sanity check. I figured that those should be enough, but unfortunately I do not have any hardware triggering the issue in my possession.

Quoted 1 line

James

/Jarkko

#5 lore raw
In reply to Jarkko Sakkinen
Quoted 7 lines · Jarkko Sakkinen

This was meant for 5.12 but the timing was *way* too early. I'll take this one back. Just to unambiguity reasons I'll use tpmdd-next-v5.12-rc1-v2 tag for my final v5.12 PR, once I send it.

I considered a bit, and I really think that it would make a lot of sense to do a late 5.11 just containing the two commits from James

Ok. I'll ignore this pull request, and will expect the "real" ones later.

Thanks,

Linus

author maintainer
#6 lore raw
Quoted 10 lines · Linus Torvalds
Quoted 7 lines · Jarkko Sakkinen

This was meant for 5.12 but the timing was *way* too early. I'll take this one back. Just to unambiguity reasons I'll use tpmdd-next-v5.12-rc1-v2 tag for my final v5.12 PR, once I send it.

I considered a bit, and I really think that it would make a lot of sense to do a late 5.11 just containing the two commits from James

Ok. I'll ignore this pull request, and will expect the "real" ones later.

Alright, thank you.

Quoted 3 lines

Thanks,

Linus

/Jarkko