Merge tag 'tpmdd-next-v5.8-rc5' of git://git.infradead.org/users/jjs/linux-tpmdd (a6bc851f) · Commits · 戴 / test

Pull tpm fix from Jarkko Sakkinen: "Revert commit ("tpm_tis: Remove the HID IFX0102"). Removing IFX0102 from tpm_tis was not a right move because both tpm_tis and tpm_infineon use the same device ID. A real fix requires quirks added to both drivers. It can probably wait until v5.9 as the bug has existed since 2006" * tag 'tpmdd-next-v5.8-rc5' of git://git.infradead.org/users/jjs/linux-tpmdd: Revert commit ("tpm_tis: Remove the HID IFX0102")

drivers/char/tpm/tpm_tis.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -235,9 +235,17 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
		return tpm_tis_init(&pnp_dev->dev, &tpm_info);
		}

		/*
		* There is a known bug caused by 93e1b7d42e1e ("[PATCH] tpm: add HID module
		* parameter"). This commit added IFX0102 device ID, which is also used by
		* tpm_infineon but ignored to add quirks to probe which driver ought to be
		* used.
		*/

		static struct pnp_device_id tpm_pnp_tbl[] = {
		{"PNP0C31", 0}, /* TPM */
		{"ATM1200", 0}, /* Atmel */
		{"IFX0102", 0}, /* Infineon */
		{"BCM0101", 0}, /* Broadcom */
		{"BCM0102", 0}, /* Broadcom */
		{"NSC1200", 0}, /* National */

Admin message