Jarkko Sakkinen @ 2020-07-06 13:53 MST:

> 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 93e1b7d42e1e ("[PATCH] tpm: add HID
> module parameter").
>
> Fixes: e918e570415c ("tpm_tis: Remove the HID IFX0102")
> Reported-by: Peter Huewe <peterhu...@gmx.de>
> Signed-off-by: Jarkko Sakkinen <jarkko.sakki...@linux.intel.com>

Reviewed-by: Jerry Snitselaar <jsnit...@redhat.com>

> ---
>  drivers/char/tpm/tpm_tis.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
> index c58ea10fc92f..0b214963539d 100644
> --- a/drivers/char/tpm/tpm_tis.c
> +++ b/drivers/char/tpm/tpm_tis.c
> @@ -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 */

Reply via email to