Enable vTPM 2.0 for the IBM vTPM driver
Subsystems (3)
v7 cover Enable vTPM 2.0 for the IBM vTPM driver
From: Stefan Berger <[email protected]>
QEMU 5.0 will support the PAPR vTPM device model for TPM 1.2 and TPM 2.0. This series of patches enables vTPM 2.0 support for the IBM vTPM driver.
Regards,
Stefan
- v6->v7:
- reverted changes in 1/3 due to xtensa not supporting API call; removed Jarrko's Acked-by
- Added Nayna's Acked-by adn Tested-by to all patches
- v5->v6:
- Nits in commit texts
- v4->v5:
- Added error path in case tpm2_get_cc_attrs_tbl() fails
- v3->v4:
- Dropped patch 3; getting command code attributes table in IBM driver
- v2->v3:
- Added fixes tag to patch 2/4; the race seems to have existed since the driver was first added
- Renamed tpm2_init to tpm2_init_commands in 3/4
- v1->v2:
- Addressed comments to v1; added patch 3 to handle case when TPM_OPS_AUTO_STARTUP is not set
Stefan Berger (3):
tpm: of: Handle IBM,vtpm20 case when getting log parameters
tpm: ibmvtpm: Wait for buffer to be set before proceeding
tpm: ibmvtpm: Add support for TPM2
drivers/char/tpm/eventlog/of.c | 3 ++- drivers/char/tpm/tpm.h | 1 + drivers/char/tpm/tpm2-cmd.c | 2 +- drivers/char/tpm/tpm_ibmvtpm.c | 17 +++++++++++++++++ drivers/char/tpm/tpm_ibmvtpm.h | 1 + 5 files changed, 22 insertions(+), 2 deletions(-)
Signature · 1 line
2.23.0
PATCH v7 1/3 tpm: of: Handle IBM,vtpm20 case when getting log parameters
From: Stefan Berger <[email protected]>
A vTPM 2.0 is identified by 'IBM,vtpm20' in the 'compatible' node in the device tree. Handle it in the same way as 'IBM,vtpm'.
The vTPM 2.0's log is written in little endian format so that for this aspect we can rely on existing code.
--- drivers/char/tpm/eventlog/of.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/char/tpm/eventlog/of.c +2 -1
@@ -51,7 +51,8 @@ int tpm_read_log_of(struct tpm_chip *chip)* endian format. For this reason, vtpm doesn't need conversion * but physical tpm needs the conversion. */ -if (of_property_match_string (np,"compatible" ,"IBM,vtpm" ) <0 ) { +if (of_property_match_string (np,"compatible" ,"IBM,vtpm" ) <0 && +of_property_match_string (np,"compatible" ,"IBM,vtpm20" ) <0 ) { size =be32_to_cpup ((__force __be32 *)sizep); base =be64_to_cpup ((__force __be64 *)basep); }else {
Signature · 1 line
2.23.0
Re: [PATCH v7 1/3] tpm: of: Handle IBM,vtpm20 case when getting log parameters
Quoted 32 lines · Stefan Berger
From: Stefan Berger <[email protected]>
A vTPM 2.0 is identified by 'IBM,vtpm20' in the 'compatible' node in the device tree. Handle it in the same way as 'IBM,vtpm'.
The vTPM 2.0's log is written in little endian format so that for this aspect we can rely on existing code.
Signed-off-by Stefan Berger <[email protected]>Acked-by Nayna Jain <[email protected]>Tested-by Nayna Jain <[email protected]>--- drivers/char/tpm/eventlog/of.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/char/tpm/eventlog/of.c +2
-1@@ -51,7 +51,8 @@ int tpm_read_log_of(struct tpm_chip *chip)* endian format. For this reason, vtpm doesn't need conversion * but physical tpm needs the conversion. */ -if (of_property_match_string (np,"compatible" ,"IBM,vtpm" ) <0 ) { +if (of_property_match_string (np,"compatible" ,"IBM,vtpm" ) <0 && +of_property_match_string (np,"compatible" ,"IBM,vtpm20" ) <0 ) { size =be32_to_cpup ((__force __be32 *)sizep); base =be64_to_cpup ((__force __be64 *)basep); }else {Signature · 1 line
2.23.0
/Jarkko
PATCH v7 2/3 tpm: ibmvtpm: Wait for buffer to be set before proceeding
In reply to Stefan BergerFrom: Stefan Berger <[email protected]>
Synchronize with the results from the CRQs before continuing with the initialization. This avoids trying to send TPM commands while the rtce buffer has not been allocated, yet.
This patch fixes an existing race condition that may occurr if the hypervisor does not quickly respond to the VTPM_GET_RTCE_BUFFER_SIZE request sent during initialization and therefore the ibmvtpm->rtce_buf has not been allocated at the time the first TPM command is sent.
--- drivers/char/tpm/tpm_ibmvtpm.c | 9 +++++++++ drivers/char/tpm/tpm_ibmvtpm.h | 1 + 2 files changed, 10 insertions(+)
drivers/char/tpm/tpm_ibmvtpm.c +9 -0
@@ -571,6 +571,7 @@ static irqreturn_t ibmvtpm_interrupt(int irq, void *vtpm_instance)*/ while ((crq =ibmvtpm_crq_get_next (ibmvtpm)) !=NULL ) {ibmvtpm_crq_process (crq, ibmvtpm); +wake_up_interruptible (&ibmvtpm->crq_queue.wq); crq->valid =0 ;smp_wmb (); }
@@ -618,6 +619,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev, } crq_q->num_entry =CRQ_RES_BUF_SIZE /sizeof (*crq_q->crq_addr); +init_waitqueue_head (&crq_q->wq); ibmvtpm->crq_dma_handle =dma_map_single (dev, crq_q->crq_addr,CRQ_RES_BUF_SIZE ,DMA_BIDIRECTIONAL );
@@ -670,6 +672,13 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,if (rc) goto init_irq_cleanup; +if (!wait_event_timeout (ibmvtpm->crq_queue.wq, + ibmvtpm->rtce_buf !=NULL , +HZ )) { +dev_err (dev,"CRQ response timed out\n" ); + goto init_irq_cleanup; + } +return tpm_chip_register (chip); init_irq_cleanup: do {
drivers/char/tpm/tpm_ibmvtpm.h +1 -0
@@ -26,6 +26,7 @@ struct ibmvtpm_crq_queue {struct ibmvtpm_crq *crq_addr;u32 index;u32 num_entry; +wait_queue_head_t wq; };struct ibmvtpm_dev {
Signature · 1 line
2.23.0
Re: [PATCH v7 2/3] tpm: ibmvtpm: Wait for buffer to be set before proceeding
Quoted 69 lines · Stefan Berger
From: Stefan Berger <[email protected]>
Synchronize with the results from the CRQs before continuing with the initialization. This avoids trying to send TPM commands while the rtce buffer has not been allocated, yet.
This patch fixes an existing race condition that may occurr if the hypervisor does not quickly respond to the
VTPM_GET_RTCE_BUFFER_SIZErequest sent during initialization and therefore theibmvtpm->rtce_bufhas not been allocated at the time the first TPM command is sent.Fixes 132f76294744 ("Add new device driver to support IBM vTPM")Signed-off-by Stefan Berger <[email protected]>Acked-by Nayna Jain <[email protected]>Tested-by Nayna Jain <[email protected]>--- drivers/char/tpm/tpm_ibmvtpm.c | 9 +++++++++ drivers/char/tpm/tpm_ibmvtpm.h | 1 + 2 files changed, 10 insertions(+)drivers/char/tpm/tpm_ibmvtpm.c +9
-0@@ -571,6 +571,7 @@ static irqreturn_t ibmvtpm_interrupt(int irq, void *vtpm_instance)*/ while ((crq =ibmvtpm_crq_get_next (ibmvtpm)) !=NULL ) {ibmvtpm_crq_process (crq, ibmvtpm); +wake_up_interruptible (&ibmvtpm->crq_queue.wq); crq->valid =0 ;smp_wmb (); }@@ -618,6 +619,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev, } crq_q->num_entry =CRQ_RES_BUF_SIZE /sizeof (*crq_q->crq_addr); +init_waitqueue_head (&crq_q->wq); ibmvtpm->crq_dma_handle =dma_map_single (dev, crq_q->crq_addr,CRQ_RES_BUF_SIZE ,DMA_BIDIRECTIONAL );@@ -670,6 +672,13 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,if (rc) goto init_irq_cleanup; +if (!wait_event_timeout (ibmvtpm->crq_queue.wq, + ibmvtpm->rtce_buf !=NULL , +HZ )) { +dev_err (dev,"CRQ response timed out\n" ); + goto init_irq_cleanup; + } +return tpm_chip_register (chip); init_irq_cleanup: do {drivers/char/tpm/tpm_ibmvtpm.h +1
-0@@ -26,6 +26,7 @@ struct ibmvtpm_crq_queue {struct ibmvtpm_crq *crq_addr;u32 index;u32 num_entry; +wait_queue_head_t wq; };struct ibmvtpm_dev {Signature · 1 line
2.23.0
/Jarkko
PATCH v7 3/3 tpm: ibmvtpm: Add support for TPM2
In reply to Stefan BergerFrom: Stefan Berger <[email protected]>
Support TPM2 in the IBM vTPM driver. The hypervisor tells us what version of TPM is connected through the vio_device_id.
In case a TPM2 device is found, we set the TPM_CHIP_FLAG_TPM2 flag and get the command codes attributes table. The driver does not need the timeouts and durations, though.
--- drivers/char/tpm/tpm.h | 1 + drivers/char/tpm/tpm2-cmd.c | 2 +- drivers/char/tpm/tpm_ibmvtpm.c | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-)
drivers/char/tpm/tpm.h +1 -0
@@ -226,6 +226,7 @@ int tpm2_auto_startup(struct tpm_chip *chip);void tpm2_shutdown (struct tpm_chip *chip,u16 shutdown_type);unsigned long tpm2_calc_ordinal_duration (struct tpm_chip *chip,u32 ordinal);int tpm2_probe (struct tpm_chip *chip); +int tpm2_get_cc_attrs_tbl (struct tpm_chip *chip);int tpm2_find_cc (struct tpm_chip *chip,u32 cc);int tpm2_init_space (struct tpm_space *space);void tpm2_del_space (struct tpm_chip *chip,struct tpm_space *space);
drivers/char/tpm/tpm2-cmd.c +1 -1
@@ -615,7 +615,7 @@ ssize_t tpm2_get_pcr_allocation(struct tpm_chip *chip)return rc; } -static int tpm2_get_cc_attrs_tbl (struct tpm_chip *chip) +int tpm2_get_cc_attrs_tbl (struct tpm_chip *chip) {struct tpm_buf buf;u32 nr_commands;
drivers/char/tpm/tpm_ibmvtpm.c +8 -0
@@ -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,13 @@ 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 ; + rc =tpm2_get_cc_attrs_tbl (chip); +if (rc) + goto init_irq_cleanup; + } +if (!wait_event_timeout (ibmvtpm->crq_queue.wq, ibmvtpm->rtce_buf !=NULL ,HZ )) {
Signature · 1 line
2.23.0
Re: [PATCH v7 3/3] tpm: ibmvtpm: Add support for TPM2
Quoted 72 lines · Stefan Berger
From: Stefan Berger <[email protected]>
Support TPM2 in the IBM vTPM driver. The hypervisor tells us what version of TPM is connected through the
vio_device_id.In case a TPM2 device is found, we set the
TPM_CHIP_FLAG_TPM2flag and get the command codes attributes table. The driver does not need the timeouts and durations, though.Signed-off-by Stefan Berger <[email protected]>Acked-by Nayna Jain <[email protected]>Tested-by Nayna Jain <[email protected]>--- drivers/char/tpm/tpm.h | 1 + drivers/char/tpm/tpm2-cmd.c | 2 +- drivers/char/tpm/tpm_ibmvtpm.c | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-)drivers/char/tpm/tpm.h +1
-0@@ -226,6 +226,7 @@ int tpm2_auto_startup(struct tpm_chip *chip);void tpm2_shutdown (struct tpm_chip *chip,u16 shutdown_type);unsigned long tpm2_calc_ordinal_duration (struct tpm_chip *chip,u32 ordinal);int tpm2_probe (struct tpm_chip *chip); +int tpm2_get_cc_attrs_tbl (struct tpm_chip *chip);int tpm2_find_cc (struct tpm_chip *chip,u32 cc);int tpm2_init_space (struct tpm_space *space);void tpm2_del_space (struct tpm_chip *chip,struct tpm_space *space);drivers/char/tpm/tpm2-cmd.c +1
-1@@ -615,7 +615,7 @@ ssize_t tpm2_get_pcr_allocation(struct tpm_chip *chip)return rc; } -static int tpm2_get_cc_attrs_tbl (struct tpm_chip *chip) +int tpm2_get_cc_attrs_tbl (struct tpm_chip *chip) {struct tpm_buf buf;u32 nr_commands;drivers/char/tpm/tpm_ibmvtpm.c +8
-0@@ -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,13 @@ 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 ; + rc =tpm2_get_cc_attrs_tbl (chip); +if (rc) + goto init_irq_cleanup; + } +if (!wait_event_timeout (ibmvtpm->crq_queue.wq, ibmvtpm->rtce_buf !=NULL ,HZ )) {Signature · 1 line
2.23.0
/Jarkko