Commit b03c4370 authored by Tomas Winkler's avatar Tomas Winkler Committed by Jarkko Sakkinen
Browse files

tpm: add tpm_auto_startup() into tpm-interface.c 



Add wrapper tpm_auto_startup() to tpm-interface.c
instead of open coded decision between TPM 1.x and TPM 2.x
in tpm-chip.c

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 9db7fe18

drivers/char/tpm/tpm-chip.c

+3 −8
Original line number Diff line number Diff line
@@ -451,14 +451,9 @@ int tpm_chip_register(struct tpm_chip *chip) 
{

	int rc;



	if (chip->ops->flags & TPM_OPS_AUTO_STARTUP) {

		if (chip->flags & TPM_CHIP_FLAG_TPM2)

			rc = tpm2_auto_startup(chip);

		else

			rc = tpm1_auto_startup(chip);

	rc = tpm_auto_startup(chip);

	if (rc)

		return rc;

	}



	tpm_sysfs_add_device(chip);

drivers/char/tpm/tpm-interface.c

+15 −0
Original line number Diff line number Diff line
@@ -544,6 +544,21 @@ int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen) 
}

EXPORT_SYMBOL_GPL(tpm_send);



int tpm_auto_startup(struct tpm_chip *chip)

{

	int rc;



	if (!(chip->ops->flags & TPM_OPS_AUTO_STARTUP))

		return 0;



	if (chip->flags & TPM_CHIP_FLAG_TPM2)

		rc = tpm2_auto_startup(chip);

	else

		rc = tpm1_auto_startup(chip);



	return rc;

}



/*

 * We are about to suspend. Save the TPM state

 * so that it can be restored.

drivers/char/tpm/tpm.h

+1 −0
Original line number Diff line number Diff line
@@ -541,6 +541,7 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, 
			 size_t min_rsp_body_length, unsigned int flags,

			 const char *desc);

int tpm_get_timeouts(struct tpm_chip *);

int tpm_auto_startup(struct tpm_chip *chip);



int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr);

int tpm1_auto_startup(struct tpm_chip *chip);

CRA Git | Maintained and supported by SUSTech CRA and CCSE