linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lino Sanfilippo <LinoSanfilippo@gmx.de>
To: peterhuewe@gmx.de, jarkko@kernel.org, jgg@ziepe.ca
Cc: stefanb@linux.vnet.ibm.com, linux@mniewoehner.de,
	linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org,
	jandryuk@gmail.com, pmenzel@molgen.mpg.de,
	l.sanfilippo@kunbus.com, LinoSanfilippo@gmx.de, lukas@wunner.de,
	p.rosenberger@kunbus.com
Subject: [PATCH v8 04/11] tpm, tmp_tis: Claim locality before writing interrupt registers
Date: Tue, 18 Oct 2022 01:57:25 +0200	[thread overview]
Message-ID: <20221017235732.10145-5-LinoSanfilippo@gmx.de> (raw)
In-Reply-To: <20221017235732.10145-1-LinoSanfilippo@gmx.de>

From: Lino Sanfilippo <l.sanfilippo@kunbus.com>

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.

Signed-off-by: Lino Sanfilippo <l.sanfilippo@kunbus.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Tested-by: Michael Niewöhner <linux@mniewoehner.de>
---
 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 603b82ca56da..52205a1fee9e 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -770,30 +770,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->flags);
 
 	/* Generate an interrupt by having the core call through to
-- 
2.36.1


  parent reply	other threads:[~2022-10-17 23:58 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-17 23:57 [PATCH v8 00/11] TPM IRQ fixes Lino Sanfilippo
2022-10-17 23:57 ` [PATCH v8 01/11] tpm, tpm_tis: Avoid cache incoherency in test for interrupts Lino Sanfilippo
2022-10-17 23:57 ` [PATCH v8 02/11] tpm, tpm_tis: Claim locality before writing TPM_INT_ENABLE register Lino Sanfilippo
2022-10-17 23:57 ` [PATCH v8 03/11] tpm, tpm_tis: Disable interrupts if tpm_tis_probe_irq() failed Lino Sanfilippo
2022-10-17 23:57 ` Lino Sanfilippo [this message]
2022-10-17 23:57 ` [PATCH v8 05/11] tpm, tpm_tis: Only handle supported interrupts Lino Sanfilippo
2022-10-17 23:57 ` [PATCH v8 06/11] tpm, tpm_tis: Move interrupt mask checks into own function Lino Sanfilippo
2022-10-17 23:57 ` [PATCH v8 07/11] tpm, tpm_tis: do not check for the active locality in interrupt handler Lino Sanfilippo
2022-10-23  4:32   ` Jarkko Sakkinen
2022-10-17 23:57 ` [PATCH v8 08/11] tpm, tpm: Implement usage counter for locality Lino Sanfilippo
2022-10-18  6:25   ` Lukas Wunner
2022-10-18  7:42     ` Lino Sanfilippo
2022-10-23  5:26     ` Jarkko Sakkinen
2022-10-25  0:25       ` Lino Sanfilippo
2022-11-01  1:06         ` Jarkko Sakkinen
2022-10-23  4:40   ` Jarkko Sakkinen
2022-10-25  0:15     ` Lino Sanfilippo
2022-11-01  1:06       ` Jarkko Sakkinen
2022-11-04 16:18         ` Lino Sanfilippo
2022-11-07 16:03           ` Jarkko Sakkinen
2022-10-17 23:57 ` [PATCH v8 09/11] tpm, tpm_tis: Request threaded interrupt handler Lino Sanfilippo
2022-10-17 23:57 ` [PATCH v8 10/11] tpm, tpm_tis: Claim locality in " Lino Sanfilippo
2022-10-17 23:57 ` [PATCH v8 11/11] tpm, tpm_tis: Enable interrupt test Lino Sanfilippo
2022-10-23  4:33   ` Jarkko Sakkinen
2022-10-23  4:34   ` Jarkko Sakkinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221017235732.10145-5-LinoSanfilippo@gmx.de \
    --to=linosanfilippo@gmx.de \
    --cc=jandryuk@gmail.com \
    --cc=jarkko@kernel.org \
    --cc=jgg@ziepe.ca \
    --cc=l.sanfilippo@kunbus.com \
    --cc=linux-integrity@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@mniewoehner.de \
    --cc=lukas@wunner.de \
    --cc=p.rosenberger@kunbus.com \
    --cc=peterhuewe@gmx.de \
    --cc=pmenzel@molgen.mpg.de \
    --cc=stefanb@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).