Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

tpm: move tpm 1.x selftest code from tpm-interface.c tpm1-cmd.c 



Move the tpm1 selftest code functions to tpm1-cmd.c
and adjust callers to use the new function names.
 1. tpm_pcr_read_dev() to tpm1_pcr_read_dev().
 2. tpm_continue_selftest() to tpm1_continue_selftest().
 3. tpm_do_selftest() to tpm1_do_selftest()

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 433d390f

drivers/char/tpm/st33zp24/st33zp24.c

+1 −1
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ int st33zp24_pm_resume(struct device *dev) 
	} else {

		ret = tpm_pm_resume(dev);

		if (!ret)

			tpm_do_selftest(chip);

			tpm1_do_selftest(chip);

	}

	return ret;

} /* st33zp24_pm_resume() */

drivers/char/tpm/tpm-interface.c

+3 −145
Original line number Diff line number Diff line
@@ -466,59 +466,6 @@ int tpm_get_timeouts(struct tpm_chip *chip) 
}

EXPORT_SYMBOL_GPL(tpm_get_timeouts);



#define TPM_ORD_CONTINUE_SELFTEST 83

#define CONTINUE_SELFTEST_RESULT_SIZE 10



static const struct tpm_input_header continue_selftest_header = {

	.tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),

	.length = cpu_to_be32(10),

	.ordinal = cpu_to_be32(TPM_ORD_CONTINUE_SELFTEST),

};



/**

 * tpm_continue_selftest -- run TPM's selftest

 * @chip: TPM chip to use

 *

 * Returns 0 on success, < 0 in case of fatal error or a value > 0 representing

 * a TPM error code.

 */

static int tpm_continue_selftest(struct tpm_chip *chip)

{

	int rc;

	struct tpm_cmd_t cmd;



	cmd.header.in = continue_selftest_header;

	rc = tpm_transmit_cmd(chip, NULL, &cmd, CONTINUE_SELFTEST_RESULT_SIZE,

			      0, 0, "continue selftest");

	return rc;

}



#define TPM_ORDINAL_PCRREAD 21

#define READ_PCR_RESULT_SIZE 30

#define READ_PCR_RESULT_BODY_SIZE 20

static const struct tpm_input_header pcrread_header = {

	.tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),

	.length = cpu_to_be32(14),

	.ordinal = cpu_to_be32(TPM_ORDINAL_PCRREAD)

};



int tpm_pcr_read_dev(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)

{

	int rc;

	struct tpm_cmd_t cmd;



	cmd.header.in = pcrread_header;

	cmd.params.pcrread_in.pcr_idx = cpu_to_be32(pcr_idx);

	rc = tpm_transmit_cmd(chip, NULL, &cmd, READ_PCR_RESULT_SIZE,

			      READ_PCR_RESULT_BODY_SIZE, 0,

			      "attempting to read a pcr value");



	if (rc == 0)

		memcpy(res_buf, cmd.params.pcrread_out.pcr_result,

		       TPM_DIGEST_SIZE);

	return rc;

}



/**

 * tpm_is_tpm2 - do we a have a TPM2 chip?

 * @chip:	a &struct tpm_chip instance, %NULL for the default chip
@@ -559,10 +506,12 @@ int tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf) 
	chip = tpm_find_get_ops(chip);

	if (!chip)

		return -ENODEV;



	if (chip->flags & TPM_CHIP_FLAG_TPM2)

		rc = tpm2_pcr_read(chip, pcr_idx, res_buf);

	else

		rc = tpm_pcr_read_dev(chip, pcr_idx, res_buf);

		rc = tpm1_pcr_read_dev(chip, pcr_idx, res_buf);



	tpm_put_ops(chip);

	return rc;

}
@@ -613,97 +562,6 @@ int tpm_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash) 
}

EXPORT_SYMBOL_GPL(tpm_pcr_extend);



/**

 * tpm_do_selftest - have the TPM continue its selftest and wait until it

 *                   can receive further commands

 * @chip: TPM chip to use

 *

 * Returns 0 on success, < 0 in case of fatal error or a value > 0 representing

 * a TPM error code.

 */

int tpm_do_selftest(struct tpm_chip *chip)

