From: Stefan Berger <stefanb@linux.vnet.ibm.com>
To: jarkko.sakkinen@linux.intel.com, linux-integrity@vger.kernel.org
Cc: aik@ozlabs.ru, david@gibson.dropbear.id.au,
linux-kernel@vger.kernel.org, nayna@linux.vnet.ibm.com,
gcwilson@linux.ibm.com, jgg@ziepe.ca,
Stefan Berger <stefanb@linux.ibm.com>
Subject: [PATCH v3 4/4] tpm: ibmvtpm: Add support for TPM 2
Date: Wed, 26 Feb 2020 19:26:54 -0500 [thread overview]
Message-ID: <20200227002654.7536-5-stefanb@linux.vnet.ibm.com> (raw)
In-Reply-To: <20200227002654.7536-1-stefanb@linux.vnet.ibm.com>
From: Stefan Berger <stefanb@linux.ibm.com>
Support TPM 2 in the IBM vTPM driver. The hypervisor tells us what
version of TPM is connected through the vio_device_id.
In case a TPM 2 is found, we set the TPM_CHIP_FLAG_TPM2 flag.
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
drivers/char/tpm/tpm_ibmvtpm.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
index eee566eddb35..0df815f9a6c5 100644
--- a/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/drivers/char/tpm/tpm_ibmvtpm.c
@@ -29,6 +29,7 @@ static const char tpm_ibmvtpm_driver_name[] = "tpm_ibmvtpm";
static const struct vio_device_id tpm_ibmvtpm_device_table[] = {
{ "IBM,vtpm", "IBM,vtpm"},
+ { "IBM,vtpm", "IBM,vtpm20"},
{ "", "" }
};
MODULE_DEVICE_TABLE(vio, tpm_ibmvtpm_device_table);
@@ -672,6 +673,9 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
if (rc)
goto init_irq_cleanup;
+ if (!strcmp(id->compat, "IBM,vtpm20"))
+ chip->flags |= TPM_CHIP_FLAG_TPM2;
+
if (!wait_event_timeout(ibmvtpm->crq_queue.wq,
ibmvtpm->rtce_buf != NULL,
HZ)) {
--
2.23.0
next prev parent reply other threads:[~2020-02-27 0:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-27 0:26 [PATCH v3 0/4] Enable vTPM 2.0 for the IBM vTPM driver Stefan Berger
2020-02-27 0:26 ` [PATCH v3 1/4] tpm: of: Handle IBM,vtpm20 case when getting log parameters Stefan Berger
2020-02-27 0:26 ` [PATCH v3 2/4] tpm: ibmvtpm: Wait for buffer to be set before proceeding Stefan Berger
2020-02-27 16:00 ` Jarkko Sakkinen
2020-02-27 0:26 ` [PATCH v3 3/4] tpm: Implement tpm2_init_commands to use in non-auto startup case Stefan Berger
2020-02-27 16:02 ` Jarkko Sakkinen
2020-02-27 0:26 ` Stefan Berger [this message]
2020-02-27 16:04 ` [PATCH v3 4/4] tpm: ibmvtpm: Add support for TPM 2 Jarkko Sakkinen
-- strict thread matches above, loose matches on Subject: below --
2020-02-25 20:53 [PATCH v3 0/4] Enable vTPM 2.0 for the IBM vTPM driver Stefan Berger
2020-02-25 20:53 ` [PATCH v3 4/4] tpm: ibmvtpm: Add support for TPM 2 Stefan Berger
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=20200227002654.7536-5-stefanb@linux.vnet.ibm.com \
--to=stefanb@linux.vnet.ibm.com \
--cc=aik@ozlabs.ru \
--cc=david@gibson.dropbear.id.au \
--cc=gcwilson@linux.ibm.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jgg@ziepe.ca \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nayna@linux.vnet.ibm.com \
--cc=stefanb@linux.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).