drivers/char/tpm: Add securityfs support for event log

This patch retrieves the event log data from the device tree
during file open. The event log data will then displayed through
securityfs.

Signed-off-by: Ashley Lai <adlai@us.ibm.com>
Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>

diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile
index 547509d020464b821fd450f3587161f287238458..9080cc44e3c41347f8c1d470de06bdd5f509ec37 100644 (file)
--- a/drivers/char/tpm/Makefile
+++ b/drivers/char/tpm/Makefile
@@ -5,6 +5,11 @@ obj-$(CONFIG_TCG_TPM) += tpm.o
 ifdef CONFIG_ACPI
        obj-$(CONFIG_TCG_TPM) += tpm_bios.o
        tpm_bios-objs += tpm_eventlog.o tpm_acpi.o
+else
+ifdef CONFIG_TCG_IBMVTPM
+       obj-$(CONFIG_TCG_TPM) += tpm_bios.o
+       tpm_bios-objs += tpm_eventlog.o tpm_of.o
+endif
 endif
 obj-$(CONFIG_TCG_TIS) += tpm_tis.o
 obj-$(CONFIG_TCG_TIS_I2C_INFINEON) += tpm_i2c_infineon.o

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 870fde7459c5c4f3250e02fbd930d7f3ea02a5f9..f1af738211019abe74567b60fc7e4d6f23f67268 100644 (file)
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -327,15 +327,3 @@ extern int tpm_pm_suspend(struct device *);
 extern int tpm_pm_resume(struct device *);
 extern int wait_for_tpm_stat(struct tpm_chip *, u8, unsigned long,
                             wait_queue_head_t *);
-#ifdef CONFIG_ACPI
-extern struct dentry ** tpm_bios_log_setup(char *);
-extern void tpm_bios_log_teardown(struct dentry **);
-#else
-static inline struct dentry ** tpm_bios_log_setup(char *name)
-{
-       return NULL;
-}
-static inline void tpm_bios_log_teardown(struct dentry **dir)
-{
-}
-#endif

diff --git a/drivers/char/tpm/tpm_eventlog.h b/drivers/char/tpm/tpm_eventlog.h
index 8e23ccdf8a83acced39dc8995cd54aa59773936a..e7da086d6928814b0ae04a015d534f6804f40c82 100644 (file)
--- a/drivers/char/tpm/tpm_eventlog.h
+++ b/drivers/char/tpm/tpm_eventlog.h
@@ -68,4 +68,19 @@ enum tcpa_pc_event_ids {
 };
 
 int read_log(struct tpm_bios_log *log);
+
+#if defined(CONFIG_TCG_IBMVTPM) || defined(CONFIG_TCG_IBMVTPM_MODULE) || \
+       defined(CONFIG_ACPI)
+extern struct dentry **tpm_bios_log_setup(char *);
+extern void tpm_bios_log_teardown(struct dentry **);
+#else
+static inline struct dentry **tpm_bios_log_setup(char *name)
+{
+       return NULL;
+}
+static inline void tpm_bios_log_teardown(struct dentry **dir)
+{
+}
+#endif
+
 #endif

diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
new file mode 100644 (file)
index 0000000..98ba2bd
--- /dev/null
+++ b/drivers/char/tpm/tpm_of.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2012 IBM Corporation
+ *
+ * Author: Ashley Lai <adlai@us.ibm.com>
+ *
+ * Maintained by: <tpmdd-devel@lists.sourceforge.net>
+ *
+ * Read the event log created by the firmware on PPC64
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ */
+
+#include <linux/slab.h>
+#include <linux/of.h>
+
+#include "tpm.h"
+#include "tpm_eventlog.h"
+
+int read_log(struct tpm_bios_log *log)
+{
+       struct device_node *np;
+       const u32 *sizep;
+       const __be64 *basep;
+
+       if (log->bios_event_log != NULL) {
+               pr_err("%s: ERROR - Eventlog already initialized\n", __func__);
+               return -EFAULT;
+       }
+
+       np = of_find_node_by_name(NULL, "ibm,vtpm");
+       if (!np) {
+               pr_err("%s: ERROR - IBMVTPM not supported\n", __func__);
+               return -ENODEV;
+       }
+
+       sizep = of_get_property(np, "linux,sml-size", NULL);
+       if (sizep == NULL) {
+               pr_err("%s: ERROR - SML size not found\n", __func__);
+               goto cleanup_eio;
+       }
+       if (*sizep == 0) {
+               pr_err("%s: ERROR - event log area empty\n", __func__);
+               goto cleanup_eio;
+       }
+
+       basep = of_get_property(np, "linux,sml-base", NULL);
+       if (basep == NULL) {
+               pr_err(KERN_ERR "%s: ERROR - SML not found\n", __func__);
+               goto cleanup_eio;
+       }
+
+       of_node_put(np);
+       log->bios_event_log = kmalloc(*sizep, GFP_KERNEL);
+       if (!log->bios_event_log) {
+               pr_err("%s: ERROR - Not enough memory for BIOS measurements\n",
+                      __func__);
+               return -ENOMEM;
+       }
+
+       log->bios_event_log_end = log->bios_event_log + *sizep;
+
+       memcpy(log->bios_event_log, __va(be64_to_cpup(basep)), *sizep);
+
+       return 0;
+
+cleanup_eio:
+       of_node_put(np);
+       return -EIO;
+}