Commit 15d7aa4e authored by Lino Sanfilippo's avatar Lino Sanfilippo Committed by Jarkko Sakkinen
Browse files

tpm, tpm_tis: Claim locality before writing interrupt registers 



In tpm_tis_probe_single_irq() interrupt registers TPM_INT_VECTOR,
TPM_INT_STATUS and TPM_INT_ENABLE are modified to setup the interrupts.
Currently these modifications are done without holding a locality thus they
have no effect. Fix this by claiming the (default) locality before the
registers are written.

Since now tpm_tis_gen_interrupt() is called with the locality already
claimed remove locality request and release from this function.

Signed-off-by: default avatarLino Sanfilippo <l.sanfilippo@kunbus.com>
Tested-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
parent ed9be0e6

drivers/char/tpm/tpm_tis_core.c

+11 −9
Original line number Diff line number Diff line
@@ -740,16 +740,10 @@ static void tpm_tis_gen_interrupt(struct tpm_chip *chip) 
	cap_t cap;

	int ret;



	ret = request_locality(chip, 0);

	if (ret < 0)

		return;



	if (chip->flags & TPM_CHIP_FLAG_TPM2)

		ret = tpm2_get_tpm_pt(chip, 0x100, &cap2, desc);

	else

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



	release_locality(chip, 0);

}



/* Register the IRQ and issue a command that will cause an interrupt. If an
@@ -772,10 +766,16 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, 
	}

	priv->irq = irq;



	rc = request_locality(chip, 0);

	if (rc < 0)

		return rc;



	rc = tpm_tis_read8(priv, TPM_INT_VECTOR(priv->locality),

			   &original_int_vec);

	if (rc < 0)

	if (rc < 0) {

		release_locality(chip, priv->locality);

		return rc;

	}



	rc = tpm_tis_write8(priv, TPM_INT_VECTOR(priv->locality), irq);

	if (rc < 0)
@@ -809,10 +809,12 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask, 
	if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) {

		tpm_tis_write8(priv, original_int_vec,

			       TPM_INT_VECTOR(priv->locality));

		return -1;

		rc = -1;

	}



	return 0;

	release_locality(chip, priv->locality);



	return rc;

}



/* Try to find the IRQ the TPM is using. This is for legacy x86 systems that