Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 06:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hi,

Browse Source 
Just updates and fixes, no major changes.
 
 I might send a PR during the release cycle addressing a performance issue in the
 bus encryption:
 
 1. https://bugzilla.kernel.org/show_bug.cgi?id=219229
 2. https://lore.kernel.org/linux-integrity/20240917154444.702370-1-jarkko@kernel.org/
 
 The first version of the patch set cut out already five seconds and I
 expect similar figures from the current version but I really need some
 more feedback. However, this week is not exactly optimal for getting
 it, given the Vienna conference.
 
 BR, Jarkko
 -----BEGIN PGP SIGNATURE-----
 
 iIgEABYKADAWIQRE6pSOnaBC00OEHEIaerohdGur0gUCZumqbxIcamFya2tvQGtl
 cm5lbC5vcmcACgkQGnq6IXRrq9K2SQD9GY7NcUnXRaNydWDhtACGZraWhksmAwZ2
 eNl6d8GdmdcBAMUsUWKqe48crDksQDW99b/BpfhVG3dsn5+nxMNasvsF
 =snLK
 -----END PGP SIGNATURE-----

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

Pull tpm updates from Jarkko Sakkinen:
 "Just updates and fixes, no major changes"

* tag 'tpmdd-next-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm: export tpm2_sessions_init() to fix ibmvtpm building
  tpm: Drop explicit initialization of struct i2c_device_id::driver_data to 0
  selftests: tpm2: test_smoke: Run only when TPM2 is avaialable.
  MAINTAINERS: Add selftest files to TPM section
  tpm: Clean up TPM space after command failure
This commit is contained in:
Linus Torvalds 2024-09-19 09:38:34 +02:00
commit d5e65d1fb7
8 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -23363,6 +23363,7 @@ Q: https://patchwork.kernel.org/project/linux-integrity/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
F: Documentation/devicetree/bindings/tpm/ F: Documentation/devicetree/bindings/tpm/
F: drivers/char/tpm/ F: drivers/char/tpm/
F: tools/testing/selftests/tpm2/
TPS546D24 DRIVER TPS546D24 DRIVER
M: Duke Du <dukedu83@gmail.com> M: Duke Du <dukedu83@gmail.com>

2
drivers/char/tpm/st33zp24/i2c.c
View File

@ -133,7 +133,7 @@ static void st33zp24_i2c_remove(struct i2c_client *client)
} }
static const struct i2c_device_id st33zp24_i2c_id[] = { static const struct i2c_device_id st33zp24_i2c_id[] = {
{TPM_ST33_I2C, 0}, { TPM_ST33_I2C },
{} {}
}; };
MODULE_DEVICE_TABLE(i2c, st33zp24_i2c_id); MODULE_DEVICE_TABLE(i2c, st33zp24_i2c_id);

2
drivers/char/tpm/tpm-dev-common.c
View File

@ -47,6 +47,8 @@ static ssize_t tpm_dev_transmit(struct tpm_chip *chip, struct tpm_space *space,
if (!ret) if (!ret)
ret = tpm2_commit_space(chip, space, buf, &len); ret = tpm2_commit_space(chip, space, buf, &len);
else
tpm2_flush_space(chip);
out_rc: out_rc:
return ret ? ret : len; return ret ? ret : len;

1
drivers/char/tpm/tpm2-sessions.c
View File

@ -1362,4 +1362,5 @@ int tpm2_sessions_init(struct tpm_chip *chip)
return rc; return rc;
} }
EXPORT_SYMBOL(tpm2_sessions_init);
#endif /* CONFIG_TCG_TPM2_HMAC */ #endif /* CONFIG_TCG_TPM2_HMAC */

3
drivers/char/tpm/tpm2-space.c
View File

@ -169,6 +169,9 @@ void tpm2_flush_space(struct tpm_chip *chip)
struct tpm_space *space = &chip->work_space; struct tpm_space *space = &chip->work_space;
int i; int i;
if (!space)
return;
for (i = 0; i < ARRAY_SIZE(space->context_tbl); i++) for (i = 0; i < ARRAY_SIZE(space->context_tbl); i++)
if (space->context_tbl[i] && ~space->context_tbl[i]) if (space->context_tbl[i] && ~space->context_tbl[i])
tpm2_flush_context(chip, space->context_tbl[i]); tpm2_flush_context(chip, space->context_tbl[i]);

2
drivers/char/tpm/tpm_i2c_atmel.c
View File

@ -186,7 +186,7 @@ static void i2c_atmel_remove(struct i2c_client *client)
} }
static const struct i2c_device_id i2c_atmel_id[] = { static const struct i2c_device_id i2c_atmel_id[] = {
{I2C_DRIVER_NAME, 0}, { I2C_DRIVER_NAME },
{} {}
}; };
MODULE_DEVICE_TABLE(i2c, i2c_atmel_id); MODULE_DEVICE_TABLE(i2c, i2c_atmel_id);

2
drivers/char/tpm/tpm_tis_i2c.c
View File

@ -375,7 +375,7 @@ static void tpm_tis_i2c_remove(struct i2c_client *client)
} }
static const struct i2c_device_id tpm_tis_i2c_id[] = { static const struct i2c_device_id tpm_tis_i2c_id[] = {
{ "tpm_tis_i2c", 0 }, { "tpm_tis_i2c" },
{} {}
}; };
MODULE_DEVICE_TABLE(i2c, tpm_tis_i2c_id); MODULE_DEVICE_TABLE(i2c, tpm_tis_i2c_id);

2
tools/testing/selftests/tpm2/test_smoke.sh
View File

@ -5,5 +5,7 @@
ksft_skip=4 ksft_skip=4
[ -e /dev/tpm0 ] || exit $ksft_skip [ -e /dev/tpm0 ] || exit $ksft_skip
read tpm_version < /sys/class/tpm/tpm0/tpm_version_major
[ "$tpm_version" == 2 ] || exit $ksft_skip
python3 -m unittest -v tpm2_tests.SmokeTest 2>&1 python3 -m unittest -v tpm2_tests.SmokeTest 2>&1