Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd3ec366 authored by Thiebaud Weksteen's avatar Thiebaud Weksteen Committed by Jarkko Sakkinen
Browse files

tpm: move tpm_eventlog.h outside of drivers folder 



The generic definitions of data structures in tpm_eventlog.h are
required by other part of the kernel (namely, the EFI stub).

Signed-off-by: default avatarThiebaud Weksteen <tweek@google.com>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Tested-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 5ef924d9

drivers/char/tpm/tpm-chip.c

+2 −1
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ 
#include <linux/spinlock.h>

#include <linux/freezer.h>

#include <linux/major.h>

#include <linux/tpm_eventlog.h>



#include "tpm.h"

#include "tpm_eventlog.h"



DEFINE_IDR(dev_nums_idr);

static DEFINE_MUTEX(idr_lock);

drivers/char/tpm/tpm-interface.c

+1 −1
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ 
#include <linux/spinlock.h>

#include <linux/freezer.h>

#include <linux/pm_runtime.h>

#include <linux/tpm_eventlog.h>



#include "tpm.h"

#include "tpm_eventlog.h"



#define TPM_MAX_ORDINAL 243

#define TSC_MAX_ORDINAL 12

drivers/char/tpm/tpm.h

+23 −4
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/acpi.h>

#include <linux/cdev.h>

#include <linux/highmem.h>

#include <linux/tpm_eventlog.h>

#include <crypto/hash_info.h>



#ifdef CONFIG_X86
@@ -385,10 +386,6 @@ struct tpm_cmd_t { 
	tpm_cmd_params	params;

} __packed;



struct tpm2_digest {

	u16 alg_id;

	u8 digest[SHA512_DIGEST_SIZE];

} __packed;



/* A string buffer type for constructing TPM commands. This is based on the

 * ideas of string buffer code in security/keys/trusted.h but is heap based
@@ -573,4 +570,26 @@ int tpm2_prepare_space(struct tpm_chip *chip, struct tpm_space *space, u32 cc, 
		       u8 *cmd);

int tpm2_commit_space(struct tpm_chip *chip, struct tpm_space *space,

		      u32 cc, u8 *buf, size_t *bufsiz);



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



int tpm_bios_log_setup(struct tpm_chip *chip);

void tpm_bios_log_teardown(struct tpm_chip *chip);

#endif

drivers/char/tpm/tpm1_eventlog.c

+1 −1
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ 
#include <linux/security.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/tpm_eventlog.h>



#include "tpm.h"

#include "tpm_eventlog.h"





static const char* tcpa_event_type_strings[] = {

drivers/char/tpm/tpm2_eventlog.c

+1 −1
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
#include <linux/security.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/tpm_eventlog.h>



#include "tpm.h"

#include "tpm_eventlog.h"



/*

 * calc_tpm2_event_size() - calculate the event size, where event