From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f51.google.com (mail-dl1-f51.google.com [74.125.82.51]) (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 65DA13EDAD3 for ; Fri, 15 May 2026 21:14:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778879684; cv=none; b=ZG+S+Xg9eQHWK6ipFpjKEAJ7e5XZdaNeUYq3KG2B36gWN13Iya/iRnhe+7qyHzjPa0SKLT45Df9puehM1gcPCvP/++GnYJcVytAQRmEHaNgBkj8wckLlDVoFXjx3hbcb/3/oTv+7nSmLA9k4m74ZXhQkE929LtTZUZ1Pge/+NDc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778879684; c=relaxed/simple; bh=nAjY4qir7F1ZCb9sP0iaASf/Q4ek1ELKrjEEDlH4RuU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NzrR2iL6B1AU2BOsTEvNtGVheDFwCJS+S78eMrYg4lJSF41foE8oNYbD/KrJsNtwyu5TkIXLRwIg0HbfbpF2ZZsR3hPD6prwRMeceqh+Y3tpT6peXpodqmDikBUniJcKyDv/0SbwPqlzLKclX85QneHuTfZpPW+G43EDJmwku3I= 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=kMt1JGv/; arc=none smtp.client-ip=74.125.82.51 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="kMt1JGv/" Received: by mail-dl1-f51.google.com with SMTP id a92af1059eb24-1329fc4bf77so360281c88.1 for ; Fri, 15 May 2026 14:14:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778879681; x=1779484481; 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; bh=n6vamoagHMf4GbheCVmViNC3dNcySHzOx3Jk2wuZ+G0=; b=kMt1JGv/t/PApi4zH2l6JC0oM4q8sbVYdiieItDRPnWX+QyHj4LKYKASLJvT3cmuF2 nM+4V2UwPx9QF6/jXnpo+pcpbNaXLlnKXK6mwGMGkr8iMr1662J4oytEX28j7ExSNnM/ 8pCnPslcCOEzkKQ8YPxxhpb4pz7/QVB4Uim61/HpKLM3ae2WHDGjAXzLR4u+U1N/hNn6 nDmqqE0+yhabh4vtuMGgDF9iZmjkG0rieF0FUHMPowWyVr75Zxzvq5twUKlRkpBcxXNl ahg5tSd+BFQ5TkUfsOumYV+j4jKdfOOLWNBHc4A/yJ0XzQ93kDOv0S00WbN0DvK7pMb0 3wsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778879681; x=1779484481; 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; bh=n6vamoagHMf4GbheCVmViNC3dNcySHzOx3Jk2wuZ+G0=; b=ebo0OxwUXmxOfWpVozWC/N3jshrs6cnqbRaUklRGJaCX9vyHT+C2GphZGtEe5/dZum CtkLIwV1u1QXSgvwPg5ne/Ir/8gz2qykPZqR3ym/7HySo7f7mqcN8dO8joGxP4T3WPzs X/CJg7fCyySqhyDUPAwVeC2mUMFnAo0pbFsGZIdDWqQ3xrKaa6p7AZ3d0AyCDpr6Y3CD 8Q9DJqUzE8yeHUB2i9bSRvh9qaJR0XEllt1bOZGBavBYnvNU7bKnAX0oucEeYhgvgnBi dJ5eJ2PVOpC9mVunu+VIpAxkknwFlDgC8TUyJUG49j3b/q5ccCQs/wbNohboDGTknune PdsQ== X-Forwarded-Encrypted: i=1; AFNElJ+PJOoUcUNiHf4Y7E2mldV4fck0lbsLsjvEOzLVf2syeiBemlGN+OG//zai1yGg03CNLu1DyQvmdP/4PhOHDg4=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7eXWFTKximnhdlNN6CIAiih+Vj4GJVgPY44A09xeWUUx62FYH 1s8b+vVL2aRFNY4RU6+93mGbfGCGN7esI/51G5sN8AiUOPiZVMbOBNpF X-Gm-Gg: Acq92OF7L0bClYmW8y3ncGSQylaFZN4Kb4OWx7vVo5QZW/1jEJvPGNpLFZaBOSfz6sE LvW9JNm1WVHTwJg9vwzlbIBxxex9Cjxb32ln7nMD2sTkqBdhNapIt4doep/BAKvXhKbT3yCrvks LAATZNZAJIhpt/bkSnS1tFCBOVNKApSmvpRqyuOkAGciZDrV4Ew7hUktX67JA76Znx5jmdTh1Lp CBkCMnVKnVHnH3x1S9LjRkaxQi3oMHrHkLkNyAQdUmJ43H0XAAehKjoO3KW9ggYIQ5MGrzaNNM/ ZdDURO7kpF9hb6ldCTCcQJdAqPqrTouVd02tBZvyR2WQq4XO8u5u+iXsbQT/uhfsrJYYemoQjsP 0jveGOViuYNB/LPfEE83yscs6U75JZZxckJccW/KSJqN3Mqz4mC3owzfPNYxEMEjg/UWy0zmd6x uwyBqsUvtPUmigdLfHatfT3Tnpuuv5tBM= X-Received: by 2002:a05:7022:f10e:b0:12d:ed19:e6aa with SMTP id a92af1059eb24-1350494e78fmr2605508c88.33.1778879681459; Fri, 15 May 2026 14:14:41 -0700 (PDT) Received: from mimas.lan ([2603:8000:df01:38f7:a6bb:6dff:fecf:e71a]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-134cbcb9ed3sm11076036c88.1.2026.05.15.14.14.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2026 14:14:41 -0700 (PDT) From: Ross Philipson To: linux-kernel@vger.kernel.org, x86@kernel.org, linux-integrity@vger.kernel.org, linux-doc@vger.kernel.org, linux-crypto@vger.kernel.org, kexec@lists.infradead.org, linux-efi@vger.kernel.org, iommu@lists.linux.dev 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, jgg@ziepe.ca, luto@amacapital.net, nivedita@alum.mit.edu, herbert@gondor.apana.org.au, davem@davemloft.net, corbet@lwn.net, ebiederm@xmission.com, dwmw2@infradead.org, baolu.lu@linux.intel.com, kanth.ghatraju@oracle.com, daniel.kiper@oracle.com, andrew.cooper3@citrix.com, trenchboot-devel@googlegroups.com Subject: [PATCH v16 10/38] tpm-buf: Add TPM buffer support header for standalone reuse Date: Fri, 15 May 2026 14:13:42 -0700 Message-ID: <20260515211410.31440-11-ross.philipson@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260515211410.31440-1-ross.philipson@gmail.com> References: <20260515211410.31440-1-ross.philipson@gmail.com> Precedence: bulk X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Extract all the functions and definitions for TPM buffer handling and separate them into their own header. Signed-off-by: Ross Philipson --- drivers/char/tpm/tpm-buf.c | 4 ++- include/linux/tpm.h | 34 +---------------------- include/linux/tpm_buf.h | 57 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 34 deletions(-) create mode 100644 include/linux/tpm_buf.h diff --git a/drivers/char/tpm/tpm-buf.c b/drivers/char/tpm/tpm-buf.c index e79a8071c9ee..e81ce7215b1a 100644 --- a/drivers/char/tpm/tpm-buf.c +++ b/drivers/char/tpm/tpm-buf.c @@ -4,7 +4,9 @@ */ #include -#include +#include +#include +#include static void __tpm_buf_size_invariant(struct tpm_buf *buf, u16 buf_size) { diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 0a56f6c1ea98..0db277af45c3 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -26,6 +26,7 @@ #include #include +#include struct tpm_chip; struct trusted_key_payload; @@ -200,44 +201,11 @@ enum tpm_chip_flags { #define to_tpm_chip(d) container_of(d, struct tpm_chip, dev) -enum tpm_buf_flags { - /* TPM2B format: */ - TPM_BUF_TPM2B = BIT(0), - /* The buffer is in invalid and unusable state: */ - TPM_BUF_INVALID = BIT(1), -}; - -/* - * A buffer for constructing and parsing TPM commands, responses and sized - * (TPM2B) buffers. - */ -struct tpm_buf { - u8 flags; - u8 handles; - u16 length; - u16 capacity; - u8 data[]; -}; - struct tpm2_hash { unsigned int crypto_id; unsigned int tpm_id; }; -void tpm_buf_init(struct tpm_buf *buf, u16 buf_size); -void tpm_buf_init_sized(struct tpm_buf *buf, u16 buf_size); -void tpm_buf_reset(struct tpm_buf *buf, u16 tag, u32 ordinal); -void tpm_buf_reset_sized(struct tpm_buf *buf); -u16 tpm_buf_length(struct tpm_buf *buf); -void tpm_buf_append(struct tpm_buf *buf, const u8 *new_data, u16 new_length); -void tpm_buf_append_u8(struct tpm_buf *buf, const u8 value); -void tpm_buf_append_u16(struct tpm_buf *buf, const u16 value); -void tpm_buf_append_u32(struct tpm_buf *buf, const u32 value); -u8 tpm_buf_read_u8(struct tpm_buf *buf, off_t *offset); -u16 tpm_buf_read_u16(struct tpm_buf *buf, off_t *offset); -u32 tpm_buf_read_u32(struct tpm_buf *buf, off_t *offset); -void tpm_buf_append_handle(struct tpm_buf *buf, u32 handle); - /* * Check if TPM device is in the firmware upgrade mode. */ diff --git a/include/linux/tpm_buf.h b/include/linux/tpm_buf.h new file mode 100644 index 000000000000..7f8abb59de24 --- /dev/null +++ b/include/linux/tpm_buf.h @@ -0,0 +1,57 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Following copyright information was take from the original file + * where the definitions were moved from: + * + * Copyright (C) 2004,2007,2008 IBM Corporation + * + * Authors: + * Leendert van Doorn + * Dave Safford + * Reiner Sailer + * Kylene Hall + * Debora Velarde + * + * Maintained by: + * + * Device driver for TCG/TCPA TPM (trusted platform module). + * Specifications at www.trustedcomputinggroup.org + */ + +#ifndef __LINUX_TPM_BUF_H__ +#define __LINUX_TPM_BUF_H__ + +enum tpm_buf_flags { + /* TPM2B format: */ + TPM_BUF_TPM2B = BIT(0), + /* The buffer is in invalid and unusable state: */ + TPM_BUF_INVALID = BIT(1), +}; + +/* + * A buffer for constructing and parsing TPM commands, responses and sized + * (TPM2B) buffers. + */ +struct tpm_buf { + u8 flags; + u8 handles; + u16 length; + u16 capacity; + u8 data[]; +}; + +void tpm_buf_init(struct tpm_buf *buf, u16 buf_size); +void tpm_buf_init_sized(struct tpm_buf *buf, u16 buf_size); +void tpm_buf_reset(struct tpm_buf *buf, u16 tag, u32 ordinal); +void tpm_buf_reset_sized(struct tpm_buf *buf); +u16 tpm_buf_length(struct tpm_buf *buf); +void tpm_buf_append(struct tpm_buf *buf, const u8 *new_data, u16 new_length); +void tpm_buf_append_u8(struct tpm_buf *buf, const u8 value); +void tpm_buf_append_u16(struct tpm_buf *buf, const u16 value); +void tpm_buf_append_u32(struct tpm_buf *buf, const u32 value); +u8 tpm_buf_read_u8(struct tpm_buf *buf, off_t *offset); +u16 tpm_buf_read_u16(struct tpm_buf *buf, off_t *offset); +u32 tpm_buf_read_u32(struct tpm_buf *buf, off_t *offset); +void tpm_buf_append_handle(struct tpm_buf *buf, u32 handle); + +#endif -- 2.47.3