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

tpm: add tpm_calc_ordinal_duration() wrapper 



Add convenient wrapper for ordinal duration computation
to remove boiler plate if else statement over TPM2.

if (chip->flags & TPM_CHIP_FLAG_TPM2)
	tpm2_calc_ordinal_duration(chip, ordinal);
else
	tpm1_calc_ordinal_duration(chip, ordinal);

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

drivers/char/tpm/st33zp24/st33zp24.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static int st33zp24_send(struct tpm_chip *chip, unsigned char *buf, 
		ordinal = be32_to_cpu(*((__be32 *) (buf + 6)));



		ret = wait_for_stat(chip, TPM_STS_DATA_AVAIL | TPM_STS_VALID,

				tpm1_calc_ordinal_duration(chip, ordinal),

				tpm_calc_ordinal_duration(chip, ordinal),

				&tpm_dev->read_queue, false);

		if (ret < 0)

			goto out_err;

drivers/char/tpm/tpm-interface.c

+20 −4
Original line number Diff line number Diff line
@@ -47,6 +47,25 @@ module_param_named(suspend_pcr, tpm_suspend_pcr, uint, 0644); 
MODULE_PARM_DESC(suspend_pcr,

		 "PCR to use for dummy writes to facilitate flush on suspend.");



/**

 * tpm_calc_ordinal_duration() - calculate the maximum command duration

 * @chip:    TPM chip to use.

 * @ordinal: TPM command ordinal.

 *

 * The function returns the maximum amount of time the chip could take

 * to return the result for a particular ordinal in jiffies.

 *

 * Return: A maximal duration time for an ordinal in jiffies.

 */

unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal)

{

	if (chip->flags & TPM_CHIP_FLAG_TPM2)

		return tpm2_calc_ordinal_duration(chip, ordinal);

	else

		return tpm1_calc_ordinal_duration(chip, ordinal);

}

EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration);



static int tpm_validate_command(struct tpm_chip *chip,

				 struct tpm_space *space,

				 const u8 *cmd,
@@ -220,10 +239,7 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip, 
	if (chip->flags & TPM_CHIP_FLAG_IRQ)

		goto out_recv;



	if (chip->flags & TPM_CHIP_FLAG_TPM2)

		stop = jiffies + tpm2_calc_ordinal_duration(chip, ordinal);

	else

		stop = jiffies + tpm1_calc_ordinal_duration(chip, ordinal);

	stop = jiffies + tpm_calc_ordinal_duration(chip, ordinal);

	do {

		u8 status = chip->ops->status(chip);

		if ((status & chip->ops->req_complete_mask) ==

drivers/char/tpm/tpm.h

+1 −0
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ int tpm_get_timeouts(struct tpm_chip *); 
int tpm1_auto_startup(struct tpm_chip *chip);

int tpm_do_selftest(struct tpm_chip *chip);

unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal);

unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal);

int tpm_pm_suspend(struct device *dev);

int tpm_pm_resume(struct device *dev);

drivers/char/tpm/tpm1-cmd.c

+0 −1
Original line number Diff line number Diff line
@@ -307,4 +307,3 @@ unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal) 
	else

		return duration;

}
 
EXPORT_SYMBOL_GPL(tpm1_calc_ordinal_duration);

drivers/char/tpm/tpm2-cmd.c

+0 −1
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ unsigned long tpm2_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal) 
	else

		return msecs_to_jiffies(TPM2_DURATION_DEFAULT);

}

EXPORT_SYMBOL_GPL(tpm2_calc_ordinal_duration);





struct tpm2_pcr_read_out {

CRA Git | Maintained and supported by SUSTech CRA and CCSE