mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
tpm: drop tpm1_chip_register(/unregister)
Check for TPM2 chip in tpm_sysfs_add_device, tpm_bios_log_setup and tpm_bios_log_teardown in order to make code flow cleaner and to enable to implement TPM 2.0 support later on. This is partially derived from the commit by Nayna Jain with the extension that also tpm1_chip_register is dropped. Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Reviewed-by: Nayna Jain <nayna@linux.vnet.ibm.com> Tested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Tested-by: Nayna Jain <nayna@linux.vnet.ibm.com>
This commit is contained in:
parent
cd9b7631a8
commit
7518a21a9d
3 changed files with 11 additions and 26 deletions
|
@ -276,28 +276,6 @@ static void tpm_del_char_device(struct tpm_chip *chip)
|
|||
up_write(&chip->ops_sem);
|
||||
}
|
||||
|
||||
static int tpm1_chip_register(struct tpm_chip *chip)
|
||||
{
|
||||
int rc;
|
||||
|
||||
if (chip->flags & TPM_CHIP_FLAG_TPM2)
|
||||
return 0;
|
||||
|
||||
tpm_sysfs_add_device(chip);
|
||||
|
||||
rc = tpm_bios_log_setup(chip);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
static void tpm1_chip_unregister(struct tpm_chip *chip)
|
||||
{
|
||||
if (chip->flags & TPM_CHIP_FLAG_TPM2)
|
||||
return;
|
||||
|
||||
tpm_bios_log_teardown(chip);
|
||||
}
|
||||
|
||||
static void tpm_del_legacy_sysfs(struct tpm_chip *chip)
|
||||
{
|
||||
struct attribute **i;
|
||||
|
@ -364,7 +342,9 @@ int tpm_chip_register(struct tpm_chip *chip)
|
|||
return rc;
|
||||
}
|
||||
|
||||
rc = tpm1_chip_register(chip);
|
||||
tpm_sysfs_add_device(chip);
|
||||
|
||||
rc = tpm_bios_log_setup(chip);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
|
@ -372,7 +352,7 @@ int tpm_chip_register(struct tpm_chip *chip)
|
|||
|
||||
rc = tpm_add_char_device(chip);
|
||||
if (rc) {
|
||||
tpm1_chip_unregister(chip);
|
||||
tpm_bios_log_teardown(chip);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
@ -402,8 +382,7 @@ EXPORT_SYMBOL_GPL(tpm_chip_register);
|
|||
void tpm_chip_unregister(struct tpm_chip *chip)
|
||||
{
|
||||
tpm_del_legacy_sysfs(chip);
|
||||
|
||||
tpm1_chip_unregister(chip);
|
||||
tpm_bios_log_teardown(chip);
|
||||
tpm_del_char_device(chip);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(tpm_chip_unregister);
|
||||
|
|
|
@ -284,6 +284,9 @@ static const struct attribute_group tpm_dev_group = {
|
|||
|
||||
void tpm_sysfs_add_device(struct tpm_chip *chip)
|
||||
{
|
||||
if (chip->flags & TPM_CHIP_FLAG_TPM2)
|
||||
return;
|
||||
|
||||
/* The sysfs routines rely on an implicit tpm_try_get_ops, device_del
|
||||
* is called before ops is null'd and the sysfs core synchronizes this
|
||||
* removal so that no callbacks are running or can run again
|
||||
|
|
|
@ -364,6 +364,9 @@ int tpm_bios_log_setup(struct tpm_chip *chip)
|
|||
const char *name = dev_name(&chip->dev);
|
||||
unsigned int cnt;
|
||||
|
||||
if (chip->flags & TPM_CHIP_FLAG_TPM2)
|
||||
return 0;
|
||||
|
||||
cnt = 0;
|
||||
chip->bios_dir[cnt] = securityfs_create_dir(name, NULL);
|
||||
/* NOTE: securityfs_create_dir can return ENODEV if securityfs is
|
||||
|
|
Loading…
Reference in a new issue