From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: linux-integrity@vger.kernel.org
Cc: Jason Gunthorpe <jgg@ziepe.ca>,
Jerry Snitselaar <jsnitsel@redhat.com>,
Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
Peter Huewe <peterhuewe@gmx.de>
Subject: [PATCH v2 4/5] tpm_tis: fix IRQ probing
Date: Thu, 1 Oct 2020 11:09:24 -0700 [thread overview]
Message-ID: <20201001180925.13808-5-James.Bottomley@HansenPartnership.com> (raw)
In-Reply-To: <20201001180925.13808-1-James.Bottomley@HansenPartnership.com>
There are two problems with our current interrupt probing: firstly the
TPM_CHIP_FLAG_IRQ never gets set initially, so a check for interrupts
is never done. Fix this by setting the flag before we generate and
interrupt for probing. Secondly our IRQ setup may be ineffective on a
TPM without legacy access cycles becuase according to the TPM
Interface Specification the interrupt registers are only writeable in
the current locality, so issue a request_locality before setting up
the interrupts.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---
v2: improved description
---
drivers/char/tpm/tpm_tis_core.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 0c07da8cd680..12b657ed3a39 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -809,6 +809,19 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip,
}
priv->irq = irq;
+ /*
+ * note writes to the interrupt registers are only effective
+ * when the TPM is in the active locality, so we have to
+ * request the locality here to get the interrupt set up.
+ * This request has no corresponding release, because the
+ * locality will be relinquished at the end of the tpm command
+ * that probes the interrupts
+ */
+ if (request_locality(chip, 0) != 0) {
+ dev_err(&chip->dev, "failed to gain locality for irq probe\n");
+ return -EBUSY;
+ }
+
rc = tpm_tis_read8(priv, TPM_INT_VECTOR(priv->locality),
&original_int_vec);
if (rc < 0)
@@ -836,6 +849,7 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip,
return rc;
priv->irq_tested = false;
+ chip->flags |= TPM_CHIP_FLAG_IRQ;
/* Generate an interrupt by having the core call through to
* tpm_tis_send
--
2.28.0
next prev parent reply other threads:[~2020-10-01 18:11 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 18:09 [PATCH v2 0/5] tpm_tis: fix interrupts (again) James Bottomley
2020-10-01 18:09 ` [PATCH v2 1/5] tpm_tis: Fix check_locality for correct locality acquisition James Bottomley
2020-10-05 15:34 ` Jarkko Sakkinen
2020-10-05 19:00 ` James Bottomley
2020-10-05 20:32 ` Jarkko Sakkinen
2020-10-19 23:16 ` Jerry Snitselaar
2020-10-24 12:07 ` Jarkko Sakkinen
2020-10-30 12:13 ` Jarkko Sakkinen
2020-10-01 18:09 ` [PATCH v2 2/5] tpm_tis: Clean up locality release James Bottomley
2020-10-05 17:02 ` Jarkko Sakkinen
2020-10-05 19:05 ` James Bottomley
2020-10-05 20:34 ` Jarkko Sakkinen
2020-10-05 17:03 ` Jarkko Sakkinen
2020-10-19 23:17 ` Jerry Snitselaar
2020-10-24 12:10 ` Jarkko Sakkinen
2020-10-30 12:17 ` Jarkko Sakkinen
2020-10-30 15:47 ` James Bottomley
2020-10-30 21:52 ` Jarkko Sakkinen
2020-10-01 18:09 ` [PATCH v2 3/5] tpm_tis: Fix interrupts for TIS TPMs without legacy cycles James Bottomley
2020-10-05 17:05 ` Jarkko Sakkinen
2020-10-20 0:14 ` Jerry Snitselaar
2020-10-24 12:15 ` Jarkko Sakkinen
2020-10-30 12:18 ` Jarkko Sakkinen
2020-10-30 16:06 ` Jerry Snitselaar
2020-11-03 4:16 ` Jarkko Sakkinen
2020-12-01 18:12 ` Jerry Snitselaar
2020-12-01 19:49 ` Jerry Snitselaar
2020-12-01 21:06 ` James Bottomley
2020-12-01 21:47 ` Jerry Snitselaar
2020-10-01 18:09 ` James Bottomley [this message]
2020-10-05 17:05 ` [PATCH v2 4/5] tpm_tis: fix IRQ probing Jarkko Sakkinen
2020-10-19 23:41 ` Jerry Snitselaar
2020-10-24 12:17 ` Jarkko Sakkinen
2020-10-30 12:43 ` Jarkko Sakkinen
2020-10-30 15:49 ` James Bottomley
2020-10-30 16:11 ` Jerry Snitselaar
2020-11-03 4:43 ` Jarkko Sakkinen
2020-11-03 23:00 ` Jerry Snitselaar
2020-11-04 0:31 ` Jarkko Sakkinen
2020-11-03 4:17 ` Jarkko Sakkinen
2020-11-06 15:32 ` Jarkko Sakkinen
2020-11-06 16:21 ` James Bottomley
2020-11-06 22:07 ` Jarkko Sakkinen
2020-10-01 18:09 ` [PATCH v2 5/5] Revert "tpm: Revert "tpm_tis_core: Turn on the TPM before probing IRQ's"" James Bottomley
2020-10-19 20:23 ` Jerry Snitselaar
2020-10-19 22:54 ` James Bottomley
2020-10-19 23:40 ` Jerry Snitselaar
2020-10-12 5:39 ` [PATCH v2 0/5] tpm_tis: fix interrupts (again) Jerry Snitselaar
2020-10-13 1:23 ` Jarkko Sakkinen
2020-10-18 5:34 ` Jarkko Sakkinen
2020-10-13 1:17 ` Jarkko Sakkinen
2020-10-13 15:15 ` Jerry Snitselaar
2020-10-13 15:24 ` James Bottomley
2020-10-13 16:05 ` Jerry Snitselaar
2020-10-14 15:03 ` Hans de Goede
2020-10-14 15:23 ` James Bottomley
2020-10-14 16:04 ` Hans de Goede
2020-10-14 16:34 ` Jerry Snitselaar
2020-10-14 16:46 ` Hans de Goede
2020-10-14 17:01 ` Jerry Snitselaar
2020-10-14 17:04 ` Jerry Snitselaar
2020-10-14 20:58 ` Jerry Snitselaar
2020-10-15 7:38 ` Hans de Goede
2020-10-18 21:09 ` Jarkko Sakkinen
2020-10-15 15:36 ` James Bottomley
2020-10-15 18:48 ` Jerry Snitselaar
2020-10-15 18:57 ` James Bottomley
2020-10-15 19:16 ` Jerry Snitselaar
2020-10-14 16:49 ` James Bottomley
2020-10-18 21:05 ` Jarkko Sakkinen
2020-10-20 23:10 ` Jerry Snitselaar
2020-10-24 12:20 ` Jarkko Sakkinen
2020-10-26 18:29 ` Jerry Snitselaar
2020-10-27 17:14 ` 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=20201001180925.13808-5-James.Bottomley@HansenPartnership.com \
--to=james.bottomley@hansenpartnership.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jgg@ziepe.ca \
--cc=jsnitsel@redhat.com \
--cc=linux-integrity@vger.kernel.org \
--cc=peterhuewe@gmx.de \
/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).