Re: [PATCH 1/3] tpm: of: Handle IBM,vtpm20 case when getting log parameters

From: Stefan Berger
Date: Wed Mar 11 2020 - 08:06:06 EST


On 2/13/20 12:46 PM, Nayna wrote:

On 2/4/20 8:27 AM, Stefan Berger wrote:
From: Stefan Berger <stefanb@xxxxxxxxxxxxx>

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@xxxxxxxxxxxxx>
---
 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) {

How about changing this to use of_device_compatible_match() ?


I have to roll back the change to using use_of_device_compatible_match() due to a build failure on xtensa. So we'll be using what I had in this patch here.


ÂÂ Stefan