FAILED: patch "[PATCH] tpm: self test failure should not cause suspend to fail" failed to apply to 4.4-stable tree

FAILED: patch "[PATCH] tpm: self test failure should not cause suspend to fail" failed to apply to 4.4-stable tree

[gregkh]

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

>From 0803d7befa15cab5717d667a97a66214d2a4c083 Mon Sep 17 00:00:00 2001
From: Chris Chiu <chiu@endlessm.com>
Date: Tue, 20 Mar 2018 15:36:40 +0800
Subject: [PATCH] tpm: self test failure should not cause suspend to fail

The Acer Acer Veriton X4110G has a TPM device detected as:
  tpm_tis 00:0b: 1.2 TPM (device-id 0xFE, rev-id 71)

After the first S3 suspend, the following error appears during resume:
  tpm tpm0: A TPM error(38) occurred continue selftest

Any following S3 suspend attempts will now fail with this error:
  tpm tpm0: Error (38) sending savestate before suspend
  PM: Device 00:0b failed to suspend: error 38

Error 38 is TPM_ERR_INVALID_POSTINIT which means the TPM is
not in the correct state. This indicates that the platform BIOS
is not sending the usual TPM_Startup command during S3 resume.
>>From this point onwards, all TPM commands will fail.

The same issue was previously reported on Foxconn 6150BK8MC and
Sony Vaio TX3.

The platform behaviour seems broken here, but we should not break
suspend/resume because of this.

When the unexpected TPM state is encountered, set a flag to skip the
affected TPM_SaveState command on later suspends.

Cc: stable@vger.kernel.org
Signed-off-by: Chris Chiu <chiu@endlessm.com>
Signed-off-by: Daniel Drake <drake@endlessm.com>
Link: http://lkml.kernel.org/r/CAB4CAwfSCvj1cudi+MWaB5g2Z67d9DwY1o475YOZD64ma23UiQ@mail.gmail.com
Link: https://lkml.org/lkml/2011/3/28/192
Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=591031
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index 47aacecdc85c..22288ff70a0b 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -1002,6 +1002,10 @@ int tpm_do_selftest(struct tpm_chip *chip)
 	loops = jiffies_to_msecs(duration) / delay_msec;
 
 	rc = tpm_continue_selftest(chip);
+	if (rc == TPM_ERR_INVALID_POSTINIT) {
+		chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;
+		dev_info(&chip->dev, "TPM not ready (%d)\n", rc);
+	}
 	/* This may fail if there was no TPM driver during a suspend/resume
 	 * cycle; some may return 10 (BAD_ORDINAL), others 28 (FAILEDSELFTEST)
 	 */

Re: FAILED: patch "[PATCH] tpm: self test failure should not cause suspend to fail" failed to apply to 4.4-stable tree

[Jarkko Sakkinen]

On Fri, Apr 20, 2018 at 06:19:30PM +0200, gregkh@linuxfoundation.org wrote:
> 
> The patch below does not apply to the 4.4-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
> 
> thanks,
> 
> greg k-h

I applied this on top of v4.4.99 with "git am -3" without conflicts.

/Jarkko

Re: FAILED: patch "[PATCH] tpm: self test failure should not cause suspend to fail" failed to apply to 4.4-stable tree

[Greg KH]

On Wed, Apr 25, 2018 at 02:22:13PM +0300, Jarkko Sakkinen wrote:
> On Fri, Apr 20, 2018 at 06:19:30PM +0200, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 4.4-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@vger.kernel.org>.
> > 
> > thanks,
> > 
> > greg k-h
> 
> I applied this on top of v4.4.99 with "git am -3" without conflicts.

I don't use git am until I apply the patch itself, I rely on patch to
get things right to start with.  I'll try this in a few days to see if I
can force it...

thanks,

greg k-h

Re: FAILED: patch "[PATCH] tpm: self test failure should not cause suspend to fail" failed to apply to 4.4-stable tree

[Greg KH]

On Wed, Apr 25, 2018 at 01:53:01PM +0200, Greg KH wrote:
> On Wed, Apr 25, 2018 at 02:22:13PM +0300, Jarkko Sakkinen wrote:
> > On Fri, Apr 20, 2018 at 06:19:30PM +0200, gregkh@linuxfoundation.org wrote:
> > > 
> > > The patch below does not apply to the 4.4-stable tree.
> > > If someone wants it applied there, or to any other stable or longterm
> > > tree, then please email the backport, including the original git commit
> > > id to <stable@vger.kernel.org>.
> > > 
> > > thanks,
> > > 
> > > greg k-h
> > 
> > I applied this on top of v4.4.99 with "git am -3" without conflicts.
> 
> I don't use git am until I apply the patch itself, I rely on patch to
> get things right to start with.  I'll try this in a few days to see if I
> can force it...

Ah, I remember what happened here.  It applies just fine to 4.4.y and
4.9.y, but the build is then broken.  The code needs to change for those
kernels if you want that patch applied.

If so, can you please provide a working backport?

thanks,

greg k-h

Re: FAILED: patch "[PATCH] tpm: self test failure should not cause suspend to fail" failed to apply to 4.4-stable tree

[Jarkko Sakkinen]

On Thu, Apr 26, 2018 at 07:52:04PM +0200, Greg KH wrote:
> On Wed, Apr 25, 2018 at 01:53:01PM +0200, Greg KH wrote:
> > On Wed, Apr 25, 2018 at 02:22:13PM +0300, Jarkko Sakkinen wrote:
> > > On Fri, Apr 20, 2018 at 06:19:30PM +0200, gregkh@linuxfoundation.org wrote:
> > > > 
> > > > The patch below does not apply to the 4.4-stable tree.
> > > > If someone wants it applied there, or to any other stable or longterm
> > > > tree, then please email the backport, including the original git commit
> > > > id to <stable@vger.kernel.org>.
> > > > 
> > > > thanks,
> > > > 
> > > > greg k-h
> > > 
> > > I applied this on top of v4.4.99 with "git am -3" without conflicts.
> > 
> > I don't use git am until I apply the patch itself, I rely on patch to
> > get things right to start with.  I'll try this in a few days to see if I
> > can force it...
> 
> Ah, I remember what happened here.  It applies just fine to 4.4.y and
> 4.9.y, but the build is then broken.  The code needs to change for those
> kernels if you want that patch applied.
> 
> If so, can you please provide a working backport?
> 
> thanks,
> 
> greg k-h

Yes, sure, I can do that!

/Jarkko