{

	int rc;

	unsigned int loops;

	unsigned int delay_msec = 100;

	unsigned long duration;

	u8 dummy[TPM_DIGEST_SIZE];



	duration = tpm1_calc_ordinal_duration(chip, TPM_ORD_CONTINUE_SELFTEST);



	loops = jiffies_to_msecs(duration) / delay_msec;



	rc = tpm_continue_selftest(chip);

	if (rc == TPM_ERR_INVALID_POSTINIT) {

		chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;

		dev_info(&chip->dev, "TPM not ready (%d)\n", rc);

	}

	/* This may fail if there was no TPM driver during a suspend/resume

	 * cycle; some may return 10 (BAD_ORDINAL), others 28 (FAILEDSELFTEST)

	 */

	if (rc)

		return rc;



	do {

		/* Attempt to read a PCR value */

		rc = tpm_pcr_read_dev(chip, 0, dummy);



		/* Some buggy TPMs will not respond to tpm_tis_ready() for

		 * around 300ms while the self test is ongoing, keep trying

		 * until the self test duration expires. */

		if (rc == -ETIME) {

			dev_info(

			    &chip->dev, HW_ERR

			    "TPM command timed out during continue self test");

			tpm_msleep(delay_msec);

			continue;

		}



		if (rc == TPM_ERR_DISABLED || rc == TPM_ERR_DEACTIVATED) {

			dev_info(&chip->dev,

				 "TPM is disabled/deactivated (0x%X)\n", rc);

			/* TPM is disabled and/or deactivated; driver can

			 * proceed and TPM does handle commands for

			 * suspend/resume correctly

			 */

			return 0;

		}

		if (rc != TPM_WARN_DOING_SELFTEST)

			return rc;

		tpm_msleep(delay_msec);

	} while (--loops > 0);



	return rc;

}

EXPORT_SYMBOL_GPL(tpm_do_selftest);



/**

 * tpm1_auto_startup - Perform the standard automatic TPM initialization

 *                     sequence

 * @chip: TPM chip to use

 *

 * Returns 0 on success, < 0 in case of fatal error.

 */

int tpm1_auto_startup(struct tpm_chip *chip)

{

	int rc;



	rc = tpm_get_timeouts(chip);

	if (rc)

		goto out;

	rc = tpm_do_selftest(chip);

	if (rc) {

		dev_err(&chip->dev, "TPM self test failed\n");

		goto out;

	}



	return rc;

out:

	if (rc > 0)

		rc = -ENODEV;

	return rc;

}



/**

 * tpm_send - send a TPM command

 * @chip:	a &struct tpm_chip instance, %NULL for the default chip

drivers/char/tpm/tpm-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static ssize_t pcrs_show(struct device *dev, struct device_attribute *attr, 


	num_pcrs = be32_to_cpu(cap.num_pcrs);

	for (i = 0; i < num_pcrs; i++) {

		rc = tpm_pcr_read_dev(chip, i, digest);

		rc = tpm1_pcr_read_dev(chip, i, digest);

		if (rc)

			break;

		str += sprintf(str, "PCR-%02d: ", i);

drivers/char/tpm/tpm.h

+2 −3
Original line number Diff line number Diff line
@@ -543,12 +543,12 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, 
int tpm_startup(struct tpm_chip *chip);

int tpm_get_timeouts(struct tpm_chip *);

int tpm1_auto_startup(struct tpm_chip *chip);

int tpm_do_selftest(struct tpm_chip *chip);



int tpm1_do_selftest(struct tpm_chip *chip);

int tpm1_get_timeouts(struct tpm_chip *chip);

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

int tpm1_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash,

		    const char *log_msg);

int tpm1_pcr_read_dev(struct tpm_chip *chip, int pcr_idx, u8 *res_buf);

ssize_t tpm1_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,

		    const char *desc, size_t min_cap_length);

int tpm1_get_random(struct tpm_chip *chip, u8 *out, size_t max);
@@ -575,7 +575,6 @@ void tpm_chip_unregister(struct tpm_chip *chip); 


void tpm_sysfs_add_device(struct tpm_chip *chip);



int tpm_pcr_read_dev(struct tpm_chip *chip, int pcr_idx, u8 *res_buf);



#ifdef CONFIG_ACPI

extern void tpm_add_ppi(struct tpm_chip *chip);

drivers/char/tpm/tpm1-cmd.c

+142 −0
Original line number Diff line number Diff line
@@ -524,3 +524,145 @@ int tpm1_get_random(struct tpm_chip *chip, u8 *out, size_t max) 


	return total ? total : -EIO;

}



#define TPM_ORDINAL_PCRREAD 21

#define READ_PCR_RESULT_SIZE 30

#define READ_PCR_RESULT_BODY_SIZE 20

static const struct tpm_input_header pcrread_header = {

	.tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),

	.length = cpu_to_be32(14),

	.ordinal = cpu_to_be32(TPM_ORDINAL_PCRREAD)

};



int tpm1_pcr_read_dev(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)

{

	int rc;

	struct tpm_cmd_t cmd;



	cmd.header.in = pcrread_header;

	cmd.params.pcrread_in.pcr_idx = cpu_to_be32(pcr_idx);

	rc = tpm_transmit_cmd(chip, NULL, &cmd, READ_PCR_RESULT_SIZE,

			      READ_PCR_RESULT_BODY_SIZE, 0,

			      "attempting to read a pcr value");



	if (rc == 0)

		memcpy(res_buf, cmd.params.pcrread_out.pcr_result,

		       TPM_DIGEST_SIZE);

	return rc;

}



#define TPM_ORD_CONTINUE_SELFTEST 83

#define CONTINUE_SELFTEST_RESULT_SIZE 10

static const struct tpm_input_header continue_selftest_header = {

	.tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),

	.length = cpu_to_be32(10),

	.ordinal = cpu_to_be32(TPM_ORD_CONTINUE_SELFTEST),

};



/**

 * tpm_continue_selftest -- run TPM's selftest

 * @chip: TPM chip to use

 *

 * Returns 0 on success, < 0 in case of fatal error or a value > 0 representing

 * a TPM error code.

 */

