subject:"\[PATCH v16 03\/38\] tpm\: Move TPM2 specific definitions to the command header"

Re: [PATCH v16 03/38] tpm: Move TPM2 specific definitions to the command header

2026-05-15 Thread Jarkko Sakkinen

On Fri, May 15, 2026 at 02:13:35PM -0700, Ross Philipson wrote:
> Gather all the TPM2 definitions and structures in the internal header
> file drivers/char/tpm/tpm.h into the command header, including:
>  - Command codes, return codes and definitions from the public and
> internal tpm.h files.
>  - Structures defined in numerous TPM driver C modules.
> 
> The definitions moved to these files correspond to the TCG specification
> for TPM 2 family:
> 
> TPM 2.0 Library
>  - https://trustedcomputinggroup.org/resource/tpm-library-specification/
> 
> Co-developed-by: Daniel P. Smith 
> Signed-off-by: Daniel P. Smith 
> Co-developed-by: Alec Brown 
> Signed-off-by: Alec Brown 
> Signed-off-by: Ross Philipson 
> ---
>  drivers/char/tpm/tpm.h|  77 --
>  drivers/char/tpm/tpm2-cmd.c   |  30 
>  drivers/char/tpm/tpm2-space.c |  13 --
>  include/linux/tpm.h   | 145 --
>  include/linux/tpm_command.h   | 271 ++
>  5 files changed, 271 insertions(+), 265 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
> index 043d78a9617a..680f89d9c9f9 100644
> --- a/drivers/char/tpm/tpm.h
> +++ b/drivers/char/tpm/tpm.h
> @@ -52,83 +52,6 @@ enum tpm_addr {
>   TPM_ADDR = 0x4E,
>  };
>  
> -/* TPM2 specific constants. */
> -#define TPM2_SPACE_BUFFER_SIZE   16384 /* 16 kB */
> -
> -enum tpm2_pt_props {
> - TPM2_PT_NONE = 0x,
> - TPM2_PT_GROUP = 0x0100,
> - TPM2_PT_FIXED = TPM2_PT_GROUP * 1,
> - TPM2_PT_FAMILY_INDICATOR = TPM2_PT_FIXED + 0,
> - TPM2_PT_LEVEL = TPM2_PT_FIXED + 1,
> - TPM2_PT_REVISION = TPM2_PT_FIXED + 2,
> - TPM2_PT_DAY_OF_YEAR = TPM2_PT_FIXED + 3,
> - TPM2_PT_YEAR = TPM2_PT_FIXED + 4,
> - TPM2_PT_MANUFACTURER = TPM2_PT_FIXED + 5,
> - TPM2_PT_VENDOR_STRING_1 = TPM2_PT_FIXED + 6,
> - TPM2_PT_VENDOR_STRING_2 = TPM2_PT_FIXED + 7,
> - TPM2_PT_VENDOR_STRING_3 = TPM2_PT_FIXED + 8,
> - TPM2_PT_VENDOR_STRING_4 = TPM2_PT_FIXED + 9,
> - TPM2_PT_VENDOR_TPM_TYPE = TPM2_PT_FIXED + 10,
> - TPM2_PT_FIRMWARE_VERSION_1 = TPM2_PT_FIXED + 11,
> - TPM2_PT_FIRMWARE_VERSION_2 = TPM2_PT_FIXED + 12,
> - TPM2_PT_INPUT_BUFFER = TPM2_PT_FIXED + 13,
> - TPM2_PT_HR_TRANSIENT_MIN = TPM2_PT_FIXED + 14,
> - TPM2_PT_HR_PERSISTENT_MIN = TPM2_PT_FIXED + 15,
> - TPM2_PT_HR_LOADED_MIN = TPM2_PT_FIXED + 16,
> - TPM2_PT_ACTIVE_SESSIONS_MAX = TPM2_PT_FIXED + 17,
> - TPM2_PT_PCR_COUNT = TPM2_PT_FIXED + 18,
> - TPM2_PT_PCR_SELECT_MIN = TPM2_PT_FIXED + 19,
> - TPM2_PT_CONTEXT_GAP_MAX = TPM2_PT_FIXED + 20,
> - TPM2_PT_NV_COUNTERS_MAX = TPM2_PT_FIXED + 22,
> - TPM2_PT_NV_INDEX_MAX = TPM2_PT_FIXED + 23,
> - TPM2_PT_MEMORY = TPM2_PT_FIXED + 24,
> - TPM2_PT_CLOCK_UPDATE = TPM2_PT_FIXED + 25,
> - TPM2_PT_CONTEXT_HASH = TPM2_PT_FIXED + 26,
> - TPM2_PT_CONTEXT_SYM = TPM2_PT_FIXED + 27,
> - TPM2_PT_CONTEXT_SYM_SIZE = TPM2_PT_FIXED + 28,
> - TPM2_PT_ORDERLY_COUNT = TPM2_PT_FIXED + 29,
> - TPM2_PT_MAX_COMMAND_SIZE = TPM2_PT_FIXED + 30,
> - TPM2_PT_MAX_RESPONSE_SIZE = TPM2_PT_FIXED + 31,
> - TPM2_PT_MAX_DIGEST = TPM2_PT_FIXED + 32,
> - TPM2_PT_MAX_OBJECT_CONTEXT = TPM2_PT_FIXED + 33,
> - TPM2_PT_MAX_SESSION_CONTEXT = TPM2_PT_FIXED + 34,
> - TPM2_PT_PS_FAMILY_INDICATOR = TPM2_PT_FIXED + 35,
> - TPM2_PT_PS_LEVEL = TPM2_PT_FIXED + 36,
> - TPM2_PT_PS_REVISION = TPM2_PT_FIXED + 37,
> - TPM2_PT_PS_DAY_OF_YEAR = TPM2_PT_FIXED + 38,
> - TPM2_PT_PS_YEAR = TPM2_PT_FIXED + 39,
> - TPM2_PT_SPLIT_MAX = TPM2_PT_FIXED + 40,
> - TPM2_PT_TOTAL_COMMANDS = TPM2_PT_FIXED + 41,
> - TPM2_PT_LIBRARY_COMMANDS = TPM2_PT_FIXED + 42,
> - TPM2_PT_VENDOR_COMMANDS = TPM2_PT_FIXED + 43,
> - TPM2_PT_NV_BUFFER_MAX = TPM2_PT_FIXED + 44,
> - TPM2_PT_MODES = TPM2_PT_FIXED + 45,
> - TPM2_PT_MAX_CAP_BUFFER = TPM2_PT_FIXED + 46,
> - TPM2_PT_VAR = TPM2_PT_GROUP * 2,
> - TPM2_PT_PERMANENT = TPM2_PT_VAR + 0,
> - TPM2_PT_STARTUP_CLEAR = TPM2_PT_VAR + 1,
> - TPM2_PT_HR_NV_INDEX = TPM2_PT_VAR + 2,
> - TPM2_PT_HR_LOADED = TPM2_PT_VAR + 3,
> - TPM2_PT_HR_LOADED_AVAIL = TPM2_PT_VAR + 4,
> - TPM2_PT_HR_ACTIVE = TPM2_PT_VAR + 5,
> - TPM2_PT_HR_ACTIVE_AVAIL = TPM2_PT_VAR + 6,
> - TPM2_PT_HR_TRANSIENT_AVAIL = TPM2_PT_VAR + 7,
> - TPM2_PT_HR_PERSISTENT = TPM2_PT_VAR + 8,
> - TPM2_PT_HR_PERSISTENT_AVAIL = TPM2_PT_VAR + 9,
> - TPM2_PT_NV_COUNTERS = TPM2_PT_VAR + 10,
> - TPM2_PT_NV_COUNTERS_AVAIL = TPM2_PT_VAR + 11,
> - TPM2_PT_ALGORITHM_SET = TPM2_PT_VAR + 12,
> - TPM2_PT_LOADED_CURVES = TPM2_PT_VAR + 13,
> - TPM2_PT_LOCKOUT_COUNTER = TPM2_PT_VAR + 14,
> - TPM2_PT_MAX_AUTH_FAIL = TPM2_PT_VAR + 15,
> - TPM2_PT_LOCKOUT_INTERVAL = TPM2_PT_VAR + 16,
> - TPM2_PT_LOCKOUT_RECOVERY = TPM2_PT_VAR + 17,
> - TPM2_PT_NV_WRITE_RECOVERY = TPM2_PT_VAR + 18,
> - TPM2_PT_AUDIT_COUNTER_0 = TPM2_PT_VAR + 19,
> - TPM2_PT_AUDIT_COUNTER_1 = TP

[PATCH v16 03/38] tpm: Move TPM2 specific definitions to the command header

2026-05-15 Thread Ross Philipson

Gather all the TPM2 definitions and structures in the internal header
file drivers/char/tpm/tpm.h into the command header, including:
 - Command codes, return codes and definitions from the public and
internal tpm.h files.
 - Structures defined in numerous TPM driver C modules.

The definitions moved to these files correspond to the TCG specification
for TPM 2 family:

TPM 2.0 Library
 - https://trustedcomputinggroup.org/resource/tpm-library-specification/

Co-developed-by: Daniel P. Smith 
Signed-off-by: Daniel P. Smith 
Co-developed-by: Alec Brown 
Signed-off-by: Alec Brown 
Signed-off-by: Ross Philipson 
---
 drivers/char/tpm/tpm.h|  77 --
 drivers/char/tpm/tpm2-cmd.c   |  30 
 drivers/char/tpm/tpm2-space.c |  13 --
 include/linux/tpm.h   | 145 --
 include/linux/tpm_command.h   | 271 ++
 5 files changed, 271 insertions(+), 265 deletions(-)

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 043d78a9617a..680f89d9c9f9 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -52,83 +52,6 @@ enum tpm_addr {
TPM_ADDR = 0x4E,
 };
 
-/* TPM2 specific constants. */
-#define TPM2_SPACE_BUFFER_SIZE 16384 /* 16 kB */
-
-enum tpm2_pt_props {
-   TPM2_PT_NONE = 0x,
-   TPM2_PT_GROUP = 0x0100,
-   TPM2_PT_FIXED = TPM2_PT_GROUP * 1,
-   TPM2_PT_FAMILY_INDICATOR = TPM2_PT_FIXED + 0,
-   TPM2_PT_LEVEL = TPM2_PT_FIXED + 1,
-   TPM2_PT_REVISION = TPM2_PT_FIXED + 2,
-   TPM2_PT_DAY_OF_YEAR = TPM2_PT_FIXED + 3,
-   TPM2_PT_YEAR = TPM2_PT_FIXED + 4,
-   TPM2_PT_MANUFACTURER = TPM2_PT_FIXED + 5,
-   TPM2_PT_VENDOR_STRING_1 = TPM2_PT_FIXED + 6,
-   TPM2_PT_VENDOR_STRING_2 = TPM2_PT_FIXED + 7,
-   TPM2_PT_VENDOR_STRING_3 = TPM2_PT_FIXED + 8,
-   TPM2_PT_VENDOR_STRING_4 = TPM2_PT_FIXED + 9,
-   TPM2_PT_VENDOR_TPM_TYPE = TPM2_PT_FIXED + 10,
-   TPM2_PT_FIRMWARE_VERSION_1 = TPM2_PT_FIXED + 11,
-   TPM2_PT_FIRMWARE_VERSION_2 = TPM2_PT_FIXED + 12,
-   TPM2_PT_INPUT_BUFFER = TPM2_PT_FIXED + 13,
-   TPM2_PT_HR_TRANSIENT_MIN = TPM2_PT_FIXED + 14,
-   TPM2_PT_HR_PERSISTENT_MIN = TPM2_PT_FIXED + 15,
-   TPM2_PT_HR_LOADED_MIN = TPM2_PT_FIXED + 16,
-   TPM2_PT_ACTIVE_SESSIONS_MAX = TPM2_PT_FIXED + 17,
-   TPM2_PT_PCR_COUNT = TPM2_PT_FIXED + 18,
-   TPM2_PT_PCR_SELECT_MIN = TPM2_PT_FIXED + 19,
-   TPM2_PT_CONTEXT_GAP_MAX = TPM2_PT_FIXED + 20,
-   TPM2_PT_NV_COUNTERS_MAX = TPM2_PT_FIXED + 22,
-   TPM2_PT_NV_INDEX_MAX = TPM2_PT_FIXED + 23,
-   TPM2_PT_MEMORY = TPM2_PT_FIXED + 24,
-   TPM2_PT_CLOCK_UPDATE = TPM2_PT_FIXED + 25,
-   TPM2_PT_CONTEXT_HASH = TPM2_PT_FIXED + 26,
-   TPM2_PT_CONTEXT_SYM = TPM2_PT_FIXED + 27,
-   TPM2_PT_CONTEXT_SYM_SIZE = TPM2_PT_FIXED + 28,
-   TPM2_PT_ORDERLY_COUNT = TPM2_PT_FIXED + 29,
-   TPM2_PT_MAX_COMMAND_SIZE = TPM2_PT_FIXED + 30,
-   TPM2_PT_MAX_RESPONSE_SIZE = TPM2_PT_FIXED + 31,
-   TPM2_PT_MAX_DIGEST = TPM2_PT_FIXED + 32,
-   TPM2_PT_MAX_OBJECT_CONTEXT = TPM2_PT_FIXED + 33,
-   TPM2_PT_MAX_SESSION_CONTEXT = TPM2_PT_FIXED + 34,
-   TPM2_PT_PS_FAMILY_INDICATOR = TPM2_PT_FIXED + 35,
-   TPM2_PT_PS_LEVEL = TPM2_PT_FIXED + 36,
-   TPM2_PT_PS_REVISION = TPM2_PT_FIXED + 37,
-   TPM2_PT_PS_DAY_OF_YEAR = TPM2_PT_FIXED + 38,
-   TPM2_PT_PS_YEAR = TPM2_PT_FIXED + 39,
-   TPM2_PT_SPLIT_MAX = TPM2_PT_FIXED + 40,
-   TPM2_PT_TOTAL_COMMANDS = TPM2_PT_FIXED + 41,
-   TPM2_PT_LIBRARY_COMMANDS = TPM2_PT_FIXED + 42,
-   TPM2_PT_VENDOR_COMMANDS = TPM2_PT_FIXED + 43,
-   TPM2_PT_NV_BUFFER_MAX = TPM2_PT_FIXED + 44,
-   TPM2_PT_MODES = TPM2_PT_FIXED + 45,
-   TPM2_PT_MAX_CAP_BUFFER = TPM2_PT_FIXED + 46,
-   TPM2_PT_VAR = TPM2_PT_GROUP * 2,
-   TPM2_PT_PERMANENT = TPM2_PT_VAR + 0,
-   TPM2_PT_STARTUP_CLEAR = TPM2_PT_VAR + 1,
-   TPM2_PT_HR_NV_INDEX = TPM2_PT_VAR + 2,
-   TPM2_PT_HR_LOADED = TPM2_PT_VAR + 3,
-   TPM2_PT_HR_LOADED_AVAIL = TPM2_PT_VAR + 4,
-   TPM2_PT_HR_ACTIVE = TPM2_PT_VAR + 5,
-   TPM2_PT_HR_ACTIVE_AVAIL = TPM2_PT_VAR + 6,
-   TPM2_PT_HR_TRANSIENT_AVAIL = TPM2_PT_VAR + 7,
-   TPM2_PT_HR_PERSISTENT = TPM2_PT_VAR + 8,
-   TPM2_PT_HR_PERSISTENT_AVAIL = TPM2_PT_VAR + 9,
-   TPM2_PT_NV_COUNTERS = TPM2_PT_VAR + 10,
-   TPM2_PT_NV_COUNTERS_AVAIL = TPM2_PT_VAR + 11,
-   TPM2_PT_ALGORITHM_SET = TPM2_PT_VAR + 12,
-   TPM2_PT_LOADED_CURVES = TPM2_PT_VAR + 13,
-   TPM2_PT_LOCKOUT_COUNTER = TPM2_PT_VAR + 14,
-   TPM2_PT_MAX_AUTH_FAIL = TPM2_PT_VAR + 15,
-   TPM2_PT_LOCKOUT_INTERVAL = TPM2_PT_VAR + 16,
-   TPM2_PT_LOCKOUT_RECOVERY = TPM2_PT_VAR + 17,
-   TPM2_PT_NV_WRITE_RECOVERY = TPM2_PT_VAR + 18,
-   TPM2_PT_AUDIT_COUNTER_0 = TPM2_PT_VAR + 19,
-   TPM2_PT_AUDIT_COUNTER_1 = TPM2_PT_VAR + 20,
-};
-
 extern const struct class tpm_class;
 extern const struct class tpmrm_class;
 extern dev_t tpm_devt;
diff --git a/drive

Re: [PATCH v16 03/38] tpm: Move TPM2 specific definitions to the command header

[PATCH v16 03/38] tpm: Move TPM2 specific definitions to the command header

2 matches

Site Navigation

Mail list logo

Footer information