All of lore.kernel.org
 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 v11 12/14] tpm, tpm_tis: Claim locality when interrupts are reenabled on resume
Date: Thu, 24 Nov 2022 14:55:36 +0100	[thread overview]
Message-ID: <20221124135538.31020-13-LinoSanfilippo@gmx.de> (raw)
In-Reply-To: <20221124135538.31020-1-LinoSanfilippo@gmx.de>

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

In tpm_tis_resume() make sure that the locality has been claimed when
tpm_tis_reenable_interrupts() is called. Otherwise the writings to the
register might not have any effect.

Fixes: 45baa1d1fa39 ("tpm_tis: Re-enable interrupts upon (S3) resume")
Signed-off-by: Lino Sanfilippo <l.sanfilippo@kunbus.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
---
 drivers/char/tpm/tpm_tis_core.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index eda3b122e540..ddaf362e62c1 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -1221,28 +1221,27 @@ int tpm_tis_resume(struct device *dev)
 	struct tpm_chip *chip = dev_get_drvdata(dev);
 	int ret;
 
+	ret = tpm_tis_request_locality(chip, 0);
+	if (ret < 0)
+		return ret;
+
 	if (chip->flags & TPM_CHIP_FLAG_IRQ)
 		tpm_tis_reenable_interrupts(chip);
 
 	ret = tpm_pm_resume(dev);
 	if (ret)
-		return ret;
+		goto out;
 
 	/*
 	 * TPM 1.2 requires self-test on resume. This function actually returns
 	 * an error code but for unknown reason it isn't handled.
 	 */
-	if (!(chip->flags & TPM_CHIP_FLAG_TPM2)) {
-		ret = tpm_tis_request_locality(chip, 0);
-		if (ret < 0)
-			return ret;
-
+	if (!(chip->flags & TPM_CHIP_FLAG_TPM2))
 		tpm1_do_selftest(chip);
+out:
+	tpm_tis_relinquish_locality(chip, 0);
 
-		tpm_tis_relinquish_locality(chip, 0);
-	}
-
-	return 0;
+	return ret;
 }
 EXPORT_SYMBOL_GPL(tpm_tis_resume);
 #endif
-- 
2.36.1


  parent reply	other threads:[~2022-11-24 13:56 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-24 13:55 [PATCH v11 00/14] TPM IRQ fixes Lino Sanfilippo
2022-11-24 13:55 ` [PATCH v11 01/14] tpm, tpm_tis: Avoid cache incoherency in test for interrupts Lino Sanfilippo
2022-11-24 13:55 ` [PATCH v11 02/14] tpm, tpm_tis: Claim locality before writing TPM_INT_ENABLE register Lino Sanfilippo
2022-11-24 13:55 ` [PATCH v11 03/14] tpm, tpm_tis: Disable interrupts if tpm_tis_probe_irq() failed Lino Sanfilippo
2022-11-24 13:55 ` [PATCH v11 04/14] tpm, tpm_tis: Do not skip reset of original interrupt vector Lino Sanfilippo
2022-11-28  1:26   ` Jarkko Sakkinen
2022-11-24 13:55 ` [PATCH v11 05/14] tpm, tpm_tis: Claim locality before writing interrupt registers Lino Sanfilippo
2022-11-24 15:21   ` kernel test robot
2022-11-24 13:55 ` [PATCH v11 06/14] tpm, tpm_tis: Only handle supported interrupts Lino Sanfilippo
2022-11-24 13:55 ` [PATCH v11 07/14] tpm, tpm_tis: Move interrupt mask checks into own function Lino Sanfilippo
2022-11-24 13:55 ` [PATCH v11 08/14] tpm, tpm_tis: do not check for the active locality in interrupt handler Lino Sanfilippo
2022-11-24 13:55 ` [PATCH v11 09/14] tpm, tpm: Implement usage counter for locality Lino Sanfilippo
2022-11-28  1:28   ` Jarkko Sakkinen
2022-11-24 13:55 ` [PATCH v11 10/14] tpm, tpm_tis: Request threaded interrupt handler Lino Sanfilippo
2022-11-24 13:55 ` [PATCH v11 11/14] tpm, tpm_tis: Claim locality in " Lino Sanfilippo
2022-11-24 13:55 ` Lino Sanfilippo [this message]
2022-11-24 13:55 ` [PATCH v11 13/14] tpm, tpm_tis: startup chip before testing for interrupts Lino Sanfilippo
2022-11-28 12:53   ` Lino Sanfilippo
2022-12-04 17:02     ` Jarkko Sakkinen
2022-12-04 17:01   ` Jarkko Sakkinen
2022-11-24 13:55 ` [PATCH v11 14/14] tpm, tpm_tis: Enable interrupt test Lino Sanfilippo
2023-02-24 14:48 ` [PATCH v11 00/14] TPM IRQ fixes Lino Sanfilippo
2023-03-16 17:18   ` Michael Niewöhner
2023-03-19 13:53     ` Jarkko Sakkinen
2023-04-21 16:50       ` Jarkko Sakkinen
2023-04-21 19:34         ` Jarkko Sakkinen
2023-04-21 19:35           ` Jarkko Sakkinen
2023-04-22  0:59         ` Lino Sanfilippo
2023-04-23 14:15           ` Jarkko Sakkinen
2023-04-23 15:36             ` Michael Niewöhner
2023-04-23 15:40               ` Jarkko Sakkinen
2023-04-23 16:51                 ` Michael Niewöhner

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=20221124135538.31020-13-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.