xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tpm: Replace WARN_ONCE() with dev_err_once() in tpm_tis_status()

Browse Source 
commit 0178f9d0f60ba07e09bab57381a3ef18e2c1fd7f upstream.

Do not tear down the system when getting invalid status from a TPM chip.
This can happen when panic-on-warn is used.

Instead, introduce TPM_TIS_INVALID_STATUS bitflag and use it to trigger
once the error reporting per chip. In addition, print out the value of
TPM_STS for improved forensics.

Link: https://lore.kernel.org/keyrings/YKzlTR1AzUigShtZ@kroah.com/
Fixes: 55707d531a ("tpm_tis: Add a check for invalid status")
Cc: stable@vger.kernel.org
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jarkko Sakkinen
2021-06-09 16:26:19 +03:00
committed by Greg Kroah-Hartman
parent b5a2b5b642
commit 97cbddc8a2
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/char/tpm/tpm_tis_core.c
View File

@@ -196,13 +196,24 @@ static u8 tpm_tis_status(struct tpm_chip *chip)
return 0; return 0;
if (unlikely((status & TPM_STS_READ_ZERO) != 0)) { if (unlikely((status & TPM_STS_READ_ZERO) != 0)) {
if (!test_and_set_bit(TPM_TIS_INVALID_STATUS, &priv->flags)) {
/* /*
* If this trips, the chances are the read is * If this trips, the chances are the read is
* returning 0xff because the locality hasn't been * returning 0xff because the locality hasn't been
* acquired. Usually because tpm_try_get_ops() hasn't * acquired. Usually because tpm_try_get_ops() hasn't
* been called before doing a TPM operation. * been called before doing a TPM operation.
*/ */
WARN_ONCE(1, "TPM returned invalid status\n"); dev_err(&chip->dev, "invalid TPM_STS.x 0x%02x, dumping stack for forensics\n",
status);
/*
* Dump stack for forensics, as invalid TPM_STS.x could be
* potentially triggered by impaired tpm_try_get_ops() or
* tpm_find_get_ops().
*/
dump_stack();
}
return 0; return 0;
} }

3
drivers/char/tpm/tpm_tis_core.h
View File

@@ -83,6 +83,7 @@ enum tis_defaults {
enum tpm_tis_flags { enum tpm_tis_flags {
TPM_TIS_ITPM_WORKAROUND = BIT(0), TPM_TIS_ITPM_WORKAROUND = BIT(0),
TPM_TIS_INVALID_STATUS = BIT(1),
}; };
struct tpm_tis_data { struct tpm_tis_data {
@@ -90,7 +91,7 @@ struct tpm_tis_data {
int locality; int locality;
int irq; int irq;
bool irq_tested; bool irq_tested;
unsigned int flags; unsigned long flags;
void __iomem *ilb_base_addr; void __iomem *ilb_base_addr;
u16 clkrun_enabled; u16 clkrun_enabled;
wait_queue_head_t int_queue; wait_queue_head_t int_queue;