stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] tpm: WARN_ONCE() -> dev_warn_once() in tpm_tis_status()
@ 2021-02-02 22:21 Jarkko Sakkinen
  0 siblings, 0 replies; only message in thread
From: Jarkko Sakkinen @ 2021-02-02 22:21 UTC (permalink / raw)
  To: linux-integrity
  Cc: Jarkko Sakkinen, Guenter Roeck, Stefan Berger, stable,
	Peter Huewe, Jason Gunthorpe, Wang Hai

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 dev_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>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
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>
---
v2:
- Use dev_warn_once() instead of pr_warn_once(), as suggested by Jason.
 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..22b6c751c33a 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");
+		dev_warn_once(&chip->dev, "TPM returned invalid status: 0x%x\n", status);
 		return 0;
 	}
 
-- 
2.30.0


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2021-02-02 22:25 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-02 22:21 [PATCH v2] tpm: WARN_ONCE() -> dev_warn_once() in tpm_tis_status() Jarkko Sakkinen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).