From: Jerry Snitselaar <jsnitsel@redhat.com>
To: Hans de Goede <hdegoede@redhat.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>,
equired@linux.intel.com,
justmentioningitbecauseIthinkthatwouldbeagood@linux.intel.com,
linux-integrity@vger.kernel.org, Jason Gunthorpe <jgg@ziepe.ca>,
Peter Huewe <peterhuewe@gmx.de>, Borislav Petkov <bp@alien8.de>,
Nayna Jain <nayna@linux.ibm.com>,
Hans de Goede <jwrdegoede@fedoraproject.org>
Subject: Re: [PATCH v2 0/5] tpm_tis: fix interrupts (again)
Date: Wed, 14 Oct 2020 13:58:04 -0700 [thread overview]
Message-ID: <87sgagv82r.fsf@jsnitsel.users.ipa.redhat.com> (raw)
In-Reply-To: <2553a8f3-6a71-7b05-52ab-8c346e2cb6ec@redhat.com>
Hans de Goede @ 2020-10-14 09:46 MST:
> Hi,
>
> On 10/14/20 6:34 PM, Jerry Snitselaar wrote:
>> Hans de Goede @ 2020-10-14 09:04 MST:
>>
>>> Hi,
>>>
>>> On 10/14/20 5:23 PM, James Bottomley wrote:
>>>> On Wed, 2020-10-14 at 17:03 +0200, Hans de Goede wrote:
>>>>> On 10/13/20 6:05 PM, Jerry Snitselaar wrote:
>>>>>> James Bottomley @ 2020-10-13 08:24 MST:
>>>>>>> On Tue, 2020-10-13 at 08:15 -0700, Jerry Snitselaar wrote:
>>>>>>>> Jarkko Sakkinen @ 2020-10-12 18:17 MST:
>>>> [...]
>>>>>>>>> Jerry, once you have some bandwidth (no rush, does not land
>>>>>>>>> before rc2), it would be great that if you could try this.
>>>>>>>>> I'm emphasizing this just because of the intersection. I
>>>>>>>>> think it would also make senset to get tested-by from Nayna.
>>>>>>>>
>>>>>>>> I will run some tests on some other systems I have access to.
>>>>>>>> As noted in the other email I did a quick test with a t490s
>>>>>>>> with an older bios that exhibits the problem originally
>>>>>>>> reported when Stefan's patch enabled interrupts.
>>>>>>>
>>>>>>> Well, it means there's still some other problem. I was hoping
>>>>>>> that because the rainbow pass system originally exhibited the
>>>>>>> same symptoms (interrupt storm) fixing it would also fix the t490
>>>>>>> and the ineffective EOI bug looked like a great candidate for
>>>>>>> being the root cause.
>>>>>>>
>>>>>>
>>>>>> Adding Hans to the list.
>>>>>>
>>>>>> IIUC in the t490s case the problem lies with the hardware itself.
>>>>>> Hans, is that correct?
>>>>>
>>>>> More or less. AFAIK / have been told by Lenovo it is an issue with
>>>>> the configuration of the inerrupt-type of the GPIO pin used for the
>>>>> IRQ, which is a firmware issue which could be fixed by a BIOS update
>>>>> (the pin is setup as a direct-irq pin for the APIC, so the OS has no
>>>>> control of the IRQ type since with APIC irqs this is all supposed to
>>>>> be setup properly before hand).
>>>>>
>>>>> But it is a model specific issue, if we denylist IRQ usage on this
>>>>> Lenovo model (and probably a few others) then we should be able to
>>>>> restore the IRQ code to normal functionality for all other device
>>>>> models which declare an IRQ in their resource tables.
>>>> I can do that with a quirk, but how do I identify the device? TPM
>>>> manufacturer and version? or do I have to use something like the ACPI
>>>> bios version?
>>>
>>> I'm not sure if the TPM ids are unique to one model/series of laptops.
>>>
>>> So my idea for this was to match on DMI strings, specifically
>>> use a DMI match on the DMI_SYS_VENDOR and DMI_PRODUCT_VERSION
>>> strings (normally one would use DMI_PRODUCT_NAME but for Lenovo
>>> devices the string which you expect to be in DMI_PRODUCT_NAME
>>> is actually in DMI_PRODUCT_VERSION).
>>>
>>> You can easily get the strings for your device by doing:
>>>
>>> cat /sys/class/dmi/id/sys_vendor
>>> cat /sys/class/dmi/id/product_version
>>>
>>> Regards,
>>>
>>> Hans
>> Plus use dmi_get_date(DMI_BIOS_DATE,...) to check
>> if the bios is older than the fixed bios? Has Lenovo
>> released the fixed bios?
>
> Maybe, the fixed BIOS-es which I have seen (for the X1C8,
> broken BIOS was a pre-production BIOS) "fixed" this by
> no longer listing an IRQ in the ACPI resources for the TPM.
>
> Which means that the new BIOS still being on the deny list
> does not matter since the IRQ support won't work anyways as
> we no longer get an IRQ assigned.
>
> So I don't think this is necessary and it will just complicate
> things unnecessarily. This whole saga has already taken way
> too long to fix. So IMHO the simplest fix where we just deny
> list the broken models independent of BIOS versions and move
> on seems best.
>
> Regards,
>
> Hans
This worked for me:
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 0b214963539d..abe674d1de6d 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -27,6 +27,7 @@
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/kernel.h>
+#include <linux/dmi.h>
#include "tpm.h"
#include "tpm_tis_core.h"
@@ -63,6 +64,26 @@ module_param(force, bool, 0444);
MODULE_PARM_DESC(force, "Force device probe rather than using ACPI entry");
#endif
+static int tpm_tis_disable_irq(const struct dmi_system_id *d)
+{
+ pr_notice("tpm_tis: %s detected: disabling interrupts.\n", d->ident);
+ interrupts = false;
+
+ return 0;
+}
+
+static const struct dmi_system_id tpm_tis_dmi_table[] = {
+ {
+ .callback = tpm_tis_disable_irq,
+ .ident = "ThinkPad T490s",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T490s"),
+ },
+ },
+ {}
+};
+
#if defined(CONFIG_PNP) && defined(CONFIG_ACPI)
static int has_hid(struct acpi_device *dev, const char *hid)
{
@@ -192,6 +213,8 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info)
int irq = -1;
int rc;
+ dmi_check_system(tpm_tis_dmi_table);
+
rc = check_acpi_tpm2(dev);
if (rc)
return rc;
next prev parent reply other threads:[~2020-10-14 20:58 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 18:09 [PATCH v2 0/5] tpm_tis: fix interrupts (again) James Bottomley
2020-10-01 18:09 ` [PATCH v2 1/5] tpm_tis: Fix check_locality for correct locality acquisition James Bottomley
2020-10-05 15:34 ` Jarkko Sakkinen
2020-10-05 19:00 ` James Bottomley
2020-10-05 20:32 ` Jarkko Sakkinen
2020-10-19 23:16 ` Jerry Snitselaar
2020-10-24 12:07 ` Jarkko Sakkinen
2020-10-30 12:13 ` Jarkko Sakkinen
2020-10-01 18:09 ` [PATCH v2 2/5] tpm_tis: Clean up locality release James Bottomley
2020-10-05 17:02 ` Jarkko Sakkinen
2020-10-05 19:05 ` James Bottomley
2020-10-05 20:34 ` Jarkko Sakkinen
2020-10-05 17:03 ` Jarkko Sakkinen
2020-10-19 23:17 ` Jerry Snitselaar
2020-10-24 12:10 ` Jarkko Sakkinen
2020-10-30 12:17 ` Jarkko Sakkinen
2020-10-30 15:47 ` James Bottomley
2020-10-30 21:52 ` Jarkko Sakkinen
2020-10-01 18:09 ` [PATCH v2 3/5] tpm_tis: Fix interrupts for TIS TPMs without legacy cycles James Bottomley
2020-10-05 17:05 ` Jarkko Sakkinen
2020-10-20 0:14 ` Jerry Snitselaar
2020-10-24 12:15 ` Jarkko Sakkinen
2020-10-30 12:18 ` Jarkko Sakkinen
2020-10-30 16:06 ` Jerry Snitselaar
2020-11-03 4:16 ` Jarkko Sakkinen
2020-12-01 18:12 ` Jerry Snitselaar
2020-12-01 19:49 ` Jerry Snitselaar
2020-12-01 21:06 ` James Bottomley
2020-12-01 21:47 ` Jerry Snitselaar
2020-10-01 18:09 ` [PATCH v2 4/5] tpm_tis: fix IRQ probing James Bottomley
2020-10-05 17:05 ` Jarkko Sakkinen
2020-10-19 23:41 ` Jerry Snitselaar
2020-10-24 12:17 ` Jarkko Sakkinen
2020-10-30 12:43 ` Jarkko Sakkinen
2020-10-30 15:49 ` James Bottomley
2020-10-30 16:11 ` Jerry Snitselaar
2020-11-03 4:43 ` Jarkko Sakkinen
2020-11-03 23:00 ` Jerry Snitselaar
2020-11-04 0:31 ` Jarkko Sakkinen
2020-11-03 4:17 ` Jarkko Sakkinen
2020-11-06 15:32 ` Jarkko Sakkinen
2020-11-06 16:21 ` James Bottomley
2020-11-06 22:07 ` Jarkko Sakkinen
2020-10-01 18:09 ` [PATCH v2 5/5] Revert "tpm: Revert "tpm_tis_core: Turn on the TPM before probing IRQ's"" James Bottomley
2020-10-19 20:23 ` Jerry Snitselaar
2020-10-19 22:54 ` James Bottomley
2020-10-19 23:40 ` Jerry Snitselaar
2020-10-12 5:39 ` [PATCH v2 0/5] tpm_tis: fix interrupts (again) Jerry Snitselaar
2020-10-13 1:23 ` Jarkko Sakkinen
2020-10-18 5:34 ` Jarkko Sakkinen
2020-10-13 1:17 ` Jarkko Sakkinen
2020-10-13 15:15 ` Jerry Snitselaar
2020-10-13 15:24 ` James Bottomley
2020-10-13 16:05 ` Jerry Snitselaar
2020-10-14 15:03 ` Hans de Goede
2020-10-14 15:23 ` James Bottomley
2020-10-14 16:04 ` Hans de Goede
2020-10-14 16:34 ` Jerry Snitselaar
2020-10-14 16:46 ` Hans de Goede
2020-10-14 17:01 ` Jerry Snitselaar
2020-10-14 17:04 ` Jerry Snitselaar
2020-10-14 20:58 ` Jerry Snitselaar [this message]
2020-10-15 7:38 ` Hans de Goede
2020-10-18 21:09 ` Jarkko Sakkinen
2020-10-15 15:36 ` James Bottomley
2020-10-15 18:48 ` Jerry Snitselaar
2020-10-15 18:57 ` James Bottomley
2020-10-15 19:16 ` Jerry Snitselaar
2020-10-14 16:49 ` James Bottomley
2020-10-18 21:05 ` Jarkko Sakkinen
2020-10-20 23:10 ` Jerry Snitselaar
2020-10-24 12:20 ` Jarkko Sakkinen
2020-10-26 18:29 ` Jerry Snitselaar
2020-10-27 17:14 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sgagv82r.fsf@jsnitsel.users.ipa.redhat.com \
--to=jsnitsel@redhat.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=bp@alien8.de \
--cc=equired@linux.intel.com \
--cc=hdegoede@redhat.com \
--cc=jgg@ziepe.ca \
--cc=justmentioningitbecauseIthinkthatwouldbeagood@linux.intel.com \
--cc=jwrdegoede@fedoraproject.org \
--cc=linux-integrity@vger.kernel.org \
--cc=nayna@linux.ibm.com \
--cc=peterhuewe@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).