From: Stefan Berger <stefanb@linux.ibm.com>
To: mpe@ellerman.id.au, linux-integrity@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org
Cc: devicetree@vger.kernel.org, rnsastry@linux.ibm.com,
jsnitsel@redhat.com, linux-kernel@vger.kernel.org,
jarkko@kernel.org, peterhuewe@gmx.de, viparash@in.ibm.com,
Stefan Berger <stefanb@linux.ibm.com>
Subject: [RFC PATCH v2 3/3] tpm: of: If available use linux,sml-log to get the log and its size
Date: Mon, 11 Mar 2024 09:20:30 -0400 [thread overview]
Message-ID: <20240311132030.1103122-4-stefanb@linux.ibm.com> (raw)
In-Reply-To: <20240311132030.1103122-1-stefanb@linux.ibm.com>
If linux,sml-log is available use it to get the TPM log rather than the
pointer found in linux,sml-base. This resolves an issue on PowerVM and KVM
on Power where after a kexec the memory pointed to by linux,sml-base may
have become inaccessible or corrupted. Also, linux,sml-log has replaced
linux,sml-base and linux,sml-size on these two platforms.
Keep the handling of linux,sml-base/sml-size for powernv platforms that
provide the two properties via skiboot.
Fixes: c5df39262dd5 ("drivers/char/tpm: Add securityfs support for event log")
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
drivers/char/tpm/eventlog/of.c | 36 +++++++++++-----------------------
1 file changed, 11 insertions(+), 25 deletions(-)
diff --git a/drivers/char/tpm/eventlog/of.c b/drivers/char/tpm/eventlog/of.c
index 930fe43d5daf..dbd837d65264 100644
--- a/drivers/char/tpm/eventlog/of.c
+++ b/drivers/char/tpm/eventlog/of.c
@@ -54,8 +54,8 @@ int tpm_read_log_of(struct tpm_chip *chip)
const u32 *sizep;
const u64 *basep;
struct tpm_bios_log *log;
+ const void *logp;
u32 size;
- u64 base;
log = &chip->log;
if (chip->dev.parent && chip->dev.parent->of_node)
@@ -66,37 +66,23 @@ int tpm_read_log_of(struct tpm_chip *chip)
if (of_property_read_bool(np, "powered-while-suspended"))
chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;
- sizep = of_get_property(np, "linux,sml-size", NULL);
- basep = of_get_property(np, "linux,sml-base", NULL);
- if (sizep == NULL && basep == NULL)
- return tpm_read_log_memory_region(chip);
- if (sizep == NULL || basep == NULL)
- return -EIO;
-
- /*
- * 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.
- */
- if (of_property_match_string(np, "compatible", "IBM,vtpm") < 0 &&
- of_property_match_string(np, "compatible", "IBM,vtpm20") < 0) {
+ logp = of_get_property(np, "linux,sml-log", &size);
+ if (logp == NULL) {
+ sizep = of_get_property(np, "linux,sml-size", NULL);
+ basep = of_get_property(np, "linux,sml-base", NULL);
+ if (sizep == NULL && basep == NULL)
+ return tpm_read_log_memory_region(chip);
+ if (sizep == NULL || basep == NULL)
+ return -EIO;
size = be32_to_cpup((__force __be32 *)sizep);
- base = be64_to_cpup((__force __be64 *)basep);
- } else {
- size = *sizep;
- base = *basep;
+ logp = __va(be64_to_cpup((__force __be64 *)basep));
}
-
if (size == 0) {
dev_warn(&chip->dev, "%s: Event log area empty\n", __func__);
return -EIO;
}
- log->bios_event_log = devm_kmemdup(&chip->dev, __va(base), size, GFP_KERNEL);
+ log->bios_event_log = devm_kmemdup(&chip->dev, logp, size, GFP_KERNEL);
if (!log->bios_event_log)
return -ENOMEM;
--
2.43.0
next prev parent reply other threads:[~2024-03-11 13:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-11 13:20 [RFC PATCH v2 0/3] Preserve TPM log across kexec Stefan Berger
2024-03-11 13:20 ` [RFC PATCH v2 1/3] powerpc/prom_init: Replace linux,sml-base/sml-size with linux,sml-log Stefan Berger
2024-03-11 17:24 ` Christophe Leroy
2024-03-11 19:10 ` Stefan Berger
2024-03-11 17:47 ` Jerry Snitselaar
2024-03-11 20:21 ` Jarkko Sakkinen
2024-03-11 13:20 ` [RFC PATCH v2 2/3] dt-bindings: tpm: Add linux,sml-log to ibm,vtpm.yaml Stefan Berger
2024-03-12 11:11 ` Lukas Wunner
2024-03-12 14:12 ` Stefan Berger
2024-03-12 15:52 ` Jarkko Sakkinen
2024-03-11 13:20 ` Stefan Berger [this message]
2024-03-11 20:25 ` [RFC PATCH v2 3/3] tpm: of: If available use linux,sml-log to get the log and its size Jarkko Sakkinen
2024-03-11 20:33 ` Stefan Berger
2024-03-12 15:43 ` Jarkko Sakkinen
2024-03-12 19:37 ` Stefan Berger
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=20240311132030.1103122-4-stefanb@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=devicetree@vger.kernel.org \
--cc=jarkko@kernel.org \
--cc=jsnitsel@redhat.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=peterhuewe@gmx.de \
--cc=rnsastry@linux.ibm.com \
--cc=viparash@in.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).