Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 13:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hi,

Browse Source 
Just a couple fixes and no new features. I've been reviewing and testing
 TPM patches for encrypted and integrity protected commuinications [1] but
 they did not made yet to this release.
 
 This was also first release I tested with my still heavily in-development
 test suite for linux integrity [2]. I'm refining this at the moment
 to run keyutils test suite, which could be potentially also run by a Gitlab
 runner for keyutis repository.
 
 [1] https://lore.kernel.org/linux-integrity/20240102170408.21969-1-James.Bottomley@HansenPartnership.com/T/#t
 [2] https://github.com/jarkkojs/tpmdd-buildroot-external
 
 BR, Jarkkaso
 -----BEGIN PGP SIGNATURE-----
 
 iIgEABYIADAWIQRE6pSOnaBC00OEHEIaerohdGur0gUCZZ2tohIcamFya2tvQGtl
 cm5lbC5vcmcACgkQGnq6IXRrq9L+fwD/QW4B1Tb0LIa80zbA8Tsvt74suLmhe1Uz
 LnOOgyyHQU0BANv1gYb07KOMrBGJjBIBh8D/kWp/BNfw2FUGyb0+5aIB
 =W70T
 -----END PGP SIGNATURE-----

Merge tag 'tpmdd-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd

Pull tpm updates from Jarkko Sakkinen:
 "Just a couple fixes and no new features"

* tag 'tpmdd-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm: cr50: fix kernel-doc warning and spelling
  tpm: nuvoton: Use i2c_get_match_data()
This commit is contained in:
Linus Torvalds 2024-01-10 11:37:38 -08:00
commit 6434eade5d
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/char/tpm/tpm_i2c_nuvoton.c
View File

@ -19,7 +19,8 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/of_device.h> #include <linux/of.h>
#include <linux/property.h>
#include "tpm.h" #include "tpm.h"
/* I2C interface offsets */ /* I2C interface offsets */
@ -524,7 +525,6 @@ static int get_vid(struct i2c_client *client, u32 *res)
static int i2c_nuvoton_probe(struct i2c_client *client) static int i2c_nuvoton_probe(struct i2c_client *client)
{ {
const struct i2c_device_id *id = i2c_client_get_device_id(client);
int rc; int rc;
struct tpm_chip *chip; struct tpm_chip *chip;
struct device *dev = &client->dev; struct device *dev = &client->dev;
@ -546,15 +546,8 @@ static int i2c_nuvoton_probe(struct i2c_client *client)
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
if (dev->of_node) { if (i2c_get_match_data(client))
const struct of_device_id *of_id; chip->flags |= TPM_CHIP_FLAG_TPM2;
of_id = of_match_device(dev->driver->of_match_table, dev);
if (of_id && of_id->data == OF_IS_TPM2)
chip->flags |= TPM_CHIP_FLAG_TPM2;
} else
if (id->driver_data == I2C_IS_TPM2)
chip->flags |= TPM_CHIP_FLAG_TPM2;
init_waitqueue_head(&priv->read_queue); init_waitqueue_head(&priv->read_queue);

3
drivers/char/tpm/tpm_tis_i2c_cr50.c
View File

@ -235,7 +235,7 @@ out:
* @len: Number of bytes to write. * @len: Number of bytes to write.
* *
* The provided address is prepended to the data in 'buffer', the * The provided address is prepended to the data in 'buffer', the
* cobined address+data is sent to the TPM, then wait for TPM to * combined address+data is sent to the TPM, then wait for TPM to
* indicate it is done writing. * indicate it is done writing.
* *
* Return: * Return:
@ -671,7 +671,6 @@ MODULE_DEVICE_TABLE(of, of_cr50_i2c_match);
/** /**
* tpm_cr50_i2c_probe() - Driver probe function. * tpm_cr50_i2c_probe() - Driver probe function.
* @client: I2C client information. * @client: I2C client information.
* @id: I2C device id.
* *
* Return: * Return:
* - 0: Success. * - 0: Success.