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

Commit 94e266ba authored by Jarkko Sakkinen's avatar Jarkko Sakkinen
Browse files

tpm: migrate tpm2_probe() to use struct tpm_buf 



In order to make struct tpm_buf the first class object for constructing TPM
commands, migrate tpm2_probe() to use it.

Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Acked-by: default avatarJay Freyensee <why2jjj.linux@gmail.com>
Reviewed-by: default avatarNayna Jain <nayna@linux.vnet.ibm.com>
Tested-by: default avatarNayna Jain <nayna@linux.vnet.ibm.com>
Reviewed-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
parent cc26c6ef

drivers/char/tpm/tpm2-cmd.c

+23 −17
Original line number Original line Diff line number Diff line
@@ -846,31 +846,37 @@ static int tpm2_do_selftest(struct tpm_chip *chip) 
}

}





/**

/**

 * tpm2_probe() - probe TPM 2.0

 * tpm2_probe() - probe for the TPM 2.0 protocol

 * @chip: TPM chip to use

 * @chip:	a &tpm_chip instance

 *

 *

 * Return: < 0 error and 0 on success.

 * Send an idempotent TPM 2.0 command and see whether there is TPM2 chip in the

 * other end based on the response tag. The flag TPM_CHIP_FLAG_TPM2 is set by

 * this function if this is the case.

 *

 *

 * Send idempotent TPM 2.0 command and see whether TPM 2.0 chip replied based on

 * Return:

 * the reply tag.

 *   0 on success,

 *   -errno otherwise

 */

 */

int tpm2_probe(struct tpm_chip *chip)

int tpm2_probe(struct tpm_chip *chip)

{

{

	struct tpm2_cmd cmd;

	struct tpm_output_header *out;

	struct tpm_buf buf;

	int rc;

	int rc;





	cmd.header.in = tpm2_get_tpm_pt_header;

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

	cmd.params.get_tpm_pt_in.cap_id = cpu_to_be32(TPM2_CAP_TPM_PROPERTIES);

	if (rc)

	cmd.params.get_tpm_pt_in.property_id = cpu_to_be32(0x100);

	cmd.params.get_tpm_pt_in.property_cnt = cpu_to_be32(1);



	rc = tpm_transmit_cmd(chip, NULL, &cmd, sizeof(cmd), 0, 0, NULL);

	if (rc <  0)

		return rc;

		return rc;



	tpm_buf_append_u32(&buf, TPM2_CAP_TPM_PROPERTIES);

	if (be16_to_cpu(cmd.header.out.tag) == TPM2_ST_NO_SESSIONS)

	tpm_buf_append_u32(&buf, TPM_PT_TOTAL_COMMANDS);

	tpm_buf_append_u32(&buf, 1);

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

	/* We ignore TPM return codes on purpose. */

	if (rc >=  0) {

		out = (struct tpm_output_header *)buf.data;

		if (be16_to_cpu(out->tag) == TPM2_ST_NO_SESSIONS)

			chip->flags |= TPM_CHIP_FLAG_TPM2;

			chip->flags |= TPM_CHIP_FLAG_TPM2;



	}

	tpm_buf_destroy(&buf);

	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(tpm2_probe);

EXPORT_SYMBOL_GPL(tpm2_probe);