| From 69330af965edbb579c0e6f4aa1dabcf5a4f82500 Mon Sep 17 00:00:00 2001 |
| From: Stefan Berger <stefanb@linux.ibm.com> |
| Date: Tue, 26 Nov 2019 08:17:52 -0500 |
| Subject: [PATCH] tpm: Revert "tpm_tis_core: Set TPM_CHIP_FLAG_IRQ before |
| probing for interrupts" |
| |
| commit dda8b2af395b2ed508e2ef314ae32e122841b447 upstream. |
| |
| There has been a bunch of reports (one from kernel bugzilla linked) |
| reporting that when this commit is applied it causes on some machines |
| boot freezes. |
| |
| Unfortunately hardware where this commit causes a failure is not widely |
| available (only one I'm aware is Lenovo T490), which means we cannot |
| predict yet how long it will take to properly fix tpm_tis interrupt |
| probing. |
| |
| Thus, the least worst short term action is to revert the code to the |
| state before this commit. In long term we need fix the tpm_tis probing |
| code to work on machines that Stefan's fix was supposed to fix. |
| |
| Link: https://bugzilla.kernel.org/show_bug.cgi?id=205935 |
| Fixes: 1ea32c83c699 ("tpm_tis_core: Set TPM_CHIP_FLAG_IRQ before probing for interrupts") |
| Cc: stable@vger.kernel.org |
| Cc: Jerry Snitselaar <jsnitsel@redhat.com> |
| Cc: Dan Williams <dan.j.williams@intel.com> |
| Tested-by: Dan Williams <dan.j.williams@intel.com> |
| Tested-by: Xiaoping Zhou <xiaoping.zhou@intel.com> |
| Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> |
| Reported-by: Jerry Snitselaar <jsnitsel@redhat.com> |
| Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c |
| index 270f43acbb77..ffa9048d8f6c 100644 |
| --- a/drivers/char/tpm/tpm_tis_core.c |
| +++ b/drivers/char/tpm/tpm_tis_core.c |
| @@ -981,7 +981,6 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, |
| } |
| |
| tpm_chip_start(chip); |
| - chip->flags |= TPM_CHIP_FLAG_IRQ; |
| if (irq) { |
| tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED, |
| irq); |
| -- |
| 2.7.4 |
| |
