On Tue, Mar 17, 2026 at 04:03:32PM +0000, Alec Brown wrote: > From: Ross Philipson <[email protected]> > > From: Ross Philipson <[email protected]>
nit: just fix this glitch please :-) > > Consolidate TPM1 constants in tpm_command.h and remove duplicate > constants from tpm1-cmd.c. > > Signed-off-by: Daniel P. Smith <[email protected]> > Signed-off-by: Ross Philipson <[email protected]> > Signed-off-by: Alec Brown <[email protected]> > --- > drivers/char/tpm/tpm-buf.c | 1 - > drivers/char/tpm/tpm1-cmd.c | 14 +------- > include/keys/trusted_tpm.h | 1 - > include/linux/tpm.h | 2 ++ > include/linux/tpm_command.h | 43 ++++++++++++++++------- > security/keys/trusted-keys/trusted_tpm1.c | 1 - > security/keys/trusted-keys/trusted_tpm2.c | 1 - > 7 files changed, 33 insertions(+), 30 deletions(-) > > diff --git a/drivers/char/tpm/tpm-buf.c b/drivers/char/tpm/tpm-buf.c > index dc882fc9fa9e..4c4f450630df 100644 > --- a/drivers/char/tpm/tpm-buf.c > +++ b/drivers/char/tpm/tpm-buf.c > @@ -3,7 +3,6 @@ > * Handling of TPM command and other buffers. > */ > > -#include <linux/tpm_command.h> > #include <linux/module.h> > #include <linux/tpm.h> > > diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c > index b49a790f1bd5..664ca1fff2e8 100644 > --- a/drivers/char/tpm/tpm1-cmd.c > +++ b/drivers/char/tpm/tpm1-cmd.c > @@ -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. > diff --git a/include/keys/trusted_tpm.h b/include/keys/trusted_tpm.h > index 0fadc6a4f166..3a0fa3bc8454 100644 > --- a/include/keys/trusted_tpm.h > +++ b/include/keys/trusted_tpm.h > @@ -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; > > diff --git a/include/linux/tpm.h b/include/linux/tpm.h > index 202da079d500..18dcf0ef46f6 100644 > --- a/include/linux/tpm.h > +++ b/include/linux/tpm.h > @@ -25,6 +25,8 @@ > #include <crypto/hash_info.h> > #include <crypto/aes.h> > > +#include "tpm_command.h" > + > #define TPM_DIGEST_SIZE 20 /* Max TPM v1.2 PCR size */ > > #define TPM2_MAX_DIGEST_SIZE SHA512_DIGEST_SIZE > diff --git a/include/linux/tpm_command.h b/include/linux/tpm_command.h > index f5c03e9c3913..9a8991b8801d 100644 > --- a/include/linux/tpm_command.h > +++ b/include/linux/tpm_command.h > @@ -2,28 +2,45 @@ > #ifndef __LINUX_TPM_COMMAND_H__ > #define __LINUX_TPM_COMMAND_H__ > > +/************************************************/ > +/* TPM 1 Family Chips */ > +/************************************************/ > + > /* > - * TPM Command constants from specifications at > - * http://www.trustedcomputinggroup.org > + * 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 > diff --git a/security/keys/trusted-keys/trusted_tpm1.c > b/security/keys/trusted-keys/trusted_tpm1.c > index 636acb66a4f6..10f79a8c2d35 100644 > --- a/security/keys/trusted-keys/trusted_tpm1.c > +++ b/security/keys/trusted-keys/trusted_tpm1.c > @@ -17,7 +17,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> > > diff --git a/security/keys/trusted-keys/trusted_tpm2.c > b/security/keys/trusted-keys/trusted_tpm2.c > index a7ea4a1c3bed..56eb8e20780a 100644 > --- a/security/keys/trusted-keys/trusted_tpm2.c > +++ b/security/keys/trusted-keys/trusted_tpm2.c > @@ -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> > -- > 2.47.3 > I need to compile and test these but yes agree with the idea. BR, Jarkko
