Revert commit e918e570415c ("tpm_tis: Remove the HID IFX0102")
Subsystems (2)
PATCH 1/1 Revert commit e918e570415c ("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. Revert the commit and add a remark about a bug caused by commit 93e1b7d42e1e ("[PATCH] tpm: add HID module parameter").
--- drivers/char/tpm/tpm_tis.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/char/tpm/tpm_tis.c +8 -0
@@ -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 */
Signature · 1 line
2.25.1
Jarkko Sakkinen @ 2020-07-06 13:53 MST:
Quoted 8 lines
Removing IFX0102 from
tpm_tiswas not a right move because bothtpm_tisandtpm_infineonuse the same device ID. Revert the commit and add a remark about a bug caused by commit93e1b7d42e1e("[PATCH] tpm: add HID module parameter").Fixes e918e570415c ("tpm_tis: Remove the HID IFX0102")Reported-by Peter Huewe <[email protected]>Signed-off-by Jarkko Sakkinen <[email protected]>
Quoted 26 lines
--- drivers/char/tpm/tpm_tis.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/char/tpm/tpm_tis.c +8
-0@@ -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 */
Quoted 8 lines · Jerry Snitselaar
Jarkko Sakkinen @ 2020-07-06 13:53 MST:
Quoted 5 lines
Removing IFX0102 from
tpm_tiswas not a right move because bothtpm_tisandtpm_infineonuse the same device ID. Revert the commit and add a remark about a bug caused by commit93e1b7d42e1e("[PATCH] tpm: add HID module parameter").
Quoted 5 lines
Quoted 3 lines
Fixes e918e570415c ("tpm_tis: Remove the HID IFX0102")Reported-by Peter Huewe <[email protected]>Signed-off-by Jarkko Sakkinen <[email protected]>Reviewed-by Jerry Snitselaar <[email protected]>
Thanks.
PR sent https://lkml.org/lkml/2020/7/6/1127
/Jarkko
Quoted 8 lines · Jarkko Sakkinen
Removing IFX0102 from
tpm_tiswas not a right move because bothtpm_tisandtpm_infineonuse the same device ID. Revert the commit and add a remark about a bug caused by commit93e1b7d42e1e("[PATCH] tpm: add HID module parameter").Fixes e918e570415c ("tpm_tis: Remove the HID IFX0102")Reported-by Peter Huewe <[email protected]>Signed-off-by Jarkko Sakkinen <[email protected]>
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
Quoted 10 lines · Greg Kroah-Hartman
Quoted 8 lines · Jarkko Sakkinen
Removing IFX0102 from
tpm_tiswas not a right move because bothtpm_tisandtpm_infineonuse the same device ID. Revert the commit and add a remark about a bug caused by commit93e1b7d42e1e("[PATCH] tpm: add HID module parameter").Fixes e918e570415c ("tpm_tis: Remove the HID IFX0102")Reported-by Peter Huewe <[email protected]>Signed-off-by Jarkko Sakkinen <[email protected]>
Quoted 6 lines
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