From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F05CF3C7DF0 for ; Sat, 11 Jul 2026 16:01:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783785678; cv=none; b=AxlaE/eJMhym8VutT4MoCbIiBnd81q43TkcPpus9T7QD3fsJ4xSh/fdngm/nxsxQJAU+jlQli3DKxTwz6aBdR3PapdYLnw9uLXBygWvIeYPZapcx8HlJZgFN+EfT8JD+e9tDPkkkO614iL6a3UeQNJTrAAPo4hBmKaXzKERrOv8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783785678; c=relaxed/simple; bh=EoUUqjZYbOtXIHZLtFz07ku884IQ3g6CHyUbrcA60Bc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oYrDGhi07oKUtTwHN7dwnJggS7C2h91opEEU+EYf5QI0w2O6FVWCw4P2RrgN/F8bJthz43Cooa8XRhFvsMOZto+j592IjzhzpFJUicuH9+JNYPPMYElp4AGZRsWy9XCh+VVRsGrvTHhM9KlPHTdhNIUE/YaTwLwBnopiAs9Ma7Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=E3I3cJgm; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="E3I3cJgm" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-3811f512167so2381875a91.3 for ; Sat, 11 Jul 2026 09:01:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783785676; x=1784390476; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ZjmfOUOJML2D2cy2d1JFAGzOl9Dis6s/LeoJt74YybY=; b=E3I3cJgmGCJCvODzN0XZFToodG6Pea2HPYmVs/QzXdjYZDCll/9BGXUzhXSm7bTHu1 yAnXn5gsVybI+1DerBypM6FSlrkSBlxhrfPu4Thp2LqGR97qlJvr5cKbJHfMDGJ0V5RY Kw6n2wF7N1xc6m0DR+IBiU0ReVKl94t1mt+j5UAfmsRfoHURWNOiV6nUkdk5CD7K2cz8 KPodvg+gSKiQanMaUlpR6IV0KZr9jh5B5RQzVRtYXj3bBBQ99dE2QG2mTs6w11KCRRf2 IT6/mA+psoI+4OuAsDsB3x9Gny/3047Hg1OjI2WdnS8Gn7620G4bntNd1lPxcx8Hq53I TToA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783785676; x=1784390476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=ZjmfOUOJML2D2cy2d1JFAGzOl9Dis6s/LeoJt74YybY=; b=AuD/3cwx2GCfiEF4gtvCiYTDCUe0+UiauJ+80JS/zYuuV8OPS+bh5ht5Qn9EX/w2Bq x/zDEoZWZTxB0FgyJflWsgoC8I3PZiCavDSaBxpe8R6m/2OjOl08T5laNyUwE0z192ty Cen4x4q53H/EPHmkBWIocfjf6yQMx7bxLGfCBOVhry2ei+01MvpoZEna1K8hZWOw7UV/ JUmV3Qs+EPhe6mcGGrSOpPm6WhV07BECKepfJkMx9MlAebgeDbkTF9hsikwPQi2udWX3 4A1RSG5gT7klbuWp3wDsWx82X2pwtVZgcqtzFVy5g6s+ySSrF8dK4Axz6KV6RrJr7dCq 97Ww== X-Gm-Message-State: AOJu0Yxh3odUvCuWCenASezv/ttgnuoR1BcRl5MsfHF8GULxIg+ZtcMR IBNpYNpmoE4aYpU+Y9G5eP3PWuhdPCoKQw5uJ2mdmK8GB5YxNXXsd/bSlHgqgPFR X-Gm-Gg: AfdE7cnmdRmB50Bgp8SNgInN8d9p5bBCl1ofNt68DCI1EmQZhyt5tQ5QUDze7mp8HLr QyBWK9OA8D7nOctkmoSAAAAkdoMXhKwMWbKkty4OYcPnFjVKnhRNuyvL+l7oxMOFz+GTZ/f2Nhs H+Mce6ZRrInxZETYuL9iBtDIDBJjOcFFG7yl3JyOiIEqDZwyxy5PRiUXCb/oMeZXl4g7eUdVpen G1rNWHt6mObUiAv3DnWPYOucsG5nlshKXc5vwN7Y6LwY5Z9SleqK3aWtx151PBambiGt3GZ/Wo+ OpSHabHNfgeDHQpwzkTGRRvKbooxhWuZskhdTXd73qLT4blKGsfFJH1KGbN94ZCXhKGf4kCvJQJ F+V1dNcJRndECLp/lS+8M8ItqxRaVK6LB9och/+FkYasnT+uDpqHZ1fUeK4Som8GjadIkOiCvDf Rq8Qk2Qy0V4nsUpYSfmS1k X-Received: by 2002:a17:90b:530d:b0:387:e0cb:c8da with SMTP id 98e67ed59e1d1-38dc777c380mr3618351a91.35.1783785676250; Sat, 11 Jul 2026 09:01:16 -0700 (PDT) Received: from titan.lan ([2603:8000:df01:38f7:255c:dd03:30a6:e57b]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-31174ac14f2sm55943287eec.27.2026.07.11.09.01.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 09:01:15 -0700 (PDT) From: Ross Philipson To: linux-kernel@vger.kernel.org, x86@kernel.org, linux-integrity@vger.kernel.org, linux-crypto@vger.kernel.org, linux-efi@vger.kernel.org Cc: ross.philipson@gmail.com, dpsmith@apertussolutions.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, dave.hansen@linux.intel.com, ardb@kernel.org, mjg59@srcf.ucam.org, James.Bottomley@hansenpartnership.com, peterhuewe@gmx.de, jarkko@kernel.org, luto@amacapital.net, herbert@gondor.apana.org.au, davem@davemloft.net, corbet@lwn.net, kanth.ghatraju@oracle.com, daniel.kiper@oracle.com, andrew.cooper3@citrix.com, trenchboot-devel@googlegroups.com Subject: [PATCH v2 01/10] tpm: Initial step to reorganize TPM public headers Date: Sat, 11 Jul 2026 09:01:01 -0700 Message-ID: <20260711160110.267780-2-ross.philipson@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260711160110.267780-1-ross.philipson@gmail.com> References: <20260711160110.267780-1-ross.philipson@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Consolidate TPM1 constants in tpm_command.h and remove duplicate constants from tpm1-cmd.c. 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-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 | 41 ++++++++++++++++------- security/keys/trusted-keys/trusted_tpm1.c | 1 - security/keys/trusted-keys/trusted_tpm2.c | 1 - 7 files changed, 31 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 #include #include 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 -#include extern struct trusted_key_ops trusted_key_tpm_ops; diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 202da079d500..1846d5485a2c 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -25,6 +25,8 @@ #include #include +#include + #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..174b043d8bbc 100644 --- a/include/linux/tpm_command.h +++ b/include/linux/tpm_command.h @@ -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 diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c index 13513819991e..331b1bad6581 100644 --- a/security/keys/trusted-keys/trusted_tpm1.c +++ b/security/keys/trusted-keys/trusted_tpm1.c @@ -18,7 +18,6 @@ #include #include #include -#include #include diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c index 6340823f8b53..29d79c05ed6b 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include -- 2.55.0