diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-26 13:20:18 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-26 13:20:18 -0800 |
| commit | f9fa9ca6044be1f39c78cb4385ee9e48a2a98341 (patch) | |
| tree | de72bb9c1dda64774d609b0a94cfb76eb290b00c | |
| parent | 90720ee31cbb27723fb25a7683ad4e27b5a548c6 (diff) | |
| download | longterm-queue-2.6.32-f9fa9ca6044be1f39c78cb4385ee9e48a2a98341.tar.gz | |
remove queue-2.6.32/tpm_tis-add-delay-after-aborting-command.patch
| -rw-r--r-- | queue-2.6.32/series | 1 | ||||
| -rw-r--r-- | queue-2.6.32/tpm_tis-add-delay-after-aborting-command.patch | 35 |
2 files changed, 0 insertions, 36 deletions
diff --git a/queue-2.6.32/series b/queue-2.6.32/series index a0ff6c4..8fd4a61 100644 --- a/queue-2.6.32/series +++ b/queue-2.6.32/series @@ -5,6 +5,5 @@ drm-fix-authentication-kernel-crash.patch crypto-sha512-make-it-work-undo-percpu-message-schedule.patch crypto-sha512-reduce-stack-usage-to-safe-number.patch revert-arm-7220-1-mmc-mmci-fixup-error-handling-for-dma.patch -tpm_tis-add-delay-after-aborting-command.patch block-fail-scsi-passthrough-ioctls-on-partition-devices.patch dm-do-not-forward-ioctls-from-logical-volumes-to-the-underlying-device.patch diff --git a/queue-2.6.32/tpm_tis-add-delay-after-aborting-command.patch b/queue-2.6.32/tpm_tis-add-delay-after-aborting-command.patch deleted file mode 100644 index ae3dc2d..0000000 --- a/queue-2.6.32/tpm_tis-add-delay-after-aborting-command.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a927b8131794ee449b7f6666e7ab61301949b20f Mon Sep 17 00:00:00 2001 -From: Stefan Berger <stefanb@linux.vnet.ibm.com> -Date: Fri, 11 Nov 2011 12:57:06 -0500 -Subject: tpm_tis: add delay after aborting command - -From: Stefan Berger <stefanb@linux.vnet.ibm.com> - -commit a927b8131794ee449b7f6666e7ab61301949b20f upstream. - -This patch adds a delay after aborting a command. Some TPMs need -this and will not process the subsequent command correctly otherwise. - -It's worth noting that a TPM randomly failing to process a command, -maps to randomly failing suspend/resume operations. - -Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> -Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/char/tpm/tpm_tis.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/char/tpm/tpm_tis.c -+++ b/drivers/char/tpm/tpm_tis.c -@@ -332,6 +332,9 @@ static int tpm_tis_send(struct tpm_chip - return len; - out_err: - tpm_tis_ready(chip); -+ /* some TPMs need a break here otherwise they will not work -+ * correctly on the immediately subsequent command */ -+ msleep(chip->vendor.timeout_b); - release_locality(chip, chip->vendor.locality, 0); - return rc; - } |