| Message ID | 20200228030330.18081-4-stefanb@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Enable vTPM 2.0 for the IBM vTPM driver | expand |
On Thu, Feb 27, 2020 at 10:03:30PM -0500, Stefan Berger wrote: > 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. I'd prefer "TPM2" over "TPM 2". > In case a TPM 2 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. A TPM2 what? TPM2 is not a thing. > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> > --- > 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(-) > > diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h > index 5620747da0cf..ad55c9824338 100644 > --- a/drivers/char/tpm/tpm.h > +++ b/drivers/char/tpm/tpm.h > @@ -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); > diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c > index 13696deceae8..b6a0ee6bb03a 100644 > --- a/drivers/char/tpm/tpm2-cmd.c > +++ b/drivers/char/tpm/tpm2-cmd.c > @@ -613,7 +613,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; > diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c > index eee566eddb35..676a65148f82 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,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)) { > -- > 2.23.0 > The code change looks fine. /Jarkko
On 3/2/20 6:15 AM, Jarkko Sakkinen wrote: > On Thu, Feb 27, 2020 at 10:03:30PM -0500, Stefan Berger wrote: >> 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. > I'd prefer "TPM2" over "TPM 2". Fixed. > >> In case a TPM 2 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. > A TPM2 what? TPM2 is not a thing. I don't know what you mean? Is it the word 'found' and it should be 'present' ? Otherwise a TPM2 is a 'thing' / object / device, at least to me. Stefan
On Mon, Mar 02, 2020 at 11:21:27AM -0500, Stefan Berger wrote: > On 3/2/20 6:15 AM, Jarkko Sakkinen wrote: > > On Thu, Feb 27, 2020 at 10:03:30PM -0500, Stefan Berger wrote: > > > 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. > > I'd prefer "TPM2" over "TPM 2". > Fixed. > > > > > In case a TPM 2 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. > > A TPM2 what? TPM2 is not a thing. > > > I don't know what you mean? Is it the word 'found' and it should be > 'present' ? Otherwise a TPM2 is a 'thing' / object / device, at least to me. TPM2 chip would be better. TPM2 can refer either to the protocol or to a chip. /Jarkko
On 3/3/20 3:11 PM, Jarkko Sakkinen wrote: > On Mon, Mar 02, 2020 at 11:21:27AM -0500, Stefan Berger wrote: >> On 3/2/20 6:15 AM, Jarkko Sakkinen wrote: >>> On Thu, Feb 27, 2020 at 10:03:30PM -0500, Stefan Berger wrote: >>>> 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. >>> I'd prefer "TPM2" over "TPM 2". >> Fixed. >>>> In case a TPM 2 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. >>> A TPM2 what? TPM2 is not a thing. >> >> I don't know what you mean? Is it the word 'found' and it should be >> 'present' ? Otherwise a TPM2 is a 'thing' / object / device, at least to me. > TPM2 chip would be better. TPM2 can refer either to the protocol or to a > chip. Let's call it 'device', which in this case is a virtual device rather than a 'virtual chip.' Stefan > > /Jarkko
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 5620747da0cf..ad55c9824338 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -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); diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index 13696deceae8..b6a0ee6bb03a 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -613,7 +613,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; diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c index eee566eddb35..676a65148f82 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,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)) {