Re: [PATCH] Revert commit e918e570415c ("tpm_tis: Remove the HID IFX0102")

2020-07-08 Thread Jarkko Sakkinen 
On Tue, Jul 07, 2020 at 11:41:40AM +0200, Greg Kroah-Hartman wrote:
> On Mon, Jul 06, 2020 at 11:53:42PM +0300, Jarkko Sakkinen wrote:
> > 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 
> > Signed-off-by: Jarkko Sakkinen 
> 
> As the original was asked to be applied to the stable trees, this one
> should have as well.
> 
> I'll go drop it from the stable queues right now, thanks.
> 
> greg k-h

Ah, apologies for my ignorance.

/Jarkko

Re: [PATCH] Revert commit e918e570415c ("tpm_tis: Remove the HID IFX0102")

2020-07-07 Thread Greg Kroah-Hartman 
On Mon, Jul 06, 2020 at 11:53:42PM +0300, Jarkko Sakkinen wrote:
> 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 
> Signed-off-by: Jarkko Sakkinen 

As the original was asked to be applied to the stable trees, this one
should have as well.

I'll go drop it from the stable queues right now, thanks.

greg k-h

Re: [PATCH] Revert commit e918e570415c ("tpm_tis: Remove the HID IFX0102")

2020-07-06 Thread Jarkko Sakkinen 
On Mon, Jul 06, 2020 at 02:47:07PM -0700, Jerry Snitselaar wrote:
> 
> 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 
> > Signed-off-by: Jarkko Sakkinen 
> 
> Reviewed-by: Jerry Snitselaar 

Thanks.

PR sent https://lkml.org/lkml/2020/7/6/1127

/Jarkko

Re: [PATCH] Revert commit e918e570415c ("tpm_tis: Remove the HID IFX0102")

2020-07-06 Thread Jerry Snitselaar 


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 
> Signed-off-by: Jarkko Sakkinen 

Reviewed-by: Jerry Snitselaar 

> ---
>  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(_dev->dev, _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 */

[PATCH] Revert commit e918e570415c ("tpm_tis: Remove the HID IFX0102")

2020-07-06 Thread Jarkko Sakkinen 
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 
Signed-off-by: Jarkko Sakkinen 
---
 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(_dev->dev, _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 */
-- 
2.25.1