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

tpm: factor out tpm_startup function 



TPM manual startup is used only from within TPM 1.x or TPM 2.x
code, hence remove tpm_startup() function from tpm-interface.c
and add two static functions implementations tpm1_startup()
and tpm2_startup() into to tpm1-cmd.c and tpm2-cmd.c respectively.

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 c82a330c

drivers/char/tpm/tpm-interface.c

+0 −41
Original line number Diff line number Diff line
@@ -413,47 +413,6 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, 
}

EXPORT_SYMBOL_GPL(tpm_transmit_cmd);



#define TPM_ORD_STARTUP 153

#define TPM_ST_CLEAR 1



/**

 * tpm_startup - turn on the TPM

 * @chip: TPM chip to use

 *

 * Normally the firmware should start the TPM. This function is provided as a

 * workaround if this does not happen. A legal case for this could be for

 * example when a TPM emulator is used.

 *

 * Return: same as tpm_transmit_cmd()

 */

int tpm_startup(struct tpm_chip *chip)

{

	struct tpm_buf buf;

	int rc;



	dev_info(&chip->dev, "starting up the TPM manually\n");



	if (chip->flags & TPM_CHIP_FLAG_TPM2) {

		rc = tpm_buf_init(&buf, TPM2_ST_NO_SESSIONS, TPM2_CC_STARTUP);

		if (rc < 0)

			return rc;



		tpm_buf_append_u16(&buf, TPM2_SU_CLEAR);

	} else {

		rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_STARTUP);

		if (rc < 0)

			return rc;



		tpm_buf_append_u16(&buf, TPM_ST_CLEAR);

	}



	rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, 0, 0,

			      "attempting to start the TPM");



	tpm_buf_destroy(&buf);

	return rc;

}



int tpm_get_timeouts(struct tpm_chip *chip)

{

	if (chip->flags & TPM_CHIP_FLAG_HAVE_TIMEOUTS)

drivers/char/tpm/tpm.h

+0 −1
Original line number Diff line number Diff line
@@ -540,7 +540,6 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, 
			 void *buf, size_t bufsiz,

			 size_t min_rsp_body_length, unsigned int flags,

			 const char *desc);

int tpm_startup(struct tpm_chip *chip);

int tpm_get_timeouts(struct tpm_chip *);



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

drivers/char/tpm/tpm1-cmd.c

+36 −1
Original line number Diff line number Diff line
@@ -308,6 +308,40 @@ unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal) 
		return duration;

}



#define TPM_ORD_STARTUP 153

#define TPM_ST_CLEAR 1



/**

 * tpm_startup() - turn on the TPM

 * @chip: TPM chip to use

 *

 * Normally the firmware should start the TPM. This function is provided as a

 * workaround if this does not happen. A legal case for this could be for

 * example when a TPM emulator is used.

 *

 * Return: same as tpm_transmit_cmd()

 */

static int tpm1_startup(struct tpm_chip *chip)

{

	struct tpm_buf buf;

	int rc;



	dev_info(&chip->dev, "starting up the TPM manually\n");



	rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_STARTUP);

	if (rc < 0)

		return rc;



	tpm_buf_append_u16(&buf, TPM_ST_CLEAR);



	rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, 0, 0,

			      "attempting to start the TPM");



	tpm_buf_destroy(&buf);



	return rc;

}



int tpm1_get_timeouts(struct tpm_chip *chip)

{

	cap_t cap;
@@ -317,7 +351,7 @@ int tpm1_get_timeouts(struct tpm_chip *chip) 
	rc = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, NULL,

			 sizeof(cap.timeout));

	if (rc == TPM_ERR_INVALID_POSTINIT) {

		if (tpm_startup(chip))

		if (tpm1_startup(chip))

			return rc;



		rc = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap,
@@ -727,3 +761,4 @@ int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr) 


	return rc;

}

drivers/char/tpm/tpm2-cmd.c

+32 −2
Original line number Diff line number Diff line
@@ -948,6 +948,36 @@ out: 
	return rc;

}



/**

 * tpm2_startup - turn on the TPM

 * @chip: TPM chip to use

 *

 * Normally the firmware should start the TPM. This function is provided as a

 * workaround if this does not happen. A legal case for this could be for

 * example when a TPM emulator is used.

 *

 * Return: same as tpm_transmit_cmd()

 */



static int tpm2_startup(struct tpm_chip *chip)

{

	struct tpm_buf buf;

	int rc;



	dev_info(&chip->dev, "starting up the TPM manually\n");



	rc = tpm_buf_init(&buf, TPM2_ST_NO_SESSIONS, TPM2_CC_STARTUP);

	if (rc < 0)

		return rc;



	tpm_buf_append_u16(&buf, TPM2_SU_CLEAR);

	rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, 0, 0,

			      "attempting to start the TPM");

	tpm_buf_destroy(&buf);



	return rc;

}



/**

 * tpm2_auto_startup - Perform the standard automatic TPM initialization

 *                     sequence
@@ -959,7 +989,7 @@ int tpm2_auto_startup(struct tpm_chip *chip) 
{

	int rc;



	rc = tpm_get_timeouts(chip);

	rc = tpm2_get_timeouts(chip);

	if (rc)

		goto out;
@@ -968,7 +998,7 @@ int tpm2_auto_startup(struct tpm_chip *chip) 
		goto out;



	if (rc == TPM2_RC_INITIALIZE) {

		rc = tpm_startup(chip);

		rc = tpm2_startup(chip);

		if (rc)

			goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE