[PATCH] tpm: WARN_ONCE() -> pr_warn_once() in tpm_tis_status()

From: jarkko@kernel.org
To: linux-integrity@vger.kernel.org
Cc: Jarkko Sakkinen <jarkko@kernel.org>,
	Guenter Roeck <linux@roeck-us.net>,
	stable@vger.kernel.org, Peter Huewe <peterhuewe@gmx.de>,
	Jason Gunthorpe <jgg@ziepe.ca>,
	Stefan Berger <stefanb@linux.ibm.com>,
	Wang Hai <wanghai38@huawei.com>
Subject: [PATCH] tpm: WARN_ONCE() -> pr_warn_once() in tpm_tis_status()
Date: Tue,  2 Feb 2021 17:33:17 +0200	[thread overview]
Message-ID: <20210202153317.57749-1-jarkko@kernel.org> (raw)

From: Jarkko Sakkinen <jarkko@kernel.org>

An unexpected status from TPM chip is not irrecovable failure of the
kernel. It's only undesirable situation. Thus, change the WARN_ONCE
instance inside tpm_tis_status() to pr_warn_once().

In addition: print the status in the log message because it is actually
useful information lacking from the existing log message.

Suggested-by:  Guenter Roeck <linux@roeck-us.net>
Cc: stable@vger.kernel.org
Fixes: 6f4f57f0b909 ("tpm: ibmvtpm: fix error return code in tpm_ibmvtpm_probe()")
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
 drivers/char/tpm/tpm_tis_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 431919d5f48a..21f67c6366cb 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -202,7 +202,7 @@ static u8 tpm_tis_status(struct tpm_chip *chip)
 		 * acquired.  Usually because tpm_try_get_ops() hasn't
 		 * been called before doing a TPM operation.
 		 */
-		WARN_ONCE(1, "TPM returned invalid status\n");
+		pr_warn_once("TPM returned invalid status: 0x%x\n", status);
 		return 0;
 	}
 
-- 
2.30.0

