Skip to contentSkip to conversation

tpm_tis: Fix subsequent suspend failures

RFC Rajiv Andrade 3 participants 8 messages Jun 22, 2010 – Jul 29, 2010 2 messages not in the archive

lore
Share & tools
lore

Rajiv Andrade

author Acked-by
#2 lore raw
In reply to a message not in the archive

Sorry the ones on CC, previous message got messed up by the mail client.

This patch fixes https://bugzilla.kernel.org/show_bug.cgi?id=16256

Link to original post given it wasn't submitted to LKML originally:
http://marc.info/?l=tpmdd-devel&m=127609160616162&w=2

Quoted 37 lines · Helmut Schaa

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.

---

Not sure if the platform resume method should be fixed in the same way. Plase review.

Thanks,
Helmut

 drivers/char/tpm/tpm_tis.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
drivers/char/tpm/tpm_tis.c +8 -1
index 24314a9..1030f84 100644
@@ -623,7 +623,14 @@ static int tpm_tis_pnp_suspend(struct pnp_dev *dev, pm_message_t msg)
 
 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 = {
#3 lore raw
Quoted 41 lines · On Tue, 22 Jun 2010 00:08:44 -0300 Rajiv Andrade <[email protected]>…
Quoted 27 lines · Helmut Schaa

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.

---

Not sure if the platform resume method should be fixed in the same way. Plase review.

Thanks,
Helmut

 drivers/char/tpm/tpm_tis.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
drivers/char/tpm/tpm_tis.c +1 -1
index 24314a9..1030f84 100644
@@ -623,7 +623,14 @@ static int tpm_tis_pnp_suspend(struct pnp_dev *dev, pm_message_t msg)
 
 static int tpm_tis_pnp_resume(struct pnp_dev *dev)
 {
-	return tpm_pm_resume(&dev->dev);
+	struct tpm_chip *chip = pnp_get_drvdata(dev);

drivers/char/tpm/tpm_tis.c static int tpm_tis_pnp_suspend(struct pnp_dev *dev, pm_message_t msg) · line 636

Quoted 10 lines
drivers/char/tpm/tpm_tis.c +7 -0
+	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 = {

Sorry the ones on CC, previous message got messed up by the mail client.

Quoted 7 lines

This patch fixes https://bugzilla.kernel.org/show_bug.cgi?id=16256

Link to original post given it wasn't submitted to LKML originally:
http://marc.info/?l=tpmdd-devel&m=127609160616162&w=2

(top-posting repaired. Please don't do that).

This wasn't a very good way to send a patch. I edited the diff, reconstructed the patch and then assembled a decent-looking changelog. I also changed your acked-by to the required signed-off-by, because you were on the patch's delivery path.

Pretty please: next time, prepare a proper mergeable patch with the correct attributions and signoffs? Thanks.

#4 lore raw
Quoted 54 lines · Andrew Morton
Quoted 41 lines · On Tue, 22 Jun 2010 00:08:44 -0300 Rajiv Andrade <[email protected]>…
Quoted 27 lines · Helmut Schaa

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.

---

Not sure if the platform resume method should be fixed in the same way. Plase review.

Thanks,
Helmut

drivers/char/tpm/tpm_tis.c | 9 ++++++++-

1 files changed, 8 insertions(+), 1 deletions(-)
drivers/char/tpm/tpm_tis.c +1 -1
index 24314a9..1030f84 100644
@@ -623,7 +623,14 @@ static int tpm_tis_pnp_suspend(struct pnp_dev *dev, pm_message_t msg)
 
 static int tpm_tis_pnp_resume(struct pnp_dev *dev)
 {
-	return tpm_pm_resume(&dev->dev);
+	struct tpm_chip *chip = pnp_get_drvdata(dev);

drivers/char/tpm/tpm_tis.c static int tpm_tis_pnp_suspend(struct pnp_dev *dev, pm_message_t msg) · line 636

Quoted 10 lines
drivers/char/tpm/tpm_tis.c +7 -0
+	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 = {

Sorry the ones on CC, previous message got messed up by the mail client.

Quoted 7 lines

This patch fixes https://bugzilla.kernel.org/show_bug.cgi?id=16256

Link to original post given it wasn't submitted to LKML originally:
http://marc.info/?l=tpmdd-devel&m=127609160616162&w=2

(top-posting repaired. Please don't do that).

Quoted 7 lines

This wasn't a very good way to send a patch. I edited the diff, reconstructed the patch and then assembled a decent-looking changelog. I also changed your acked-by to the required signed-off-by, because you were on the patch's delivery path.

Pretty please: next time, prepare a proper mergeable patch with the correct attributions and signoffs? Thanks.

Sure, sorry. I was just not certain if I could just resent Helmut's patch to LKML without messing with his authorship.

Thanks,
Rajiv

#5 lore raw
Quoted 11 lines · On Wed, 23 Jun 2010 16:55:54 -0300 Rajiv Andrade <[email protected]>…
Quoted 9 lines

(top-posting repaired. Please don't do that).

This wasn't a very good way to send a patch. I edited the diff, reconstructed the patch and then assembled a decent-looking changelog. I also changed your acked-by to the required signed-off-by, because you were on the patch's delivery path.

Pretty please: next time, prepare a proper mergeable patch with the correct attributions and signoffs? Thanks.

Sure, sorry. I was just not certain if I could just resent Helmut's patch to LKML without messing with his authorship.

You can. Put his "From:" line right at the top of the changelog and everyone's patch-receiving tools will honour that. If the From: at the top of the changelog is absent, the tools will fall back to using the
From: line in the mail headers.

#6 lore raw

Hi,

Am Mittwoch 23 Juni 2010 schrieb Andrew Morton:

Quoted 13 lines
Quoted 10 lines · On Wed, 23 Jun 2010 16:55:54 -0300 Rajiv Andrade <[email protected]>…
Quoted 9 lines

(top-posting repaired. Please don't do that).

This wasn't a very good way to send a patch. I edited the diff, reconstructed the patch and then assembled a decent-looking changelog. I also changed your acked-by to the required signed-off-by, because you were on the patch's delivery path.

Pretty please: next time, prepare a proper mergeable patch with the correct attributions and signoffs? Thanks.

Quoted 6 lines
Quoted 1 line

Sure, sorry. I was just not certain if I could just resent Helmut's patch to LKML without messing with his authorship.

You can. Put his "From:" line right at the top of the changelog and everyone's patch-receiving tools will honour that. If the From: at the top of the changelog is absent, the tools will fall back to using the
From: line in the mail headers.

This patch still didn't make it into mainline and it fixes a regression. Rajiv, do you plan to resubmit the patch or did you expect it to go through Andrew's tree?

Thanks,
Helmut

#7 lore raw
Quoted 18 lines · On Fri, 23 Jul 2010 14:07:51 +0200 Helmut Schaa <[email protected]>…

Hi,

Am Mittwoch 23 Juni 2010 schrieb Andrew Morton:

Quoted 15 lines
Quoted 11 lines · On Wed, 23 Jun 2010 16:55:54 -0300 Rajiv Andrade <[email protected]>…
Quoted 9 lines

(top-posting repaired. Please don't do that).

This wasn't a very good way to send a patch. I edited the diff, reconstructed the patch and then assembled a decent-looking changelog. I also changed your acked-by to the required signed-off-by, because you were on the patch's delivery path.

Pretty please: next time, prepare a proper mergeable patch with the correct attributions and signoffs? Thanks.

Sure, sorry. I was just not certain if I could just resent Helmut's patch to LKML without messing with his authorship.

Quoted 8 lines
Quoted 4 lines

You can. Put his "From:" line right at the top of the changelog and everyone's patch-receiving tools will honour that. If the From: at the top of the changelog is absent, the tools will fall back to using the
From: line in the mail headers.

This patch still didn't make it into mainline and it fixes a regression. Rajiv, do you plan to resubmit the patch or did you expect it to go through Andrew's tree?

The patch is presently parked in James's linux-next tree.

#8 lore raw
In reply to Helmut Schaa
Quoted 18 lines · Helmut Schaa

Hi,

Am Mittwoch 23 Juni 2010 schrieb Andrew Morton:

Quoted 15 lines
Quoted 11 lines · On Wed, 23 Jun 2010 16:55:54 -0300 Rajiv Andrade <[email protected]>…
Quoted 9 lines

(top-posting repaired. Please don't do that).

This wasn't a very good way to send a patch. I edited the diff, reconstructed the patch and then assembled a decent-looking changelog. I also changed your acked-by to the required signed-off-by, because you were on the patch's delivery path.

Pretty please: next time, prepare a proper mergeable patch with the correct attributions and signoffs? Thanks.

Sure, sorry. I was just not certain if I could just resent Helmut's patch to LKML without messing with his authorship.

Quoted 9 lines
Quoted 4 lines

You can. Put his "From:" line right at the top of the changelog and everyone's patch-receiving tools will honour that. If the From: at the top of the changelog is absent, the tools will fall back to using the
From: line in the mail headers.

This patch still didn't make it into mainline and it fixes a regression. Rajiv, do you plan to resubmit the patch or did you expect it to go through Andrew's tree?

Hi Helmut,

I expected it to make into Andrew's tree, since his recommendations were for the next time I submit a patch that matched the circumstances of this one, also, he mentioned he had to fix the issues by hand.

Andrew, do you want me to resubmit it? If so, I'm more than ok with that too though.

Thanks,
Rajiv

#9 lore raw

Nevermind,

I've just read Andrew's previous email that it's parked in James' tree.

Thanks,
Rajiv

Quoted 51 lines · Rajiv Andrade
Quoted 18 lines · Helmut Schaa

Hi,

Am Mittwoch 23 Juni 2010 schrieb Andrew Morton:

Quoted 15 lines
Quoted 11 lines · On Wed, 23 Jun 2010 16:55:54 -0300 Rajiv Andrade <[email protected]>…
Quoted 9 lines

(top-posting repaired. Please don't do that).

This wasn't a very good way to send a patch. I edited the diff, reconstructed the patch and then assembled a decent-looking changelog. I also changed your acked-by to the required signed-off-by, because you were on the patch's delivery path.

Pretty please: next time, prepare a proper mergeable patch with the correct attributions and signoffs? Thanks.

Sure, sorry. I was just not certain if I could just resent Helmut's patch to LKML without messing with his authorship.

Quoted 9 lines
Quoted 4 lines

You can. Put his "From:" line right at the top of the changelog and everyone's patch-receiving tools will honour that. If the From: at the top of the changelog is absent, the tools will fall back to using the
From: line in the mail headers.

This patch still didn't make it into mainline and it fixes a regression. Rajiv, do you plan to resubmit the patch or did you expect it to go through Andrew's tree?

Hi Helmut,

I expected it to make into Andrew's tree, since his recommendations were for the next time I submit a patch that matched the circumstances of this one, also, he mentioned he had to fix the issues by hand.

Andrew, do you want me to resubmit it? If so, I'm more than ok with that too though.

Thanks,
Rajiv

------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the Plug-In Development Kit to bring their C/C++ apps to Palm for a share of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
tpmdd-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel