From: Stefan Berger <stefanb@linux.vnet.ibm.com> To: 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 v2 4/4] tpm: ibmvtpm: Add support for TPM 2 Date: Thu, 13 Feb 2020 15:23:29 -0500 Message-ID: <20200213202329.898607-5-stefanb@linux.vnet.ibm.com> (raw) In-Reply-To: <20200213202329.898607-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_OPS_AUTO_STARTUP flag to have properly initialize the TPM and driver. Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> --- drivers/char/tpm/tpm_ibmvtpm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c index eee566eddb35..25cd256c7c3d 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); @@ -443,7 +444,7 @@ static bool tpm_ibmvtpm_req_canceled(struct tpm_chip *chip, u8 status) return (status == 0); } -static const struct tpm_class_ops tpm_ibmvtpm = { +const static struct tpm_class_ops tpm_ibmvtpm = { .recv = tpm_ibmvtpm_recv, .send = tpm_ibmvtpm_send, .cancel = tpm_ibmvtpm_cancel, @@ -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 index Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-13 20:23 [PATCH v2 0/4] Enable vTPM 2.0 for the IBM vTPM driver Stefan Berger 2020-02-13 20:23 ` [PATCH v2 1/4] tpm: of: Handle IBM,vtpm20 case when getting log parameters Stefan Berger 2020-02-25 16:54 ` Jarkko Sakkinen 2020-02-13 20:23 ` [PATCH v2 2/4] tpm: ibmvtpm: Wait for buffer to be set before proceeding Stefan Berger 2020-02-25 16:57 ` Jarkko Sakkinen 2020-02-25 18:14 ` Stefan Berger 2020-02-26 15:00 ` Jarkko Sakkinen 2020-02-13 20:23 ` [PATCH v2 3/4] tpm: Implement tpm2_init to call when TPM_OPS_AUTO_STARTUP is not set Stefan Berger 2020-02-25 17:00 ` Jarkko Sakkinen 2020-02-25 18:20 ` Stefan Berger 2020-02-26 15:02 ` Jarkko Sakkinen 2020-02-26 17:35 ` Stefan Berger 2020-02-13 20:23 ` Stefan Berger [this message] 2020-02-19 19:23 ` [PATCH v2 0/4] Enable vTPM 2.0 for the IBM vTPM driver Stefan Berger 2020-02-20 19:59 ` Jarkko Sakkinen 2020-02-20 20:00 ` 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=20200213202329.898607-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=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
Linux-Integrity Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-integrity/0 linux-integrity/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-integrity linux-integrity/ https://lore.kernel.org/linux-integrity \ linux-integrity@vger.kernel.org public-inbox-index linux-integrity Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-integrity AGPL code for this site: git clone https://public-inbox.org/public-inbox.git