From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 5AD9D36DA14 for ; Mon, 18 May 2026 15:17:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779117467; cv=none; b=ZGu2CakA8MurZIHOyxOXgUUGYZqkIN9F4yl4iXvRYOSwn9aX8JlaguFoNn+EIat4aimEvbdz7H5gQ/o7ysut2RHImRaOTKke7ICigW5oxKgkrah3SL5W0+d93TmWjvsSM8EujjDUwhjwmxzbwsDurahZn5TxaSlh2Yofxmh6Wgg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779117467; c=relaxed/simple; bh=VxX+WokTYMcXgCaqGRDIyCcANcY+2xvqODyU/qFVdVM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FroR0HLcntL+P3T7cPQJHEGih5uU2JmsT++7WeQU2ZKWWpRGCt9RxPG+C2fRuUbLgpOqqq0WVXGq6RPLbL0I9Qworj+stNSXif7BAgvB6XCAInLwaD9ChLzI6wzYNw+vzG/mY4pLvinwOSXKFzAAG88RiWAz4FcJpg29IGhHsNM= 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=DP6NCYpM; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=K/dEWHiz; arc=none smtp.client-ip=170.10.133.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="DP6NCYpM"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="K/dEWHiz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779117463; 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=BnPbGV+ZY+zNpAkrnk2fLEpoynLtxIvL3bKUiWP9NRA=; b=DP6NCYpM0NGHQQ1oeKUqR2SjfkN3tw9eb9ESrKbJO83PnQC9u7EsuCXQOVtMQ1QFATqBDv HbfdMY1P30sEztm2C7fHGjoYAox7cSH9+rdOUKfw/lt1hufPGhIvXdMWFmajsYuJxwiHHu ZkGnFK2xIyj1BSiBC1kMzLXVxwMaYyE= 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-546-MBkyAKpiO62xsxT7jlyJZA-1; Mon, 18 May 2026 11:17:42 -0400 X-MC-Unique: MBkyAKpiO62xsxT7jlyJZA-1 X-Mimecast-MFC-AGG-ID: MBkyAKpiO62xsxT7jlyJZA_1779117461 Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-82f6b984b3aso1261552b3a.3 for ; Mon, 18 May 2026 08:17:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1779117460; x=1779722260; 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=BnPbGV+ZY+zNpAkrnk2fLEpoynLtxIvL3bKUiWP9NRA=; b=K/dEWHizDObMJTwxpvIbl2efKOkhTXlmVe1Sxt64+ySr1P2vFObDNmyNz3O4U5UUyQ 1nMGrFixun2KCJnQ2RKi+EvpGmKxdwN4m4Gu/8RYqdSm0JlsdDb24HSJWFe0+jD6ZX8Q 1UxGel5Ikus6b9ZMxhaBYIzvM8f07jWprr+nelBG/HX96lpdNzp90E2oxiftGt5w0Mzo WtlM9zm/JR+pOQv0oq5yanmSwZFbrD1B0XMlIUxC36/AEefYTW6ibSYCW00xd/TJcMTc JiShoM0QaM9hlgw0/4NrFLno2MftsCueqduaBq+0jvRTXjbuzoKOq+N4OI/5xKZRrEqR lkyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779117460; x=1779722260; 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=BnPbGV+ZY+zNpAkrnk2fLEpoynLtxIvL3bKUiWP9NRA=; b=N9m4IlmIc23Y0pthouE6w6d1a+7uRE79s0tPEKKvfAYFJBRH0eStMaa0ylJKwdz2x8 aNGXHYeue9ViLpWvHEmg1pQyC8lZaKFpZL+7xqTlMMCXRWDTlhX0pOecGI3TRntKhjr3 CY4uQaOLV4IRtZ6KeUaHkms0oUg6Ghsh5+yQLNTfpP8RE7afHp9GCC81R7mfiTH6Zag7 dGUSt3jy0QeTus75v23f3AhXIZ6JoUiF/JmBHVmvyKJrn2PMtbK8bQdlKXXnweeL18L/ sx3dokDFmiUaM+sTpehPOI9NH1zk6ko75HpT72tTTtXP8TzdccHmXvNqlDJcb/BWnXKi yIPQ== X-Gm-Message-State: AOJu0YwW/mG1kqNUnSanQUshyBdeXW/fiZAsWYsM+qL7VoKei3iHhfRL VhM6LZPVE+MTnFzb4eJLtgCIoyjkrM6I7DDfxn7zjnLMZ4Kuk0v6J7CLOWSSKT0U1pcVVHSKOyt tYez/ZkK6iI07i5/HGiGEJdFsQ1clYicCrDT9vNPfIy9HgU0FQDbRgjkjIZ7h+mVhk11Ng+DkW0 tISGMw8QGrUFphAY+C871fgKzobybWPfMwihqBaviRpzLle3T/ X-Gm-Gg: Acq92OFUYf7qrRHWP83YIY/O7aGSVwmwFpg2mLhmJKq6bciSr+ctLn4TcTHg25a3P3v VLE0A41JC0CEG2V53W3juwEZIsfyDY+ZX/jWwvogbP8GYQNJtGKQo5X+27v/XWWz8Fhzr5W6VTP i5N3b1Wz5Fx9nFP5Mir8TNy2ivqOLDZL9rEHFyRPN6NkZAWTb1zCRHSSeuDxSME5WGyngBulK9/ r5IWBKZq93MMsLriQJvkZO7HDf/HZ5OlG1XW+ER5WS5ZE0Ue0J4kziTltCcaaivlIdyN+SyzJYw Wj4iBUUpSRa1uqhgcIRlESUzu5qllRYkU8T1YJFNoDl2feygPDFwQfsq8i5jkxZXQdIaoYKMhxq Ys1pSNUp6xyHJj7/t/WuB7b9MY9KPmuen3F3hll7hdeVNcdqOym+P3b9RgoKIzz8= X-Received: by 2002:a05:6a00:950f:b0:838:c01a:7a50 with SMTP id d2e1a72fcca58-83f33d8c1ddmr14067548b3a.30.1779117460349; Mon, 18 May 2026 08:17:40 -0700 (PDT) X-Received: by 2002:a05:6a00:950f:b0:838:c01a:7a50 with SMTP id d2e1a72fcca58-83f33d8c1ddmr14067498b3a.30.1779117459638; Mon, 18 May 2026 08:17:39 -0700 (PDT) Received: from fedora.armenon-thinkpadp16vgen1.bengluru.csb ([49.36.104.172]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83f197815cesm18181153b3a.24.2026.05.18.08.17.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2026 08:17:39 -0700 (PDT) From: Arun Menon To: linux-kernel@vger.kernel.org Cc: Jarkko Sakkinen , linux-integrity@vger.kernel.org, Jason Gunthorpe , Peter Huewe , Arun Menon Subject: [PATCH v3 2/6] tpm_crb: Split start method into a separate header Date: Mon, 18 May 2026 20:47:20 +0530 Message-ID: <20260518151724.730443-3-armenon@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260518151724.730443-1-armenon@redhat.com> References: <20260518151724.730443-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: 8bit From: Arun Menon The current implementation handles different platform start methods (ACPI, ARM SMC, and ARM FFA) directly within crb_send(). Move this logic into a new helper function, tpm_crb_start(). This is a pure refactor with no functional changes 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 d76f9e30f036..9a2f512b4ae3 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -446,6 +446,32 @@ static int tpm_crb_smc_start(struct device *dev, unsigned long func_id) } #endif +static int tpm_crb_start(struct tpm_chip *chip) +{ + struct crb_priv *priv = dev_get_drvdata(&chip->dev); + int rc = 0; + /* 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 == MSFT0101. + */ + if (priv->sm == ACPI_TPM2_COMMAND_BUFFER || + priv->sm == ACPI_TPM2_MEMORY_MAPPED || + !strcmp(priv->hid, "MSFT0101")) + iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); + if (priv->sm == ACPI_TPM2_START_METHOD || + priv->sm == ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD) + rc = crb_do_acpi_start(chip); + if (priv->sm == ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC) { + iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); + rc = tpm_crb_smc_start(&chip->dev, priv->smc_func_id); + } + if (priv->sm == ACPI_TPM2_CRB_WITH_ARM_FFA) { + iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); + rc = 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 = dev_get_drvdata(&chip->dev); @@ -471,29 +497,7 @@ static int crb_send(struct tpm_chip *chip, u8 *buf, size_t bufsiz, size_t len) /* Make sure that cmd is populated before issuing start. */ wmb(); - /* 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 == MSFT0101. - */ - if (priv->sm == ACPI_TPM2_COMMAND_BUFFER || - priv->sm == ACPI_TPM2_MEMORY_MAPPED || - !strcmp(priv->hid, "MSFT0101")) - iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); - - if (priv->sm == ACPI_TPM2_START_METHOD || - priv->sm == ACPI_TPM2_COMMAND_BUFFER_WITH_START_METHOD) - rc = crb_do_acpi_start(chip); - - if (priv->sm == ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC) { - iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); - rc = tpm_crb_smc_start(&chip->dev, priv->smc_func_id); - } - - if (priv->sm == ACPI_TPM2_CRB_WITH_ARM_FFA) { - iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); - rc = tpm_crb_ffa_start(CRB_FFA_START_TYPE_COMMAND, chip->locality); - } - + rc = tpm_crb_start(chip); if (rc) return rc; -- 2.54.0