Commit 75d647f5 authored by Thiebaud Weksteen's avatar Thiebaud Weksteen Committed by Jarkko Sakkinen

tpm: Move eventlog declarations to its own header

Reduce the size of tpm.h by moving eventlog declarations to a separate
header.
Signed-off-by: default avatarThiebaud Weksteen <tweek@google.com>
Suggested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 9b01b535
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <linux/tpm_eventlog.h> #include <linux/tpm_eventlog.h>
#include "../tpm.h" #include "../tpm.h"
#include "common.h"
struct acpi_tcpa { struct acpi_tcpa {
struct acpi_table_header hdr; struct acpi_table_header hdr;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <linux/tpm_eventlog.h> #include <linux/tpm_eventlog.h>
#include "../tpm.h" #include "../tpm.h"
#include "common.h"
static int tpm_bios_measurements_open(struct inode *inode, static int tpm_bios_measurements_open(struct inode *inode,
struct file *file) struct file *file)
......
#ifndef __TPM_EVENTLOG_COMMON_H__
#define __TPM_EVENTLOG_COMMON_H__
#include "../tpm.h"
extern const struct seq_operations tpm1_ascii_b_measurements_seqops;
extern const struct seq_operations tpm1_binary_b_measurements_seqops;
extern const struct seq_operations tpm2_binary_b_measurements_seqops;
#if defined(CONFIG_ACPI)
int tpm_read_log_acpi(struct tpm_chip *chip);
#else
static inline int tpm_read_log_acpi(struct tpm_chip *chip)
{
return -ENODEV;
}
#endif
#if defined(CONFIG_OF)
int tpm_read_log_of(struct tpm_chip *chip);
#else
static inline int tpm_read_log_of(struct tpm_chip *chip)
{
return -ENODEV;
}
#endif
#if defined(CONFIG_EFI)
int tpm_read_log_efi(struct tpm_chip *chip);
#else
static inline int tpm_read_log_efi(struct tpm_chip *chip)
{
return -ENODEV;
}
#endif
#endif
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/tpm_eventlog.h> #include <linux/tpm_eventlog.h>
#include "../tpm.h" #include "../tpm.h"
#include "common.h"
/* read binary bios log from EFI configuration table */ /* read binary bios log from EFI configuration table */
int tpm_read_log_efi(struct tpm_chip *chip) int tpm_read_log_efi(struct tpm_chip *chip)
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <linux/tpm_eventlog.h> #include <linux/tpm_eventlog.h>
#include "../tpm.h" #include "../tpm.h"
#include "common.h"
int tpm_read_log_of(struct tpm_chip *chip) int tpm_read_log_of(struct tpm_chip *chip)
{ {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <linux/tpm_eventlog.h> #include <linux/tpm_eventlog.h>
#include "../tpm.h" #include "../tpm.h"
#include "common.h"
static const char* tcpa_event_type_strings[] = { static const char* tcpa_event_type_strings[] = {
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/tpm_eventlog.h> #include <linux/tpm_eventlog.h>
#include "../tpm.h" #include "../tpm.h"
#include "common.h"
/* /*
* calc_tpm2_event_size() - calculate the event size, where event * calc_tpm2_event_size() - calculate the event size, where event
......
...@@ -590,35 +590,6 @@ int tpm2_prepare_space(struct tpm_chip *chip, struct tpm_space *space, u32 cc, ...@@ -590,35 +590,6 @@ int tpm2_prepare_space(struct tpm_chip *chip, struct tpm_space *space, u32 cc,
int tpm2_commit_space(struct tpm_chip *chip, struct tpm_space *space, int tpm2_commit_space(struct tpm_chip *chip, struct tpm_space *space,
u32 cc, u8 *buf, size_t *bufsiz); u32 cc, u8 *buf, size_t *bufsiz);
extern const struct seq_operations tpm1_ascii_b_measurements_seqops;
extern const struct seq_operations tpm1_binary_b_measurements_seqops;
extern const struct seq_operations tpm2_binary_b_measurements_seqops;
#if defined(CONFIG_ACPI)
int tpm_read_log_acpi(struct tpm_chip *chip);
#else
static inline int tpm_read_log_acpi(struct tpm_chip *chip)
{
return -ENODEV;
}
#endif
#if defined(CONFIG_OF)
int tpm_read_log_of(struct tpm_chip *chip);
#else
static inline int tpm_read_log_of(struct tpm_chip *chip)
{
return -ENODEV;
}
#endif
#if defined(CONFIG_EFI)
int tpm_read_log_efi(struct tpm_chip *chip);
#else
static inline int tpm_read_log_efi(struct tpm_chip *chip)
{
return -ENODEV;
}
#endif
int tpm_bios_log_setup(struct tpm_chip *chip); int tpm_bios_log_setup(struct tpm_chip *chip);
void tpm_bios_log_teardown(struct tpm_chip *chip); void tpm_bios_log_teardown(struct tpm_chip *chip);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment