Revert commit e918e570415c ("tpm_tis: Remove the HID IFX0102") (786a2aa2) · Commits · 戴 / test

Removing IFX0102 from tpm_tis was not a right move because both tpm_tis and tpm_infineon use the same device ID. Revert the commit and add a remark about a bug caused by commit ("[PATCH] tpm: add HID module parameter"). Fixes: ("tpm_tis: Remove the HID IFX0102") Reported-by:

Peter Huewe <peterhuewe@gmx.de> Reviewed-by:

Jerry Snitselaar <jsnitsel@redhat.com> Signed-off-by:

Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

drivers/char/tpm/tpm_tis.c

+8 −0

Original line number	Original line	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);		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[] = {		static struct pnp_device_id tpm_pnp_tbl[] = {
	{"PNP0C31", 0}, /* TPM */		{"PNP0C31", 0}, /* TPM */
	{"ATM1200", 0}, /* Atmel */		{"ATM1200", 0}, /* Atmel */
			{"IFX0102", 0}, /* Infineon */
	{"BCM0101", 0}, /* Broadcom */		{"BCM0101", 0}, /* Broadcom */
	{"BCM0102", 0}, /* Broadcom */		{"BCM0102", 0}, /* Broadcom */
	{"NSC1200", 0}, /* National */		{"NSC1200", 0}, /* National */

Admin message