lkml.org 
[lkml]   [2020]   [Apr]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 099/131] tpm/tpm_tis: Free IRQ if probing fails
    Date
    From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

    commit b160c94be5d2816b62c8ac338605668304242959 upstream.

    Call disable_interrupts() if we have to revert to polling in order not to
    unnecessarily reserve the IRQ for the life-cycle of the driver.

    Cc: stable@vger.kernel.org # 4.5.x
    Reported-by: Hans de Goede <hdegoede@redhat.com>
    Fixes: e3837e74a06d ("tpm_tis: Refactor the interrupt setup")
    Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/char/tpm/tpm_tis_core.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    --- a/drivers/char/tpm/tpm_tis_core.c
    +++ b/drivers/char/tpm/tpm_tis_core.c
    @@ -437,6 +437,9 @@ static void disable_interrupts(struct tp
    u32 intmask;
    int rc;

    + if (priv->irq == 0)
    + return;
    +
    rc = tpm_tis_read32(priv, TPM_INT_ENABLE(priv->locality), &intmask);
    if (rc < 0)
    intmask = 0;
    @@ -984,9 +987,12 @@ int tpm_tis_core_init(struct device *dev
    if (irq) {
    tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,
    irq);
    - if (!(chip->flags & TPM_CHIP_FLAG_IRQ))
    + if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) {
    dev_err(&chip->dev, FW_BUG
    "TPM interrupt not working, polling instead\n");
    +
    + disable_interrupts(chip);
    + }
    } else {
    tpm_tis_probe_irq(chip, intmask);
    }

    \
     
     \ /
      Last update: 2020-04-28 20:50    [W:4.086 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site