diff options
| author |   Stefan Berger <stefanb@linux.ibm.com> | 2020-03-12 11:53:30 -0400 |
|---|---|---|
| committer |   Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2020-03-13 17:31:26 +0200 |
| commit | 5cb2ace90deb6df9c90172f904fb4a12ee4d443a (patch) | |
| tree | ac1cb8fedb858c4b9181c90ef97ddc6cfc1ef07c /drivers/char | |
| parent | MAINTAINERS: adjust to trusted keys subsystem creation (diff) | |
| download | wireguard-linux-5cb2ace90deb6df9c90172f904fb4a12ee4d443a.tar.xz wireguard-linux-5cb2ace90deb6df9c90172f904fb4a12ee4d443a.zip | |
tpm: of: Handle IBM,vtpm20 case when getting log parameters
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 <stefanb@linux.ibm.com>
Acked-by: Nayna Jain <nayna@linux.ibm.com>
Tested-by: Nayna Jain <nayna@linux.ibm.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/eventlog/of.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/tpm/eventlog/of.c b/drivers/char/tpm/eventlog/of.c index af347c190819..a9ce66d09a75 100644 --- a/drivers/char/tpm/eventlog/of.c +++ b/drivers/char/tpm/eventlog/of.c @@ -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 { |