Commit 3cb60ee6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tpmdd-next-v5.12-rc2' of... 

Merge tag 'tpmdd-next-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd

Pull tpm fixes Jarkko Sakkinen:
 "Three fixes for rc2"

* tag 'tpmdd-next-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm: Remove unintentional dump_stack() call
  tpm, tpm_tis: Decorate tpm_tis_gen_interrupt() with request_locality()
  tpm, tpm_tis: Decorate tpm_get_timeouts() with request_locality()
parents cee407c5 232a37ea

drivers/char/tpm/tpm-chip.c

+0 −2
Original line number Diff line number Diff line
@@ -278,8 +278,6 @@ static void tpm_devs_release(struct device *dev) 
{

	struct tpm_chip *chip = container_of(dev, struct tpm_chip, devs);



	dump_stack();



	/* release the master device reference */

	put_device(&chip->dev);

}

drivers/char/tpm/tpm_tis_core.c

+25 −5
Original line number Diff line number Diff line
@@ -707,12 +707,22 @@ static int tpm_tis_gen_interrupt(struct tpm_chip *chip) 
	const char *desc = "attempting to generate an interrupt";

	u32 cap2;

	cap_t cap;

	int ret;



	/* TPM 2.0 */

	if (chip->flags & TPM_CHIP_FLAG_TPM2)

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

	else

		return tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, desc,

				  0);



	/* TPM 1.2 */

	ret = request_locality(chip, 0);

	if (ret < 0)

		return ret;



	ret = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, desc, 0);



	release_locality(chip, 0);



	return ret;

}



/* Register the IRQ and issue a command that will cause an interrupt. If an
@@ -1019,11 +1029,21 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, 
	init_waitqueue_head(&priv->read_queue);

	init_waitqueue_head(&priv->int_queue);

	if (irq != -1) {

		/* Before doing irq testing issue a command to the TPM in polling mode

		/*

		 * Before doing irq testing issue a command to the TPM in polling mode

		 * to make sure it works. May as well use that command to set the

		 * proper timeouts for the driver.

		 */

		if (tpm_get_timeouts(chip)) {



		rc = request_locality(chip, 0);

		if (rc < 0)

			goto out_err;



		rc = tpm_get_timeouts(chip);



		release_locality(chip, 0);



		if (rc) {

			dev_err(dev, "Could not get TPM timeouts and durations\n");

			rc = -ENODEV;

			goto out_err;