From nobody Fri Apr 3 16:25:15 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 180D53C944D for ; Tue, 24 Mar 2026 07:18:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774336706; cv=none; b=L66RG7eSGDf7uRO9Nj2/VhSJM9GfIVnZb/QhHUd62EgWF+4KbilDt3w+Jdle/whdobTTinT8NU0TY49c1rP6hhIRmoBCEHifqM6K6COlHn7McQA7ryJDWGN0oB8cFTJqNVAetKXYccEmbH+wsAnLvFFlbmZpvPWT4OWe9ZC+KzU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774336706; c=relaxed/simple; bh=SilugzOMu2AyY0n7FNza7D3+fn1Dwqn99jbo8QgsmZU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G5W5az0on4p8TSXHLqW6FRPVlOI5WxUWmtQ4DWIVHSEEZsZgYk9deZEJ6F+25C6to0nG9xdrxm+rFVUoqBZIG5w9+uWkz18RaKNPQL1DvJCJT69Rduc+xu33cyBCY4uex2fP6oh1dnFEgUFUY5BL1OLK+uC2J+BajkZmlX4HKLQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=R9g45oH7; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=t1UvfYt7; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="R9g45oH7"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="t1UvfYt7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774336696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xQoVz9hmYf6qqip3bEa+gA/UnhF/MBgQeN1TTtkBG3s=; b=R9g45oH7XCXwC9o9dCk9d7TVIOF8Jn9nsK/7xmPi4nOdlbQxMEn4hfJJ/b0sK6x8cXulgK ogTqRz/EXpA+cBShxfudsqxu6LWYKUHuhh+SyhjYi1a4a5u5WKYuZXggCYMsuAdUyzE21Z fXFcnh9FUctCqaUJRAex2jVWu8HgwAc= Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-211-5fnr2KBjMouOOxCbUDqUTg-1; Tue, 24 Mar 2026 03:18:15 -0400 X-MC-Unique: 5fnr2KBjMouOOxCbUDqUTg-1 X-Mimecast-MFC-AGG-ID: 5fnr2KBjMouOOxCbUDqUTg_1774336694 Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-829b8bb5173so1995372b3a.3 for ; Tue, 24 Mar 2026 00:18:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774336694; x=1774941494; 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=xQoVz9hmYf6qqip3bEa+gA/UnhF/MBgQeN1TTtkBG3s=; b=t1UvfYt77/Spz8U/Y8P93z5BQKpZ4nrSQ9H5wEP4D+j5mn57B1eUJ/WLmiG3IoPKKt 52mJhr/4SgBGe/3JtNabW6guSk0EDDOJAIQk3ULZ295mSrpQ2a6+GuG1N2Ex0b7e7LwY Mz03k2ansjge8kf3q5gcKmLSyDIViy8Cfs6X1t+s6t3oJgyN3w/XMJOVqz554sJTiBcE A9pTkzrmCvGAJTN/AkFW7JRZTP68MhU3qreBNbTBL04ZblUmYLEG9mgpILMu3YecQu4m P8KauZTcMIjmwgH/YDbfUg8uAoGPG9Td9Us9eN/v4N0p2Z6M5SjekWmD5ESvlhYURR2/ YTZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774336694; x=1774941494; 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=xQoVz9hmYf6qqip3bEa+gA/UnhF/MBgQeN1TTtkBG3s=; b=I4v485nw4imaYjR8vh+6UVV0D8ypUwc/MscGm5PYZ+oTcRXacTqzVGxJ4PH0KjkRrC mbdb/nVT4Ctrq40R8lbXQX7d0CnBgOrP21sJ799VSjujGWRP/F8i8wLrR7xFAyT5Pirh RuXP5SUphVER+WiexIQehVdvutxmhdqp4fD+Tz598OhjU4XSMnPkd4K8NiaJTBBsxwJS BF50ZtVLDcRAscZGYNscOoJ9QvhOV4/azDaepyViJI2Ex93kAZHHa1++z0VCd6XX1S2M ooJv8/KiY7aD6G5fBwuobJbpoHzoMKtOOc4+NKCuN3H9+8H6pgY2VuwL4lqo39PVng96 CIzg== X-Gm-Message-State: AOJu0YxnkVlgh2Pa6lpEPCbHTwX2xGKaW5nF67iZCHRIWTFsdVH+C4gW uRilfGIhI+sU+EIAnHcUVPgQHUTJAgR8yFv527a4KxcRqL9z/CScN6haW8Ymy/VrTiFA5uBE9do 2dpPpjUzm597WsDVAZ1p767MeVrjSKwoFKXyoc32h+zvsL/YQFVegsmoha2E79yYXqr0RbdlISj UeMSNq75qgVhxUVNVDT+jY2MnTTqBfxHi6J1U0Wd0mm/YSn2Sa X-Gm-Gg: ATEYQzzjI3ga3W7MKaK9LA8TNb11pMMQ5qiUNSui4XoLJLarOyl6ugy9KwQ6a3BnZfA x8t4B2IzH+Ob2G2lztQcsZeyQv/E6bA16J2TeKY5761Axi6mEktBYF5oulz/H7PrhtdCSSUf/8c TyCwVCK0NkT2GQeXxUGUXlUzbh2Fe6+rXwbC/oCvwW5L9UPL6z15XtgUJYiM0bKLMc1XEiinNIh 6yzgbynQI9VP4JllyBj+kC3NyLSG0bHpP27X1pfyoiXkYvHk7+aBKGqwL4YjzMn9/XYIuoXWsNa /D4zyc6IpuYjM7RJws02UgIjxKt10Ms4ghNQFcPK/pyPnAp4sltwFtF8cRTha2rKBl9q2+hnkwD XBn02HjEP49b5bQW5LrS5P8+W5+9EMCStIZGtHYPJOP1Odyt4UfBQ3EO5c/A8/g== X-Received: by 2002:a05:6a00:22cc:b0:82a:6dc5:4e0c with SMTP id d2e1a72fcca58-82a8c280ccemr13121143b3a.27.1774336694175; Tue, 24 Mar 2026 00:18:14 -0700 (PDT) X-Received: by 2002:a05:6a00:22cc:b0:82a:6dc5:4e0c with SMTP id d2e1a72fcca58-82a8c280ccemr13121104b3a.27.1774336693644; Tue, 24 Mar 2026 00:18:13 -0700 (PDT) Received: from fedora.armenon-thinkpadp16vgen1.bengluru.csb ([49.36.106.26]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82b0409c681sm13597766b3a.37.2026.03.24.00.18.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2026 00:18:13 -0700 (PDT) From: Arun Menon To: linux-kernel@vger.kernel.org Cc: linux-integrity@vger.kernel.org, Jason Gunthorpe , Jarkko Sakkinen , Peter Huewe , Arun Menon Subject: [RFC 2/4] tpm_crb: Add new wrapper function to invoke start method Date: Tue, 24 Mar 2026 12:48:01 +0530 Message-ID: <20260324071803.324774-3-armenon@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260324071803.324774-1-armenon@redhat.com> References: <20260324071803.324774-1-armenon@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" - Extract start invocation code into a separate function called crb_trigger_tpm. This will be helpful in repeatedly calling the start method with different bits set to toggle between start, nextChunk or crbRspRetry behaviours. - Based on the bit set, we signal the TPM to consume contents of the command/response buffer. - No functional change intended. Signed-off-by: Arun Menon --- drivers/char/tpm/tpm_crb.c | 50 ++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index 67c0061d4cab7..10128d078245c 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -445,6 +445,32 @@ static int tpm_crb_smc_start(struct device *dev, unsig= ned long func_id) } #endif =20 +static int crb_trigger_tpm(struct tpm_chip *chip, u32 start_cmd) +{ + struct crb_priv *priv =3D dev_get_drvdata(&chip->dev); + int rc; + /* The reason for the extra quirk is that the PTT in 4th Gen Core CPUs + * report only ACPI start but in practice seems to require both + * CRB start, hence invoking CRB start method if hid =3D=3D MSFT0101. + */ + if (priv->sm =3D=3D ACPI_TPM2_COMMAND_BUFFER || + priv->sm =3D=3D ACPI_TPM2_MEMORY_MAPPED || + !strcmp(priv->hid, "MSFT0101")) + iowrite32(start_cmd, &priv->regs_t->ctrl_start); + if (priv->sm =3D=3D ACPI_TPM2_START_METHOD || + priv->sm =3D=3D ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD) + rc =3D crb_do_acpi_start(chip); + if (priv->sm =3D=3D ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC) { + iowrite32(start_cmd, &priv->regs_t->ctrl_start); + rc =3D tpm_crb_smc_start(&chip->dev, priv->smc_func_id); + } + if (priv->sm =3D=3D ACPI_TPM2_CRB_WITH_ARM_FFA) { + iowrite32(start_cmd, &priv->regs_t->ctrl_start); + rc =3D tpm_crb_ffa_start(CRB_FFA_START_TYPE_COMMAND, chip->locality); + } + return rc; +} + static int crb_send(struct tpm_chip *chip, u8 *buf, size_t bufsiz, size_t = len) { struct crb_priv *priv =3D dev_get_drvdata(&chip->dev); @@ -470,29 +496,7 @@ static int crb_send(struct tpm_chip *chip, u8 *buf, si= ze_t bufsiz, size_t len) /* Make sure that cmd is populated before issuing start. */ wmb(); =20 - /* The reason for the extra quirk is that the PTT in 4th Gen Core CPUs - * report only ACPI start but in practice seems to require both - * CRB start, hence invoking CRB start method if hid =3D=3D MSFT0101. - */ - if (priv->sm =3D=3D ACPI_TPM2_COMMAND_BUFFER || - priv->sm =3D=3D ACPI_TPM2_MEMORY_MAPPED || - !strcmp(priv->hid, "MSFT0101")) - iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); - - if (priv->sm =3D=3D ACPI_TPM2_START_METHOD || - priv->sm =3D=3D ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD) - rc =3D crb_do_acpi_start(chip); - - if (priv->sm =3D=3D ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC) { - iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); - rc =3D tpm_crb_smc_start(&chip->dev, priv->smc_func_id); - } - - if (priv->sm =3D=3D ACPI_TPM2_CRB_WITH_ARM_FFA) { - iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); - rc =3D tpm_crb_ffa_start(CRB_FFA_START_TYPE_COMMAND, chip->locality); - } - + rc =3D crb_trigger_tpm(chip, CRB_START_INVOKE); if (rc) return rc; =20 --=20 2.53.0