796d803070
A cleanup patch changed the prototype of the regular tpm_bios_log_setup
function, but not that of the stub that is used when the TPM is disabled,
causing a harmless build warning:
drivers/char/tpm/tpm-chip.c: In function 'tpm1_chip_register':
drivers/char/tpm/tpm-chip.c:287:38: error: passing argument 1 of 'tpm_bios_log_setup' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
chip->bios_dir = tpm_bios_log_setup(dev_name(&chip->dev));
In file included from ../drivers/char/tpm/tpm-chip.c:30:0:
../drivers/char/tpm/tpm_eventlog.h:83:31: note: expected 'char *' but argument is of type 'const char *'
static inline struct dentry **tpm_bios_log_setup(char *name)
This changes the stub function to match the normal prototype,
avoiding that warning.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: aca8db8088c3 ("tpm: Get rid of devname")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
93 lines
1.6 KiB
C
93 lines
1.6 KiB
C
|
|
#ifndef __TPM_EVENTLOG_H__
|
|
#define __TPM_EVENTLOG_H__
|
|
|
|
#define TCG_EVENT_NAME_LEN_MAX 255
|
|
#define MAX_TEXT_EVENT 1000 /* Max event string length */
|
|
#define ACPI_TCPA_SIG "TCPA" /* 0x41504354 /'TCPA' */
|
|
|
|
#ifdef CONFIG_PPC64
|
|
#define do_endian_conversion(x) be32_to_cpu(x)
|
|
#else
|
|
#define do_endian_conversion(x) x
|
|
#endif
|
|
|
|
enum bios_platform_class {
|
|
BIOS_CLIENT = 0x00,
|
|
BIOS_SERVER = 0x01,
|
|
};
|
|
|
|
struct tpm_bios_log {
|
|
void *bios_event_log;
|
|
void *bios_event_log_end;
|
|
};
|
|
|
|
struct tcpa_event {
|
|
u32 pcr_index;
|
|
u32 event_type;
|
|
u8 pcr_value[20]; /* SHA1 */
|
|
u32 event_size;
|
|
u8 event_data[0];
|
|
};
|
|
|
|
enum tcpa_event_types {
|
|
PREBOOT = 0,
|
|
POST_CODE,
|
|
UNUSED,
|
|
NO_ACTION,
|
|
SEPARATOR,
|
|
ACTION,
|
|
EVENT_TAG,
|
|
SCRTM_CONTENTS,
|
|
SCRTM_VERSION,
|
|
CPU_MICROCODE,
|
|
PLATFORM_CONFIG_FLAGS,
|
|
TABLE_OF_DEVICES,
|
|
COMPACT_HASH,
|
|
IPL,
|
|
IPL_PARTITION_DATA,
|
|
NONHOST_CODE,
|
|
NONHOST_CONFIG,
|
|
NONHOST_INFO,
|
|
};
|
|
|
|
struct tcpa_pc_event {
|
|
u32 event_id;
|
|
u32 event_size;
|
|
u8 event_data[0];
|
|
};
|
|
|
|
enum tcpa_pc_event_ids {
|
|
SMBIOS = 1,
|
|
BIS_CERT,
|
|
POST_BIOS_ROM,
|
|
ESCD,
|
|
CMOS,
|
|
NVRAM,
|
|
OPTION_ROM_EXEC,
|
|
OPTION_ROM_CONFIG,
|
|
OPTION_ROM_MICROCODE = 10,
|
|
S_CRTM_VERSION,
|
|
S_CRTM_CONTENTS,
|
|
POST_CONTENTS,
|
|
HOST_TABLE_OF_DEVICES,
|
|
};
|
|
|
|
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(const char *);
|
|
extern void tpm_bios_log_teardown(struct dentry **);
|
|
#else
|
|
static inline struct dentry **tpm_bios_log_setup(const char *name)
|
|
{
|
|
return NULL;
|
|
}
|
|
static inline void tpm_bios_log_teardown(struct dentry **dir)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#endif
|