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

Commit eb5854e7 authored by Jarkko Sakkinen's avatar Jarkko Sakkinen
Browse files

tpm: replace tpm_gen_interrupt() with tpm_tis_gen_interrupt() 



Since tpm_gen_interrupt() is only used in tpm_tis_core.c this commit
replaces it with an internal tpm_tis_gen_interrupt(). The semantics
also changed in a way that on a system error the driver initialization
is failed.

Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
parent d4abd956

drivers/char/tpm/tpm-interface.c

+1 −15
Original line number Diff line number Diff line
@@ -461,21 +461,7 @@ ssize_t tpm_getcap(struct tpm_chip *chip, __be32 subcap_id, cap_t *cap, 
		*cap = tpm_cmd.params.getcap_out.cap;

	return rc;

}



void tpm_gen_interrupt(struct tpm_chip *chip)

{

	struct	tpm_cmd_t tpm_cmd;

	ssize_t rc;



	tpm_cmd.header.in = tpm_getcap_header;

	tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP;

	tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4);

	tpm_cmd.params.getcap_in.subcap = TPM_CAP_PROP_TIS_TIMEOUT;



	rc = tpm_transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, 0,

			      "attempting to determine the timeouts");

}

EXPORT_SYMBOL_GPL(tpm_gen_interrupt);

EXPORT_SYMBOL_GPL(tpm_getcap);



#define TPM_ORD_STARTUP cpu_to_be32(153)

#define TPM_ST_CLEAR cpu_to_be16(1)

drivers/char/tpm/tpm.h

+0 −2
Original line number Diff line number Diff line
@@ -487,7 +487,6 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, const void *cmd, int len, 
ssize_t tpm_getcap(struct tpm_chip *chip, __be32 subcap_id, cap_t *cap,

		   const char *desc);

int tpm_get_timeouts(struct tpm_chip *);

void tpm_gen_interrupt(struct tpm_chip *);

int tpm1_auto_startup(struct tpm_chip *chip);

int tpm_do_selftest(struct tpm_chip *chip);

unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal);
@@ -534,6 +533,5 @@ ssize_t tpm2_get_tpm_pt(struct tpm_chip *chip, u32 property_id, 
int tpm2_auto_startup(struct tpm_chip *chip);

void tpm2_shutdown(struct tpm_chip *chip, u16 shutdown_type);

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

int tpm2_gen_interrupt(struct tpm_chip *chip);

int tpm2_probe(struct tpm_chip *chip);

#endif

drivers/char/tpm/tpm2-cmd.c

+1 −17
Original line number Diff line number Diff line
@@ -736,6 +736,7 @@ ssize_t tpm2_get_tpm_pt(struct tpm_chip *chip, u32 property_id, u32 *value, 


	return rc;

}

EXPORT_SYMBOL_GPL(tpm2_get_tpm_pt);



#define TPM2_STARTUP_IN_SIZE \

	(sizeof(struct tpm_input_header) + \
@@ -923,23 +924,6 @@ static int tpm2_do_selftest(struct tpm_chip *chip) 
	return rc;

}



/**

 * tpm2_gen_interrupt() - generate an interrupt

 * @chip: TPM chip to use

 *

 * 0 is returned when the operation is successful. If a negative number is

 * returned it remarks a POSIX error code. If a positive number is returned

 * it remarks a TPM error.

 */

int tpm2_gen_interrupt(struct tpm_chip *chip)

{

	u32 dummy;



	return tpm2_get_tpm_pt(chip, 0x100, &dummy,

			       "attempting to generate an interrupt");

}

EXPORT_SYMBOL_GPL(tpm2_gen_interrupt);



/**

 * tpm2_probe() - probe TPM 2.0

 * @chip: TPM chip to use

drivers/char/tpm/tpm_tis_core.c

+15 −4
Original line number Diff line number Diff line
@@ -526,6 +526,18 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id) 
	return IRQ_HANDLED;

}



static int tpm_tis_gen_interrupt(struct tpm_chip *chip)

{

	const char *desc = "attempting to generate an interrupt";

	u32 cap2;

	cap_t cap;



	if (chip->flags & TPM_CHIP_FLAG_TPM2)

		return tpm2_get_tpm_pt(chip, 0x100, &cap2, desc);

	else

		return tpm_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, desc);

}



/* Register the IRQ and issue a command that will cause an interrupt. If an

 * irq is seen then leave the chip setup for IRQ operation, otherwise reverse

 * everything and leave in polling mode. Returns 0 on success.
@@ -575,10 +587,9 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, 
	/* Generate an interrupt by having the core call through to

	 * tpm_tis_send

	 */

	if (chip->flags & TPM_CHIP_FLAG_TPM2)

		tpm2_gen_interrupt(chip);

	else

		tpm_gen_interrupt(chip);

	rc = tpm_tis_gen_interrupt(chip);

	if (rc < 0)

		return rc;



	/* tpm_tis_send will either confirm the interrupt is working or it

	 * will call disable_irq which undoes all of the above.