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

From
Stefan Berger <stefanb@linux.ibm.com>
Date
2021-02-02 16:09:06
Also in
stable
Reply to
jarkko@kernel.org, 2021-02-02
On 2/2/21 10:33 AM, jarkko@kernel.org wrote:
quoted hunk ↗ jump to hunk
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: <redacted>
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;
  	}
  
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Thread (13 messages) 13 messages, 6 authors, last reply 2021-02-03
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help