From: Stefan Berger <stefanb@linux.vnet.ibm.com>
To: linux-integrity@vger.kernel.org, jarkko.sakkinen@linux.intel.com,
linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-security-module@vger.kernel.org
Cc: Stefan Berger <stefanb@linux.ibm.com>
Subject: [PATCH v2 2/3] tpm: Rearrange ACPI log code to easier extend for TPM2 case
Date: Mon, 30 Mar 2020 11:15:35 -0400 [thread overview]
Message-ID: <20200330151536.871700-3-stefanb@linux.vnet.ibm.com> (raw)
In-Reply-To: <20200330151536.871700-1-stefanb@linux.vnet.ibm.com>
From: Stefan Berger <stefanb@linux.ibm.com>
Rearrange the ACPI table based log code to allow for easier extension
for the TPM2 case.
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
drivers/char/tpm/eventlog/acpi.c | 39 ++++++++++++++++++++-------------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/drivers/char/tpm/eventlog/acpi.c b/drivers/char/tpm/eventlog/acpi.c
index 63ada5e53f13..1ef2267c9378 100644
--- a/drivers/char/tpm/eventlog/acpi.c
+++ b/drivers/char/tpm/eventlog/acpi.c
@@ -50,9 +50,6 @@ int tpm_read_log_acpi(struct tpm_chip *chip)
u64 len, start;
struct tpm_bios_log *log;
- if (chip->flags & TPM_CHIP_FLAG_TPM2)
- return -ENODEV;
-
log = &chip->log;
/* Unfortuntely ACPI does not associate the event log with a specific
@@ -61,23 +58,27 @@ int tpm_read_log_acpi(struct tpm_chip *chip)
if (!chip->acpi_dev_handle)
return -ENODEV;
- /* Find TCPA entry in RSDT (ACPI_LOGICAL_ADDRESSING) */
- status = acpi_get_table(ACPI_SIG_TCPA, 1,
- (struct acpi_table_header **)&buff);
-
- if (ACPI_FAILURE(status))
+ if (chip->flags & TPM_CHIP_FLAG_TPM2) {
return -ENODEV;
-
- switch(buff->platform_class) {
- case BIOS_SERVER:
- len = buff->server.log_max_len;
- start = buff->server.log_start_addr;
- break;
- case BIOS_CLIENT:
- default:
- len = buff->client.log_max_len;
- start = buff->client.log_start_addr;
- break;
+ } else {
+ /* Find TCPA entry in RSDT (ACPI_LOGICAL_ADDRESSING) */
+ status = acpi_get_table(ACPI_SIG_TCPA, 1,
+ (struct acpi_table_header **)&buff);
+
+ if (ACPI_FAILURE(status))
+ return -ENODEV;
+
+ switch (buff->platform_class) {
+ case BIOS_SERVER:
+ len = buff->server.log_max_len;
+ start = buff->server.log_start_addr;
+ break;
+ case BIOS_CLIENT:
+ default:
+ len = buff->client.log_max_len;
+ start = buff->client.log_start_addr;
+ break;
+ }
}
if (!len) {
dev_warn(&chip->dev, "%s: TCPA log area empty\n", __func__);
--
2.14.5
next prev parent reply other threads:[~2020-03-30 15:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 15:15 [PATCH v2 0/3] tpm2: Make TPM2 logs accessible for non-UEFI firmware Stefan Berger
2020-03-30 15:15 ` [PATCH v2 1/3] acpi: Extend TPM2 ACPI table with missing log fields Stefan Berger
2020-03-30 19:28 ` Jarkko Sakkinen
2020-03-30 21:26 ` Stefan Berger
2020-03-31 11:55 ` Jarkko Sakkinen
2020-03-30 15:15 ` Stefan Berger [this message]
2020-03-30 19:32 ` [PATCH v2 2/3] tpm: Rearrange ACPI log code to easier extend for TPM2 case Jarkko Sakkinen
2020-03-30 21:12 ` Stefan Berger
2020-03-31 11:51 ` Jarkko Sakkinen
2020-03-30 15:15 ` [PATCH v2 3/3] tpm: Add support for ACPI logs from TPM2 ACPI table Stefan Berger
2020-03-30 19:54 ` 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=20200330151536.871700-3-stefanb@linux.vnet.ibm.com \
--to=stefanb@linux.vnet.ibm.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--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).