Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
From:   Hermin Anggawijaya <hermin.anggawijaya@alliedtelesis.co.nz>
To:     peterhuewe@gmx.de, jarkko@kernel.org, jgg@ziepe.ca
Cc:     linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org,
        Hermin Anggawijaya <hermin.anggawijaya@alliedtelesis.co.nz>
Subject: [PATCH] tpm: Start the tpm2 before running a self test.
Date:   Wed, 22 Nov 2023 19:55:28 +1300
Message-ID: <20231122065528.1049819-1-hermin.anggawijaya@alliedtelesis.co.nz>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Before sending a command to attempt the self test, the TPM
may need to be started, otherwise the self test returns
TPM2_RC_INITIALIZE value causing a log as follows:
"tpm tpm0: A TPM error (256) occurred attempting the self test".

Signed-off-by: Hermin Anggawijaya <hermin.anggawijaya@alliedtelesis.co.nz=
>
---
 drivers/char/tpm/tpm2-cmd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
index 93545be190a5..0530f3b5f86a 100644
--- a/drivers/char/tpm/tpm2-cmd.c
+++ b/drivers/char/tpm/tpm2-cmd.c
@@ -737,15 +737,15 @@ int tpm2_auto_startup(struct tpm_chip *chip)
 	if (rc)
 		goto out;
=20
+	rc =3D tpm2_startup(chip);
+	if (rc && rc !=3D TPM2_RC_INITIALIZE)
+		goto out;
+
 	rc =3D tpm2_do_selftest(chip);
 	if (rc && rc !=3D TPM2_RC_INITIALIZE)
 		goto out;
=20
 	if (rc =3D=3D TPM2_RC_INITIALIZE) {
-		rc =3D tpm2_startup(chip);
-		if (rc)
-			goto out;
-
 		rc =3D tpm2_do_selftest(chip);
 		if (rc)
 			goto out;
--=20
2.43.0