static int tpm1_continue_selftest(struct tpm_chip *chip)

{

	int rc;

	struct tpm_cmd_t cmd;



	cmd.header.in = continue_selftest_header;

	rc = tpm_transmit_cmd(chip, NULL, &cmd, CONTINUE_SELFTEST_RESULT_SIZE,

			      0, 0, "continue selftest");

	return rc;

}



/**

 * tpm1_do_selftest - have the TPM continue its selftest and wait until it

 *                   can receive further commands

 * @chip: TPM chip to use

 *

 * Returns 0 on success, < 0 in case of fatal error or a value > 0 representing

 * a TPM error code.

 */

int tpm1_do_selftest(struct tpm_chip *chip)

{

	int rc;

	unsigned int loops;

	unsigned int delay_msec = 100;

	unsigned long duration;

	u8 dummy[TPM_DIGEST_SIZE];



	duration = tpm1_calc_ordinal_duration(chip, TPM_ORD_CONTINUE_SELFTEST);



	loops = jiffies_to_msecs(duration) / delay_msec;



	rc = tpm1_continue_selftest(chip);

	if (rc == TPM_ERR_INVALID_POSTINIT) {

		chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;

		dev_info(&chip->dev, "TPM not ready (%d)\n", rc);

	}

	/* This may fail if there was no TPM driver during a suspend/resume

	 * cycle; some may return 10 (BAD_ORDINAL), others 28 (FAILEDSELFTEST)

	 */

	if (rc)

		return rc;



	do {

		/* Attempt to read a PCR value */

		rc = tpm1_pcr_read_dev(chip, 0, dummy);



		/* Some buggy TPMs will not respond to tpm_tis_ready() for

		 * around 300ms while the self test is ongoing, keep trying

		 * until the self test duration expires.

		 */

		if (rc == -ETIME) {

			dev_info(&chip->dev, HW_ERR "TPM command timed out during continue self test");

			tpm_msleep(delay_msec);

			continue;

		}



		if (rc == TPM_ERR_DISABLED || rc == TPM_ERR_DEACTIVATED) {

			dev_info(&chip->dev, "TPM is disabled/deactivated (0x%X)\n",

				 rc);

			/* TPM is disabled and/or deactivated; driver can

			 * proceed and TPM does handle commands for

			 * suspend/resume correctly

			 */

			return 0;

		}

		if (rc != TPM_WARN_DOING_SELFTEST)

			return rc;

		tpm_msleep(delay_msec);

	} while (--loops > 0);



	return rc;

}

EXPORT_SYMBOL_GPL(tpm1_do_selftest);



/**

 * tpm1_auto_startup - Perform the standard automatic TPM initialization

 *                     sequence

 * @chip: TPM chip to use

 *

 * Returns 0 on success, < 0 in case of fatal error.

 */

int tpm1_auto_startup(struct tpm_chip *chip)

{

	int rc;



	rc = tpm1_get_timeouts(chip);

	if (rc)

		goto out;

	rc = tpm1_do_selftest(chip);

	if (rc) {

		dev_err(&chip->dev, "TPM self test failed\n");

		goto out;

	}



	return rc;

out:

	if (rc > 0)

		rc = -ENODEV;

	return rc;

}