mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 12:52:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

tpm: Initial step to reorganize TPM public headers

Browse Source 
Consolidate TPM1 constants in tpm_command.h and remove duplicate
constants from tpm1-cmd.c.

Co-developed-by: Daniel P. Smith <dpsmith@apertussolutions.com>
Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com>
Co-developed-by: Alec Brown <alec.r.brown@oracle.com>
Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
Signed-off-by: Ross Philipson <ross.philipson@gmail.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
This commit is contained in:
Ross Philipson
2026-07-11 09:01:01 -07:00
committed by Jarkko Sakkinen
parent 264216889d
commit e06f28d32f
7 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/char/tpm/tpm-buf.c
View File

@@ -3,7 +3,6 @@
* Handling of TPM command and other buffers.
*/
#include <linux/tpm_command.h>
#include <linux/module.h>
#include <linux/tpm.h>

14
drivers/char/tpm/tpm1-cmd.c
View File

@@ -22,8 +22,6 @@
#include "tpm.h"
#define TPM_MAX_ORDINAL 243
/*
* Array with one entry per ordinal defining the maximum amount
* of time the chip could take to return the result. The ordinal
@@ -308,9 +306,6 @@ unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal)
return duration;
}
#define TPM_ORD_STARTUP 153
#define TPM_ST_CLEAR 1
/**
* tpm1_startup() - turn on the TPM
* @chip: TPM chip to use
@@ -459,7 +454,6 @@ int tpm1_get_timeouts(struct tpm_chip *chip)
return 0;
}
#define TPM_ORD_PCR_EXTEND 20
int tpm1_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, const u8 *hash,
const char *log_msg)
{
@@ -478,7 +472,6 @@ int tpm1_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, const u8 *hash,
return rc;
}
#define TPM_ORD_GET_CAP 101
ssize_t tpm1_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,
const char *desc, size_t min_cap_length)
{
@@ -511,7 +504,6 @@ ssize_t tpm1_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,
}
EXPORT_SYMBOL_GPL(tpm1_getcap);
#define TPM_ORD_GET_RANDOM 70
struct tpm1_get_random_out {
__be32 rng_data_len;
u8 rng_data[TPM_MAX_RNG_DATA];
@@ -580,13 +572,12 @@ int tpm1_get_random(struct tpm_chip *chip, u8 *dest, size_t max)
return rc;
}
#define TPM_ORD_PCRREAD 21
int tpm1_pcr_read(struct tpm_chip *chip, u32 pcr_idx, u8 *res_buf)
{
struct tpm_buf buf;
int rc;
rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_PCRREAD);
rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_PCR_READ);
if (rc)
return rc;
@@ -609,7 +600,6 @@ int tpm1_pcr_read(struct tpm_chip *chip, u32 pcr_idx, u8 *res_buf)
return rc;
}
#define TPM_ORD_CONTINUE_SELFTEST 83
/**
* tpm1_continue_selftest() - run TPM's selftest
* @chip: TPM chip to use
@@ -726,8 +716,6 @@ int tpm1_auto_startup(struct tpm_chip *chip)
return rc;
}
#define TPM_ORD_SAVESTATE 152
/**
* tpm1_pm_suspend() - pm suspend handler
* @chip: TPM chip to use.

1
include/keys/trusted_tpm.h
View File

@@ -3,7 +3,6 @@
#define __TRUSTED_TPM_H
#include <keys/trusted-type.h>
#include <linux/tpm_command.h>
extern struct trusted_key_ops trusted_key_tpm_ops;

2
include/linux/tpm.h
View File

@@ -25,6 +25,8 @@
#include <crypto/hash_info.h>
#include <crypto/aes.h>
#include <linux/tpm_command.h>
#define TPM_DIGEST_SIZE 20 /* Max TPM v1.2 PCR size */
#define TPM2_MAX_DIGEST_SIZE SHA512_DIGEST_SIZE

41
include/linux/tpm_command.h
View File

@@ -3,27 +3,42 @@
#define __LINUX_TPM_COMMAND_H__
/*
* TPM Command constants from specifications at
* http://www.trustedcomputinggroup.org
* == TPM 1 Family Chips ==
*
* TPM 1.2 Main Specification:
* https://trustedcomputinggroup.org/resource/tpm-main-specification/
*/
#define TPM_MAX_ORDINAL 243
/* Command TAGS */
#define TPM_TAG_RQU_COMMAND 193
#define TPM_TAG_RQU_AUTH1_COMMAND 194
#define TPM_TAG_RQU_AUTH2_COMMAND 195
#define TPM_TAG_RSP_COMMAND 196
#define TPM_TAG_RSP_AUTH1_COMMAND 197
#define TPM_TAG_RSP_AUTH2_COMMAND 198
enum tpm_command_tags {
TPM_TAG_RQU_COMMAND = 193,
TPM_TAG_RQU_AUTH1_COMMAND = 194,
TPM_TAG_RQU_AUTH2_COMMAND = 195,
TPM_TAG_RSP_COMMAND = 196,
TPM_TAG_RSP_AUTH1_COMMAND = 197,
TPM_TAG_RSP_AUTH2_COMMAND = 198,
};
/* Command Ordinals */
#define TPM_ORD_GETRANDOM 70
#define TPM_ORD_OSAP 11
#define TPM_ORD_OIAP 10
#define TPM_ORD_SEAL 23
#define TPM_ORD_UNSEAL 24
enum tpm_command_ordinals {
TPM_ORD_CONTINUE_SELFTEST = 83,
TPM_ORD_GET_CAP = 101,
TPM_ORD_GET_RANDOM = 70,
TPM_ORD_PCR_EXTEND = 20,
TPM_ORD_PCR_READ = 21,
TPM_ORD_OSAP = 11,
TPM_ORD_OIAP = 10,
TPM_ORD_SAVESTATE = 152,
TPM_ORD_SEAL = 23,
TPM_ORD_STARTUP = 153,
TPM_ORD_UNSEAL = 24,
};
/* Other constants */
#define SRKHANDLE 0x40000000
#define TPM_NONCE_SIZE 20
#define TPM_ST_CLEAR 1
#endif

1
security/keys/trusted-keys/trusted_tpm1.c
View File

@@ -18,7 +18,6 @@
#include <keys/trusted-type.h>
#include <linux/key-type.h>
#include <linux/tpm.h>
#include <linux/tpm_command.h>
#include <keys/trusted_tpm.h>

1
security/keys/trusted-keys/trusted_tpm2.c
View File

@@ -9,7 +9,6 @@
#include <linux/string.h>
#include <linux/err.h>
#include <linux/tpm.h>
#include <linux/tpm_command.h>
#include <keys/trusted-type.h>
#include <keys/trusted_tpm.h>