From 26b73fbc319889cbdd93b5fa773f5e670f2ce517 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 7 Jul 2020 11:42:35 +0200 Subject: [PATCH] drop tpm_tis-remove-the-hid-ifx0102.patch from everywhere as it is being reverted upstream --- queue-4.14/series | 1 - .../tpm_tis-remove-the-hid-ifx0102.patch | 52 ------------------- queue-4.19/series | 1 - .../tpm_tis-remove-the-hid-ifx0102.patch | 52 ------------------- queue-4.4/series | 1 - .../tpm_tis-remove-the-hid-ifx0102.patch | 52 ------------------- queue-4.9/series | 1 - .../tpm_tis-remove-the-hid-ifx0102.patch | 52 ------------------- queue-5.4/series | 1 - .../tpm_tis-remove-the-hid-ifx0102.patch | 52 ------------------- queue-5.7/series | 1 - .../tpm_tis-remove-the-hid-ifx0102.patch | 52 ------------------- 12 files changed, 318 deletions(-) delete mode 100644 queue-4.14/tpm_tis-remove-the-hid-ifx0102.patch delete mode 100644 queue-4.19/tpm_tis-remove-the-hid-ifx0102.patch delete mode 100644 queue-4.4/tpm_tis-remove-the-hid-ifx0102.patch delete mode 100644 queue-4.9/tpm_tis-remove-the-hid-ifx0102.patch delete mode 100644 queue-5.4/tpm_tis-remove-the-hid-ifx0102.patch delete mode 100644 queue-5.7/tpm_tis-remove-the-hid-ifx0102.patch diff --git a/queue-4.14/series b/queue-4.14/series index a550f03e8ed..aa3f69f4bfe 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -8,7 +8,6 @@ mm-slub.c-fix-corrupted-freechain-in-deactivate_slab.patch mm-slub-fix-stack-overruns-with-slub_stats.patch usb-usbtest-fix-missing-kfree-dev-buf-in-usbtest_dis.patch kgdb-avoid-suspicious-rcu-usage-warning.patch -tpm_tis-remove-the-hid-ifx0102.patch crypto-af_alg-fix-use-after-free-in-af_alg_accept-due-to-bh_lock_sock.patch cxgb4-use-unaligned-conversion-for-fetching-timestam.patch cxgb4-parse-tc-u32-key-values-and-masks-natively.patch diff --git a/queue-4.14/tpm_tis-remove-the-hid-ifx0102.patch b/queue-4.14/tpm_tis-remove-the-hid-ifx0102.patch deleted file mode 100644 index c60a0c41dc9..00000000000 --- a/queue-4.14/tpm_tis-remove-the-hid-ifx0102.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e918e570415ced9898a51109000a3f39a6e03be5 Mon Sep 17 00:00:00 2001 -From: Jarkko Sakkinen -Date: Thu, 25 Jun 2020 05:31:11 +0300 -Subject: tpm_tis: Remove the HID IFX0102 - -From: Jarkko Sakkinen - -commit e918e570415ced9898a51109000a3f39a6e03be5 upstream. - -Acer C720 running Linux v5.3 reports this in klog: - -tpm_tis: 1.2 TPM (device-id 0xB, rev-id 16) -tpm tpm0: tpm_try_transmit: send(): error -5 -tpm tpm0: A TPM error (-5) occurred attempting to determine the timeouts -tpm_tis tpm_tis: Could not get TPM timeouts and durations -tpm_tis 00:08: 1.2 TPM (device-id 0xB, rev-id 16) -tpm tpm0: tpm_try_transmit: send(): error -5 -tpm tpm0: A TPM error (-5) occurred attempting to determine the timeouts -tpm_tis 00:08: Could not get TPM timeouts and durations -ima: No TPM chip found, activating TPM-bypass! -tpm_inf_pnp 00:08: Found TPM with ID IFX0102 - -% git --no-pager grep IFX0102 drivers/char/tpm -drivers/char/tpm/tpm_infineon.c: {"IFX0102", 0}, -drivers/char/tpm/tpm_tis.c: {"IFX0102", 0}, /* Infineon */ - -Obviously IFX0102 was added to the HID table for the TCG TIS driver by -mistake. - -Fixes: 93e1b7d42e1e ("[PATCH] tpm: add HID module parameter") -Link: https://bugzilla.kernel.org/show_bug.cgi?id=203877 -Cc: stable@vger.kernel.org -Cc: Kylene Jo Hall -Reported-by: Ferry Toth: -Reviewed-by: Jerry Snitselaar -Signed-off-by: Jarkko Sakkinen -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/char/tpm/tpm_tis.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/drivers/char/tpm/tpm_tis.c -+++ b/drivers/char/tpm/tpm_tis.c -@@ -241,7 +241,6 @@ static int tpm_tis_pnp_init(struct pnp_d - 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 */ diff --git a/queue-4.19/series b/queue-4.19/series index 0b01f6d404d..9d00acf3fcb 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -10,7 +10,6 @@ nvme-multipath-set-bdi-capabilities-once.patch nvme-fix-possible-deadlock-when-i-o-is-blocked.patch nvme-multipath-fix-deadlock-between-ana_work-and-sca.patch kgdb-avoid-suspicious-rcu-usage-warning.patch -tpm_tis-remove-the-hid-ifx0102.patch crypto-af_alg-fix-use-after-free-in-af_alg_accept-due-to-bh_lock_sock.patch drm-msm-dpu-fix-error-return-code-in-dpu_encoder_ini.patch cxgb4-use-unaligned-conversion-for-fetching-timestam.patch diff --git a/queue-4.19/tpm_tis-remove-the-hid-ifx0102.patch b/queue-4.19/tpm_tis-remove-the-hid-ifx0102.patch deleted file mode 100644 index 99935449dac..00000000000 --- a/queue-4.19/tpm_tis-remove-the-hid-ifx0102.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e918e570415ced9898a51109000a3f39a6e03be5 Mon Sep 17 00:00:00 2001 -From: Jarkko Sakkinen -Date: Thu, 25 Jun 2020 05:31:11 +0300 -Subject: tpm_tis: Remove the HID IFX0102 - -From: Jarkko Sakkinen - -commit e918e570415ced9898a51109000a3f39a6e03be5 upstream. - -Acer C720 running Linux v5.3 reports this in klog: - -tpm_tis: 1.2 TPM (device-id 0xB, rev-id 16) -tpm tpm0: tpm_try_transmit: send(): error -5 -tpm tpm0: A TPM error (-5) occurred attempting to determine the timeouts -tpm_tis tpm_tis: Could not get TPM timeouts and durations -tpm_tis 00:08: 1.2 TPM (device-id 0xB, rev-id 16) -tpm tpm0: tpm_try_transmit: send(): error -5 -tpm tpm0: A TPM error (-5) occurred attempting to determine the timeouts -tpm_tis 00:08: Could not get TPM timeouts and durations -ima: No TPM chip found, activating TPM-bypass! -tpm_inf_pnp 00:08: Found TPM with ID IFX0102 - -% git --no-pager grep IFX0102 drivers/char/tpm -drivers/char/tpm/tpm_infineon.c: {"IFX0102", 0}, -drivers/char/tpm/tpm_tis.c: {"IFX0102", 0}, /* Infineon */ - -Obviously IFX0102 was added to the HID table for the TCG TIS driver by -mistake. - -Fixes: 93e1b7d42e1e ("[PATCH] tpm: add HID module parameter") -Link: https://bugzilla.kernel.org/show_bug.cgi?id=203877 -Cc: stable@vger.kernel.org -Cc: Kylene Jo Hall -Reported-by: Ferry Toth: -Reviewed-by: Jerry Snitselaar -Signed-off-by: Jarkko Sakkinen -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/char/tpm/tpm_tis.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/drivers/char/tpm/tpm_tis.c -+++ b/drivers/char/tpm/tpm_tis.c -@@ -242,7 +242,6 @@ static int tpm_tis_pnp_init(struct pnp_d - 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 */ diff --git a/queue-4.4/series b/queue-4.4/series index 6fd097b34c8..a011201511a 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -5,7 +5,6 @@ edac-amd64-read-back-the-scrub-rate-pci-register-on-.patch mm-slub-fix-stack-overruns-with-slub_stats.patch usb-usbtest-fix-missing-kfree-dev-buf-in-usbtest_dis.patch kgdb-avoid-suspicious-rcu-usage-warning.patch -tpm_tis-remove-the-hid-ifx0102.patch crypto-af_alg-fix-use-after-free-in-af_alg_accept-due-to-bh_lock_sock.patch sched-rt-show-the-sched_rr_timeslice-sched_rr-timesl.patch hwmon-max6697-make-sure-the-overt-mask-is-set-correc.patch diff --git a/queue-4.4/tpm_tis-remove-the-hid-ifx0102.patch b/queue-4.4/tpm_tis-remove-the-hid-ifx0102.patch deleted file mode 100644 index 610364d3d98..00000000000 --- a/queue-4.4/tpm_tis-remove-the-hid-ifx0102.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e918e570415ced9898a51109000a3f39a6e03be5 Mon Sep 17 00:00:00 2001 -From: Jarkko Sakkinen -Date: Thu, 25 Jun 2020 05:31:11 +0300 -Subject: tpm_tis: Remove the HID IFX0102 - -From: Jarkko Sakkinen - -commit e918e570415ced9898a51109000a3f39a6e03be5 upstream. - -Acer C720 running Linux v5.3 reports this in klog: - -tpm_tis: 1.2 TPM (device-id 0xB, rev-id 16) -tpm tpm0: tpm_try_transmit: send(): error -5 -tpm tpm0: A TPM error (-5) occurred attempting to determine the timeouts -tpm_tis tpm_tis: Could not get TPM timeouts and durations -tpm_tis 00:08: 1.2 TPM (device-id 0xB, rev-id 16) -tpm tpm0: tpm_try_transmit: send(): error -5 -tpm tpm0: A TPM error (-5) occurred attempting to determine the timeouts -tpm_tis 00:08: Could not get TPM timeouts and durations -ima: No TPM chip found, activating TPM-bypass! -tpm_inf_pnp 00:08: Found TPM with ID IFX0102 - -% git --no-pager grep IFX0102 drivers/char/tpm -drivers/char/tpm/tpm_infineon.c: {"IFX0102", 0}, -drivers/char/tpm/tpm_tis.c: {"IFX0102", 0}, /* Infineon */ - -Obviously IFX0102 was added to the HID table for the TCG TIS driver by -mistake. - -Fixes: 93e1b7d42e1e ("[PATCH] tpm: add HID module parameter") -Link: https://bugzilla.kernel.org/show_bug.cgi?id=203877 -Cc: stable@vger.kernel.org -Cc: Kylene Jo Hall -Reported-by: Ferry Toth: -Reviewed-by: Jerry Snitselaar -Signed-off-by: Jarkko Sakkinen -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/char/tpm/tpm_tis.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/drivers/char/tpm/tpm_tis.c -+++ b/drivers/char/tpm/tpm_tis.c -@@ -962,7 +962,6 @@ static int tpm_tis_pnp_init(struct pnp_d - 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 */ diff --git a/queue-4.9/series b/queue-4.9/series index 3df664f530b..845c839f5f5 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -8,7 +8,6 @@ mm-slub.c-fix-corrupted-freechain-in-deactivate_slab.patch mm-slub-fix-stack-overruns-with-slub_stats.patch usb-usbtest-fix-missing-kfree-dev-buf-in-usbtest_dis.patch kgdb-avoid-suspicious-rcu-usage-warning.patch -tpm_tis-remove-the-hid-ifx0102.patch crypto-af_alg-fix-use-after-free-in-af_alg_accept-due-to-bh_lock_sock.patch sched-rt-show-the-sched_rr_timeslice-sched_rr-timesl.patch cxgb4-parse-tc-u32-key-values-and-masks-natively.patch diff --git a/queue-4.9/tpm_tis-remove-the-hid-ifx0102.patch b/queue-4.9/tpm_tis-remove-the-hid-ifx0102.patch deleted file mode 100644 index d7dbfa0094a..00000000000 --- a/queue-4.9/tpm_tis-remove-the-hid-ifx0102.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e918e570415ced9898a51109000a3f39a6e03be5 Mon Sep 17 00:00:00 2001 -From: Jarkko Sakkinen -Date: Thu, 25 Jun 2020 05:31:11 +0300 -Subject: tpm_tis: Remove the HID IFX0102 - -From: Jarkko Sakkinen - -commit e918e570415ced9898a51109000a3f39a6e03be5 upstream. - -Acer C720 running Linux v5.3 reports this in klog: - -tpm_tis: 1.2 TPM (device-id 0xB, rev-id 16) -tpm tpm0: tpm_try_transmit: send(): error -5 -tpm tpm0: A TPM error (-5) occurred attempting to determine the timeouts -tpm_tis tpm_tis: Could not get TPM timeouts and durations -tpm_tis 00:08: 1.2 TPM (device-id 0xB, rev-id 16) -tpm tpm0: tpm_try_transmit: send(): error -5 -tpm tpm0: A TPM error (-5) occurred attempting to determine the timeouts -tpm_tis 00:08: Could not get TPM timeouts and durations -ima: No TPM chip found, activating TPM-bypass! -tpm_inf_pnp 00:08: Found TPM with ID IFX0102 - -% git --no-pager grep IFX0102 drivers/char/tpm -drivers/char/tpm/tpm_infineon.c: {"IFX0102", 0}, -drivers/char/tpm/tpm_tis.c: {"IFX0102", 0}, /* Infineon */ - -Obviously IFX0102 was added to the HID table for the TCG TIS driver by -mistake. - -Fixes: 93e1b7d42e1e ("[PATCH] tpm: add HID module parameter") -Link: https://bugzilla.kernel.org/show_bug.cgi?id=203877 -Cc: stable@vger.kernel.org -Cc: Kylene Jo Hall -Reported-by: Ferry Toth: -Reviewed-by: Jerry Snitselaar -Signed-off-by: Jarkko Sakkinen -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/char/tpm/tpm_tis.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/drivers/char/tpm/tpm_tis.c -+++ b/drivers/char/tpm/tpm_tis.c -@@ -195,7 +195,6 @@ static int tpm_tis_pnp_init(struct pnp_d - 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 */ diff --git a/queue-5.4/series b/queue-5.4/series index ea4c6d196a4..01c684794c1 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -16,7 +16,6 @@ nvme-multipath-fix-deadlock-between-ana_work-and-sca.patch nvme-multipath-fix-deadlock-due-to-head-lock.patch nvme-multipath-fix-bogus-request-queue-reference-put.patch kgdb-avoid-suspicious-rcu-usage-warning.patch -tpm_tis-remove-the-hid-ifx0102.patch selftests-tpm-use-bin-sh-instead-of-bin-bash.patch tpm-fix-tis-locality-timeout-problems.patch crypto-af_alg-fix-use-after-free-in-af_alg_accept-due-to-bh_lock_sock.patch diff --git a/queue-5.4/tpm_tis-remove-the-hid-ifx0102.patch b/queue-5.4/tpm_tis-remove-the-hid-ifx0102.patch deleted file mode 100644 index 07e2bb43ac8..00000000000 --- a/queue-5.4/tpm_tis-remove-the-hid-ifx0102.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e918e570415ced9898a51109000a3f39a6e03be5 Mon Sep 17 00:00:00 2001 -From: Jarkko Sakkinen -Date: Thu, 25 Jun 2020 05:31:11 +0300 -Subject: tpm_tis: Remove the HID IFX0102 - -From: Jarkko Sakkinen - -commit e918e570415ced9898a51109000a3f39a6e03be5 upstream. - -Acer C720 running Linux v5.3 reports this in klog: - -tpm_tis: 1.2 TPM (device-id 0xB, rev-id 16) -tpm tpm0: tpm_try_transmit: send(): error -5 -tpm tpm0: A TPM error (-5) occurred attempting to determine the timeouts -tpm_tis tpm_tis: Could not get TPM timeouts and durations -tpm_tis 00:08: 1.2 TPM (device-id 0xB, rev-id 16) -tpm tpm0: tpm_try_transmit: send(): error -5 -tpm tpm0: A TPM error (-5) occurred attempting to determine the timeouts -tpm_tis 00:08: Could not get TPM timeouts and durations -ima: No TPM chip found, activating TPM-bypass! -tpm_inf_pnp 00:08: Found TPM with ID IFX0102 - -% git --no-pager grep IFX0102 drivers/char/tpm -drivers/char/tpm/tpm_infineon.c: {"IFX0102", 0}, -drivers/char/tpm/tpm_tis.c: {"IFX0102", 0}, /* Infineon */ - -Obviously IFX0102 was added to the HID table for the TCG TIS driver by -mistake. - -Fixes: 93e1b7d42e1e ("[PATCH] tpm: add HID module parameter") -Link: https://bugzilla.kernel.org/show_bug.cgi?id=203877 -Cc: stable@vger.kernel.org -Cc: Kylene Jo Hall -Reported-by: Ferry Toth: -Reviewed-by: Jerry Snitselaar -Signed-off-by: Jarkko Sakkinen -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/char/tpm/tpm_tis.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/drivers/char/tpm/tpm_tis.c -+++ b/drivers/char/tpm/tpm_tis.c -@@ -238,7 +238,6 @@ static int tpm_tis_pnp_init(struct pnp_d - 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 */ diff --git a/queue-5.7/series b/queue-5.7/series index 57b11f00d59..fb620188989 100644 --- a/queue-5.7/series +++ b/queue-5.7/series @@ -39,7 +39,6 @@ nvme-multipath-fix-bogus-request-queue-reference-put.patch io_uring-fix-current-mm-null-dereference-on-exit.patch kgdb-avoid-suspicious-rcu-usage-warning.patch revert-tpm-selftest-cleanup-after-unseal-with-wrong-auth-policy-test.patch -tpm_tis-remove-the-hid-ifx0102.patch selftests-tpm-use-bin-sh-instead-of-bin-bash.patch tpm-fix-tis-locality-timeout-problems.patch crypto-af_alg-fix-use-after-free-in-af_alg_accept-due-to-bh_lock_sock.patch diff --git a/queue-5.7/tpm_tis-remove-the-hid-ifx0102.patch b/queue-5.7/tpm_tis-remove-the-hid-ifx0102.patch deleted file mode 100644 index 07e2bb43ac8..00000000000 --- a/queue-5.7/tpm_tis-remove-the-hid-ifx0102.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e918e570415ced9898a51109000a3f39a6e03be5 Mon Sep 17 00:00:00 2001 -From: Jarkko Sakkinen -Date: Thu, 25 Jun 2020 05:31:11 +0300 -Subject: tpm_tis: Remove the HID IFX0102 - -From: Jarkko Sakkinen - -commit e918e570415ced9898a51109000a3f39a6e03be5 upstream. - -Acer C720 running Linux v5.3 reports this in klog: - -tpm_tis: 1.2 TPM (device-id 0xB, rev-id 16) -tpm tpm0: tpm_try_transmit: send(): error -5 -tpm tpm0: A TPM error (-5) occurred attempting to determine the timeouts -tpm_tis tpm_tis: Could not get TPM timeouts and durations -tpm_tis 00:08: 1.2 TPM (device-id 0xB, rev-id 16) -tpm tpm0: tpm_try_transmit: send(): error -5 -tpm tpm0: A TPM error (-5) occurred attempting to determine the timeouts -tpm_tis 00:08: Could not get TPM timeouts and durations -ima: No TPM chip found, activating TPM-bypass! -tpm_inf_pnp 00:08: Found TPM with ID IFX0102 - -% git --no-pager grep IFX0102 drivers/char/tpm -drivers/char/tpm/tpm_infineon.c: {"IFX0102", 0}, -drivers/char/tpm/tpm_tis.c: {"IFX0102", 0}, /* Infineon */ - -Obviously IFX0102 was added to the HID table for the TCG TIS driver by -mistake. - -Fixes: 93e1b7d42e1e ("[PATCH] tpm: add HID module parameter") -Link: https://bugzilla.kernel.org/show_bug.cgi?id=203877 -Cc: stable@vger.kernel.org -Cc: Kylene Jo Hall -Reported-by: Ferry Toth: -Reviewed-by: Jerry Snitselaar -Signed-off-by: Jarkko Sakkinen -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/char/tpm/tpm_tis.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/drivers/char/tpm/tpm_tis.c -+++ b/drivers/char/tpm/tpm_tis.c -@@ -238,7 +238,6 @@ static int tpm_tis_pnp_init(struct pnp_d - 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.47.3