android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tpm: Re-enable TPM chip boostrapping non-tpm_tis TPM drivers

Browse Source 
[ Upstream commit 0c8862de05c1a087795ee0a87bf61a6394306cc0 ]

TPM chip bootstrapping was removed from tpm_chip_register(), and it
was relocated to tpm_tis_core. This breaks all drivers which are not
based on tpm_tis because the chip will not get properly initialized.

Take the corrective steps:
1. Rename tpm_chip_startup() as tpm_chip_bootstrap() and make it one-shot.
2. Call tpm_chip_bootstrap() in tpm_chip_register(), which reverts the
   things  as tehy used to be.

Cc: Lino Sanfilippo <l.sanfilippo@kunbus.com>
Fixes: 548eb516ec0f ("tpm, tpm_tis: startup chip before testing for interrupts")
Reported-by: Pengfei Xu <pengfei.xu@intel.com>
Link: https://lore.kernel.org/all/ZEjqhwHWBnxcaRV5@xpf.sh.intel.com/
Tested-by: Pengfei Xu <pengfei.xu@intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Stable-dep-of: 99d464506255 ("tpm: Prevent hwrng from activating during resume")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jarkko Sakkinen 2023-04-26 21:49:37 +03:00 committed by Greg Kroah-Hartman
parent e76f61a2c5
commit 25d38d5eaa
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/char/tpm/tpm-chip.c
View File

@ -602,13 +602,19 @@ static int tpm_get_pcr_allocation(struct tpm_chip *chip)
}
/*
* tpm_chip_startup() - performs auto startup and allocates the PCRs
* tpm_chip_bootstrap() - Boostrap TPM chip after power on
* @chip: TPM chip to use.
*
* Initialize TPM chip after power on. This a one-shot function: subsequent
* calls will have no effect.
*/
int tpm_chip_startup(struct tpm_chip *chip)
int tpm_chip_bootstrap(struct tpm_chip *chip)
{
int rc;
if (chip->flags & TPM_CHIP_FLAG_BOOTSTRAPPED)
return 0;
rc = tpm_chip_start(chip);
if (rc)
return rc;
@ -621,9 +627,15 @@ int tpm_chip_startup(struct tpm_chip *chip)
stop:
tpm_chip_stop(chip);
/*
* Unconditionally set, as driver initialization should cease, when the
* boostrapping process fails.
*/
chip->flags |= TPM_CHIP_FLAG_BOOTSTRAPPED;
return rc;
}
EXPORT_SYMBOL_GPL(tpm_chip_startup);
EXPORT_SYMBOL_GPL(tpm_chip_bootstrap);
/*
* tpm_chip_register() - create a character device for the TPM chip
@ -640,6 +652,10 @@ int tpm_chip_register(struct tpm_chip *chip)
{
int rc;
rc = tpm_chip_bootstrap(chip);
if (rc)
return rc;
tpm_sysfs_add_device(chip);
tpm_bios_log_setup(chip);

2
drivers/char/tpm/tpm.h
View File

@ -263,7 +263,7 @@ static inline void tpm_msleep(unsigned int delay_msec)
delay_msec * 1000);
};
int tpm_chip_startup(struct tpm_chip *chip);
int tpm_chip_bootstrap(struct tpm_chip *chip);
int tpm_chip_start(struct tpm_chip *chip);
void tpm_chip_stop(struct tpm_chip *chip);
struct tpm_chip *tpm_find_get_ops(struct tpm_chip *chip);

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

@ -1125,7 +1125,7 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
init_waitqueue_head(&priv->read_queue);
init_waitqueue_head(&priv->int_queue);
rc = tpm_chip_startup(chip);
rc = tpm_chip_bootstrap(chip);
if (rc)
goto out_err;

13
include/linux/tpm.h
View File

@ -273,13 +273,14 @@ enum tpm2_cc_attrs {
#define TPM_VID_ATML 0x1114
enum tpm_chip_flags {
TPM_CHIP_FLAG_TPM2 = BIT(1),
TPM_CHIP_FLAG_IRQ = BIT(2),
TPM_CHIP_FLAG_VIRTUAL = BIT(3),
TPM_CHIP_FLAG_HAVE_TIMEOUTS = BIT(4),
TPM_CHIP_FLAG_ALWAYS_POWERED = BIT(5),
TPM_CHIP_FLAG_BOOTSTRAPPED = BIT(0),
TPM_CHIP_FLAG_TPM2 = BIT(1),
TPM_CHIP_FLAG_IRQ = BIT(2),
TPM_CHIP_FLAG_VIRTUAL = BIT(3),
TPM_CHIP_FLAG_HAVE_TIMEOUTS = BIT(4),
TPM_CHIP_FLAG_ALWAYS_POWERED = BIT(5),
TPM_CHIP_FLAG_FIRMWARE_POWER_MANAGED = BIT(6),
TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7),
TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7),
};
#define to_tpm_chip(d) container_of(d, struct tpm_chip, dev)