On Fri, Jun 10, 2022 at 01:08:40PM +0200, LinoSanfilippo@xxxxxx wrote:
> From: Lino Sanfilippo <l.sanfilippo@xxxxxxxxxx>
>
> In tpm_tis_probe_single_irq interrupt registers TPM_INT_VECTOR,
nit: tpm_tis_probe_single_irq()
> 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.
>
> Signed-off-by: Lino Sanfilippo <l.sanfilippo@xxxxxxxxxx>
> ---
> drivers/char/tpm/tpm_tis_core.c | 25 ++++++++++++++++++++-----
> 1 file changed, 20 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
> index dee701609b80..718525fcadc0 100644
> --- a/drivers/char/tpm/tpm_tis_core.c
> +++ b/drivers/char/tpm/tpm_tis_core.c
> @@ -756,30 +756,45 @@ 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)
> + if (rc < 0) {
> + release_locality(chip, priv->locality);
> return rc;
> + }
>
> rc = tpm_tis_read32(priv, TPM_INT_STATUS(priv->locality), &int_status);
> - if (rc < 0)
> + if (rc < 0) {
> + release_locality(chip, priv->locality);
> return rc;
> + }
>
> /* Clear all existing */
> rc = tpm_tis_write32(priv, TPM_INT_STATUS(priv->locality), int_status);
> - if (rc < 0)
> + if (rc < 0) {
> + release_locality(chip, priv->locality);
> return rc;
> + }
>
> /* Turn on */
> rc = tpm_tis_write32(priv, TPM_INT_ENABLE(priv->locality),
> intmask | TPM_GLOBAL_INT_ENABLE);
> - if (rc < 0)
> + if (rc < 0) {
> + release_locality(chip, priv->locality);
> return rc;
> + }
>
> + release_locality(chip, priv->locality);
> clear_bit(TPM_TIS_IRQ_TESTED, &priv->irqtest_flags);
>
> /* Generate an interrupt by having the core call through to
> --
> 2.36.1
>
Reviewed-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
BR, Jarkko
