kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tpm: Move eventlog declarations to its own header

Browse source 
Reduce the size of tpm.h by moving eventlog declarations to a separate
header.

Signed-off-by: Thiebaud Weksteen <tweek@google.com>
Suggested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
This commit is contained in:
Thiebaud Weksteen 2018-04-12 12:13:50 +02:00 committed by Jarkko Sakkinen
parent 9b01b53566
commit 75d647f5de
8 changed files with 41 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/char/tpm/eventlog/acpi.c
View file

@ -28,6 +28,7 @@
#include <linux/tpm_eventlog.h>
#include "../tpm.h"
#include "common.h"
struct acpi_tcpa {
struct acpi_table_header hdr;

2
drivers/char/tpm/eventlog/common.c
View file

@ -25,7 +25,7 @@
#include <linux/tpm_eventlog.h>
#include "../tpm.h"
#include "common.h"
static int tpm_bios_measurements_open(struct inode *inode,
struct file *file)

35
drivers/char/tpm/eventlog/common.h Normal file
View file

@ -0,0 +1,35 @@
#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

1
drivers/char/tpm/eventlog/efi.c
View file

@ -15,6 +15,7 @@
#include <linux/tpm_eventlog.h>
#include "../tpm.h"
#include "common.h"
/* read binary bios log from EFI configuration table */
int tpm_read_log_efi(struct tpm_chip *chip)

1
drivers/char/tpm/eventlog/of.c
View file

@ -20,6 +20,7 @@
#include <linux/tpm_eventlog.h>
#include "../tpm.h"
#include "common.h"
int tpm_read_log_of(struct tpm_chip *chip)
{

1
drivers/char/tpm/eventlog/tpm1.c
View file

@ -29,6 +29,7 @@
#include <linux/tpm_eventlog.h>
#include "../tpm.h"
#include "common.h"
static const char* tcpa_event_type_strings[] = {

1
drivers/char/tpm/eventlog/tpm2.c
View file

@ -24,6 +24,7 @@
#include <linux/tpm_eventlog.h>
#include "../tpm.h"
#include "common.h"
/*
* calc_tpm2_event_size() - calculate the event size, where event

29
drivers/char/tpm/tpm.h
View file

@ -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,
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);
void tpm_bios_log_teardown(struct tpm_chip *chip);
#endif