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

Commit 036bb38f authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Jarkko Sakkinen
Browse files

tpm_tis: Ensure interrupts are disabled when the driver starts 



This should be done very early, before anything could possibly
cause the TPM to generate an interrupt. If the IRQ line is shared
with another driver causing an interrupt before setting up our
handler will be very bad.

Signed-off-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarMartin Wilck <Martin.Wilck@ts.fujitsu.com>
Tested-by: default avatarScot Doyle <lkml14@scotdoyle.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Acked-by: default avatarPeter Huewe <peterhuewe@gmx.de>
parent 727f28b8

drivers/char/tpm/tpm_tis.c

+9 −11
Original line number Diff line number Diff line
@@ -677,6 +677,15 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, 
		goto out_err;

	}



	/* Take control of the TPM's interrupt hardware and shut it off */

	intmask = ioread32(chip->vendor.iobase +

			   TPM_INT_ENABLE(chip->vendor.locality));

	intmask |= TPM_INTF_CMD_READY_INT | TPM_INTF_LOCALITY_CHANGE_INT |

		   TPM_INTF_DATA_AVAIL_INT | TPM_INTF_STS_VALID_INT;

	intmask &= ~TPM_GLOBAL_INT_ENABLE;

	iowrite32(intmask,

		  chip->vendor.iobase + TPM_INT_ENABLE(chip->vendor.locality));



	if (request_locality(chip, 0) != 0) {

		rc = -ENODEV;

		goto out_err;
@@ -735,17 +744,6 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, 
	init_waitqueue_head(&chip->vendor.read_queue);

	init_waitqueue_head(&chip->vendor.int_queue);



	intmask =

	    ioread32(chip->vendor.iobase +

		     TPM_INT_ENABLE(chip->vendor.locality));



	intmask |= TPM_INTF_CMD_READY_INT

	    | TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_DATA_AVAIL_INT

	    | TPM_INTF_STS_VALID_INT;



	iowrite32(intmask,

		  chip->vendor.iobase +

		  TPM_INT_ENABLE(chip->vendor.locality));

	if (interrupts)

		chip->vendor.irq = tpm_info->irq;

	if (interrupts && !chip->vendor.irq) {