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

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
parents 18aa0ddd f168c000

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -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

F:	Documentation/devicetree/bindings/tpm/

F:	drivers/char/tpm/

F:	tools/testing/selftests/tpm2/









TPS546D24 DRIVER









M:	Duke Du <dukedu83@gmail.com>

























drivers/char/tpm/st33zp24/i2c.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -133,7 +133,7 @@ static void st33zp24_i2c_remove(struct i2c_client *client)







}



















static const struct i2c_device_id st33zp24_i2c_id[] = {









	{TPM_ST33_I2C, 0},









	{ TPM_ST33_I2C },









	{}









};









MODULE_DEVICE_TABLE(i2c, st33zp24_i2c_id);
































drivers/char/tpm/tpm-dev-common.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -47,6 +47,8 @@ static ssize_t tpm_dev_transmit(struct tpm_chip *chip, struct tpm_space *space,

















	if (!ret)









		ret = tpm2_commit_space(chip, space, buf, &len);









	else









		tpm2_flush_space(chip);



















out_rc:









	return ret ? ret : len;
































drivers/char/tpm/tpm2-sessions.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -1362,4 +1362,5 @@ int tpm2_sessions_init(struct tpm_chip *chip)

















	return rc;









}









EXPORT_SYMBOL(tpm2_sessions_init);









#endif /* CONFIG_TCG_TPM2_HMAC */
























drivers/char/tpm/tpm2-space.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -169,6 +169,9 @@ void tpm2_flush_space(struct tpm_chip *chip)







	struct tpm_space *space = &chip->work_space;









	int i;



















	if (!space)









		return;



















	for (i = 0; i < ARRAY_SIZE(space->context_tbl); i++)









		if (space->context_tbl[i] && ~space->context_tbl[i])









			tpm2_flush_context(chip, space->context_tbl[i]);