From: Nayna Jain <nayna-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
To: tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-security-module-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH v5 2/3] tpm: enhance read_log_of() to support Physical TPM event log
Date: Wed, 23 Nov 2016 12:27:36 -0500 [thread overview]
Message-ID: <1479922057-8752-3-git-send-email-nayna@linux.vnet.ibm.com> (raw)
In-Reply-To: <1479922057-8752-1-git-send-email-nayna-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
Physical TPMs use Open Firmware Device Tree bindings that are similar
to the IBM Power virtual TPM to support event log. However, these
properties store the values in different endianness for Physical
and Virtual TPM.
This patch fixes the endianness issue by doing appropriate conversion
based on Physical or Virtual TPM.
Signed-off-by: Nayna Jain <nayna-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
---
drivers/char/tpm/tpm_of.c | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
index 7dee42d7..646aec1 100644
--- a/drivers/char/tpm/tpm_of.c
+++ b/drivers/char/tpm/tpm_of.c
@@ -27,6 +27,7 @@ int tpm_read_log_of(struct tpm_chip *chip)
const u32 *sizep;
const u64 *basep;
struct tpm_bios_log *log;
+ u32 log_size;
log = &chip->log;
if (chip->dev.parent && chip->dev.parent->of_node)
@@ -34,25 +35,43 @@ int tpm_read_log_of(struct tpm_chip *chip)
else
return -ENODEV;
+ /*
+ * For both vtpm/tpm, firmware has log addr and log size in big
+ * endian format. But in case of vtpm, there is a method called
+ * sml-handover which is run during kernel init even before
+ * device tree is setup. This sml-handover function takes care
+ * of endianness and writes to sml-base and sml-size in little
+ * endian format. For this reason, vtpm doesn't need conversion
+ * but physical tpm needs the conversion.
+ */
sizep = of_get_property(np, "linux,sml-size", NULL);
+ if (of_property_match_string(np, "compatible", "IBM,vtpm") < 0)
+ log_size = be32_to_cpup(sizep);
+ else
+ log_size = *sizep;
+
basep = of_get_property(np, "linux,sml-base", NULL);
if (sizep == NULL && basep == NULL)
return -ENODEV;
if (sizep == NULL || basep == NULL)
return -EIO;
- if (*sizep == 0) {
+ if (log_size == 0) {
dev_warn(&chip->dev, "%s: Event log area empty\n", __func__);
return -EIO;
}
- log->bios_event_log = kmalloc(*sizep, GFP_KERNEL);
+ log->bios_event_log = kmalloc(log_size, GFP_KERNEL);
if (!log->bios_event_log)
return -ENOMEM;
- log->bios_event_log_end = log->bios_event_log + *sizep;
+ log->bios_event_log_end = log->bios_event_log + log_size;
- memcpy(log->bios_event_log, __va(*basep), *sizep);
+ if (of_property_match_string(np, "compatible", "IBM,vtpm") < 0)
+ memcpy(chip->log.bios_event_log, __va(be64_to_cpup(basep)),
+ log_size);
+ else
+ memcpy(chip->log.bios_event_log, __va(*basep), log_size);
return 0;
}
--
2.5.0
------------------------------------------------------------------------------
next prev parent reply other threads:[~2016-11-23 17:27 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-23 17:27 [PATCH v5 0/3] tpm: securityfs support for TPM 2.0 firmware event log Nayna Jain
2016-11-23 17:27 ` [PATCH v5 1/3] tpm: move event log init functions to tpm_eventlog_init.c Nayna Jain
[not found] ` <1479922057-8752-2-git-send-email-nayna-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2016-11-23 19:38 ` Jason Gunthorpe
[not found] ` <20161123193830.GB13927-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2016-11-24 8:01 ` Nayna
[not found] ` <58369E3F.40509-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2016-11-24 16:43 ` Jason Gunthorpe
2016-11-24 16:50 ` Nayna
2016-11-24 21:01 ` Jarkko Sakkinen
[not found] ` <20161124210105.ykmbednlmae52tla-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2016-11-25 19:43 ` Jason Gunthorpe
[not found] ` <1479922057-8752-1-git-send-email-nayna-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2016-11-23 17:27 ` Nayna Jain [this message]
[not found] ` <1479922057-8752-3-git-send-email-nayna-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2016-11-23 19:37 ` [PATCH v5 2/3] tpm: enhance read_log_of() to support Physical TPM event log Jason Gunthorpe
2016-11-24 7:53 ` Nayna
2016-11-24 21:06 ` Jarkko Sakkinen
2016-11-23 17:27 ` [PATCH v5 3/3] tpm: add securityfs support for TPM 2.0 firmware " Nayna Jain
[not found] ` <1479922057-8752-4-git-send-email-nayna-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2016-11-24 21:10 ` Jarkko Sakkinen
2016-11-25 2:51 ` [tpmdd-devel] " Stefan Berger
2016-11-25 8:11 ` Jarkko Sakkinen
[not found] ` <11f97863-aa40-a9aa-836f-4b446faf1ed3-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2016-11-26 15:24 ` Jarkko Sakkinen
[not found] ` <20161124211057.xynmfteky5r7uc27-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2016-11-25 19:43 ` Jason Gunthorpe
2016-11-26 12:59 ` 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=1479922057-8752-3-git-send-email-nayna@linux.vnet.ibm.com \
--to=nayna-23vcf4htsmix0ybbhkvfkdbpr1lh4cv8@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-security-module-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
/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).