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>,
Nayna Jain <nayna@linux.ibm.com>
Subject: [PATCH v7 1/3] tpm: of: Handle IBM,vtpm20 case when getting log parameters
Date: Thu, 12 Mar 2020 11:53:30 -0400 [thread overview]
Message-ID: <20200312155332.671464-2-stefanb@linux.vnet.ibm.com> (raw)
In-Reply-To: <20200312155332.671464-1-stefanb@linux.vnet.ibm.com>
From: Stefan Berger <stefanb@linux.ibm.com>
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>
---
drivers/char/tpm/eventlog/of.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 {
--
2.23.0
next prev parent reply other threads:[~2020-03-12 15:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 15:53 [PATCH v7 0/3] Enable vTPM 2.0 for the IBM vTPM driver Stefan Berger
2020-03-12 15:53 ` Stefan Berger [this message]
2020-03-13 15:18 ` [PATCH v7 1/3] tpm: of: Handle IBM,vtpm20 case when getting log parameters Jarkko Sakkinen
2020-03-12 15:53 ` [PATCH v7 2/3] tpm: ibmvtpm: Wait for buffer to be set before proceeding Stefan Berger
2020-03-13 15:29 ` Jarkko Sakkinen
2020-03-12 15:53 ` [PATCH v7 3/3] tpm: ibmvtpm: Add support for TPM2 Stefan Berger
2020-03-13 15:30 ` 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=20200312155332.671464-2-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.ibm.com \
--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).