tpm patch for .32, .33, and .34

diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index 401a7e95a9a676cf29c52d918053ff9bf19e3ecd..2a1ae79b1c33267d535c9e73a889cb20610d1ebd 100644 (file)
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@ -36,3 +36,4 @@ drm-i915-make-g4x-style-pll-search-more-permissive.patch
 drm-radeon-r200-handle-more-hw-tex-coord-types.patch
 drm-radeon-kms-add-quirk-for-asus-hd-3600-board.patch
 drm-radeon-kms-fix-legacy-lvds-dpms-sequence.patch
+tpm_tis-fix-subsequent-suspend-failures.patch

diff --git a/queue-2.6.32/tpm_tis-fix-subsequent-suspend-failures.patch b/queue-2.6.32/tpm_tis-fix-subsequent-suspend-failures.patch
new file mode 100644 (file)
index 0000000..94bf207
--- /dev/null
+++ b/queue-2.6.32/tpm_tis-fix-subsequent-suspend-failures.patch
@@ -0,0 +1,47 @@
+From 59f6fbe4291fcc078ba26ce4edf8373a7620a13a Mon Sep 17 00:00:00 2001
+From: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
+Date: Wed, 23 Jun 2010 12:18:56 -0700
+Subject: tpm_tis: fix subsequent suspend failures
+
+From: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
+
+commit 59f6fbe4291fcc078ba26ce4edf8373a7620a13a upstream.
+
+Fix subsequent suspends by issuing tpm_continue_selftest during resume.
+Otherwise, the tpm chip seems to be not fully initialized and will reject
+the save state command during suspend, thus preventing the whole system
+to suspend.
+
+Addresses https://bugzilla.kernel.org/show_bug.cgi?id=16256
+
+Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
+Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
+Cc: James Morris <jmorris@namei.org>
+Cc: Debora Velarde <debora@linux.vnet.ibm.com>
+Cc: David Safford <safford@watson.ibm.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: James Morris <jmorris@namei.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/char/tpm/tpm_tis.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- a/drivers/char/tpm/tpm_tis.c
++++ b/drivers/char/tpm/tpm_tis.c
+@@ -622,7 +622,14 @@ static int tpm_tis_pnp_suspend(struct pn
+ 
+ static int tpm_tis_pnp_resume(struct pnp_dev *dev)
+ {
+-      return tpm_pm_resume(&dev->dev);
++      struct tpm_chip *chip = pnp_get_drvdata(dev);
++      int ret;
++
++      ret = tpm_pm_resume(&dev->dev);
++      if (!ret)
++              tpm_continue_selftest(chip);
++
++      return ret;
+ }
+ 
+ static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {

diff --git a/queue-2.6.33/series b/queue-2.6.33/series
index abab1014968630aa52b96dccaa8acd7b1fc45932..e36f7009f285371879254f565429d522206cabfb 100644 (file)
--- a/queue-2.6.33/series
+++ b/queue-2.6.33/series
@@ -58,3 +58,4 @@ drm-radeon-kms-add-quirk-for-asus-hd-3600-board.patch
 drm-radeon-kms-fix-possible-mis-detection-of-sideport-on-rs690-rs740.patch
 drm-radeon-kms-fix-legacy-lvds-dpms-sequence.patch
 drm-radeon-kms-fix-legacy-tv-out-pal-mode.patch
+tpm_tis-fix-subsequent-suspend-failures.patch

diff --git a/queue-2.6.33/tpm_tis-fix-subsequent-suspend-failures.patch b/queue-2.6.33/tpm_tis-fix-subsequent-suspend-failures.patch
new file mode 100644 (file)
index 0000000..94bf207
--- /dev/null
+++ b/queue-2.6.33/tpm_tis-fix-subsequent-suspend-failures.patch
@@ -0,0 +1,47 @@
+From 59f6fbe4291fcc078ba26ce4edf8373a7620a13a Mon Sep 17 00:00:00 2001
+From: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
+Date: Wed, 23 Jun 2010 12:18:56 -0700
+Subject: tpm_tis: fix subsequent suspend failures
+
+From: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
+
+commit 59f6fbe4291fcc078ba26ce4edf8373a7620a13a upstream.
+
+Fix subsequent suspends by issuing tpm_continue_selftest during resume.
+Otherwise, the tpm chip seems to be not fully initialized and will reject
+the save state command during suspend, thus preventing the whole system
+to suspend.
+
+Addresses https://bugzilla.kernel.org/show_bug.cgi?id=16256
+
+Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
+Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
+Cc: James Morris <jmorris@namei.org>
+Cc: Debora Velarde <debora@linux.vnet.ibm.com>
+Cc: David Safford <safford@watson.ibm.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: James Morris <jmorris@namei.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/char/tpm/tpm_tis.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- a/drivers/char/tpm/tpm_tis.c
++++ b/drivers/char/tpm/tpm_tis.c
+@@ -622,7 +622,14 @@ static int tpm_tis_pnp_suspend(struct pn
+ 
+ static int tpm_tis_pnp_resume(struct pnp_dev *dev)
+ {
+-      return tpm_pm_resume(&dev->dev);
++      struct tpm_chip *chip = pnp_get_drvdata(dev);
++      int ret;
++
++      ret = tpm_pm_resume(&dev->dev);
++      if (!ret)
++              tpm_continue_selftest(chip);
++
++      return ret;
+ }
+ 
+ static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {

diff --git a/queue-2.6.34/series b/queue-2.6.34/series
index f6bf0774a5618fae7a1312668cc5a41c9113d6cc..a018e03916f9893b736e1edb472adb54799d078b 100644 (file)
--- a/queue-2.6.34/series
+++ b/queue-2.6.34/series
@@ -67,3 +67,4 @@ drm-radeon-kms-add-quirk-for-asus-hd-3600-board.patch
 drm-radeon-kms-fix-possible-mis-detection-of-sideport-on-rs690-rs740.patch
 drm-radeon-kms-fix-legacy-lvds-dpms-sequence.patch
 drm-radeon-kms-fix-legacy-tv-out-pal-mode.patch
+tpm_tis-fix-subsequent-suspend-failures.patch

diff --git a/queue-2.6.34/tpm_tis-fix-subsequent-suspend-failures.patch b/queue-2.6.34/tpm_tis-fix-subsequent-suspend-failures.patch
new file mode 100644 (file)
index 0000000..f16ce7f
--- /dev/null
+++ b/queue-2.6.34/tpm_tis-fix-subsequent-suspend-failures.patch
@@ -0,0 +1,47 @@
+From 59f6fbe4291fcc078ba26ce4edf8373a7620a13a Mon Sep 17 00:00:00 2001
+From: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
+Date: Wed, 23 Jun 2010 12:18:56 -0700
+Subject: tpm_tis: fix subsequent suspend failures
+
+From: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
+
+commit 59f6fbe4291fcc078ba26ce4edf8373a7620a13a upstream.
+
+Fix subsequent suspends by issuing tpm_continue_selftest during resume.
+Otherwise, the tpm chip seems to be not fully initialized and will reject
+the save state command during suspend, thus preventing the whole system
+to suspend.
+
+Addresses https://bugzilla.kernel.org/show_bug.cgi?id=16256
+
+Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
+Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
+Cc: James Morris <jmorris@namei.org>
+Cc: Debora Velarde <debora@linux.vnet.ibm.com>
+Cc: David Safford <safford@watson.ibm.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: James Morris <jmorris@namei.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/char/tpm/tpm_tis.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- a/drivers/char/tpm/tpm_tis.c
++++ b/drivers/char/tpm/tpm_tis.c
+@@ -623,7 +623,14 @@ static int tpm_tis_pnp_suspend(struct pn
+ 
+ static int tpm_tis_pnp_resume(struct pnp_dev *dev)
+ {
+-      return tpm_pm_resume(&dev->dev);
++      struct tpm_chip *chip = pnp_get_drvdata(dev);
++      int ret;
++
++      ret = tpm_pm_resume(&dev->dev);
++      if (!ret)
++              tpm_continue_selftest(chip);
++
++      return ret;
+ }
+ 
+ static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {