tpm, tpm_tis: Extend disable_interrupts() to delay irq deactivation

The code in tis_int_handler() and disable_interrupts() to deactivate
interrupts is almost the same, except for the delayed deactivation
in tis_int_handler().
Extend disable_interrupts() to also handle delayed activation and use this
function also in tis_int_handler().

Signed-off-by: Lino Sanfilippo <l.sanfilippo@kunbus.com>

Author: linosanfilippo-kunbus

drivers/char/tpm/tpm_tis_core.c

@@ -469,7 +469,7 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len)
 	return rc;
 }
 
-static void disable_interrupts(struct tpm_chip *chip)
+static void disable_interrupts(struct tpm_chip *chip, bool delayed)
 {
 	struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);
 	u32 intmask;
@@ -478,16 +478,24 @@ static void disable_interrupts(struct tpm_chip *chip)
 	if (priv->irq == 0)
 		return;
 
+	chip->flags &= ~TPM_CHIP_FLAG_IRQ;
+
 	rc = tpm_tis_read32(priv, TPM_INT_ENABLE(priv->locality), &intmask);
 	if (rc < 0)
 		intmask = 0;
 
 	intmask &= ~TPM_GLOBAL_INT_ENABLE;
+
+	tpm_tis_request_locality(chip, 0);
 	rc = tpm_tis_write32(priv, TPM_INT_ENABLE(priv->locality), intmask);
+	tpm_tis_relinquish_locality(chip, 0);
 
-	devm_free_irq(chip->dev.parent, priv->irq, chip);
-	priv->irq = 0;
-	chip->flags &= ~TPM_CHIP_FLAG_IRQ;
+	if (delayed) {
+		schedule_work(&priv->free_irq_work);
+	} else {
+		devm_free_irq(chip->dev.parent, priv->irq, chip);
+		priv->irq = 0;
+	}
 }
 
 /*
@@ -553,7 +561,7 @@ static int tpm_tis_send(struct tpm_chip *chip, u8 *buf, size_t len)
 	if (!test_bit(TPM_TIS_IRQ_TESTED, &priv->flags))
 		tpm_msleep(1);
 	if (!test_bit(TPM_TIS_IRQ_TESTED, &priv->flags))
-		disable_interrupts(chip);
+		disable_interrupts(chip, false);
 	set_bit(TPM_TIS_IRQ_TESTED, &priv->flags);
 	return rc;
 }
@@ -796,22 +804,9 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id)
 	priv->last_unhandled_irq = jiffies;
 
 	if ((priv->unhandled_irqs > MAX_UNHANDLED_IRQS) &&
-	    (chip->flags & TPM_CHIP_FLAG_IRQ)) {
-		int intmask;
-
-		tpm_tis_request_locality(chip, 0);
-		rc = tpm_tis_read32(priv, TPM_INT_ENABLE(priv->locality), &intmask);
-		if (rc < 0)
-			intmask = 0;
-
-		intmask &= ~TPM_GLOBAL_INT_ENABLE;
-		rc = tpm_tis_write32(priv, TPM_INT_ENABLE(priv->locality), intmask);
-		tpm_tis_relinquish_locality(chip, 0);
+	    (chip->flags & TPM_CHIP_FLAG_IRQ))
+		disable_interrupts(chip, true);
 
-		chip->flags &= ~TPM_CHIP_FLAG_IRQ;
-
-		schedule_work(&priv->free_irq_work);
-	}
 	return IRQ_HANDLED;
 }
 
@@ -1235,7 +1230,7 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
 			rc = tpm_tis_request_locality(chip, 0);
 			if (rc < 0)
 				goto out_err;
-			disable_interrupts(chip);
+			disable_interrupts(chip, false);
 			tpm_tis_relinquish_locality(chip, 0);
 		}
 	}