[PATCH v3 0/2] Fixes for v4.9

[PATCH v3 0/2] Fixes for v4.9

[Jarkko Sakkinen]

Chris Chiu (1):
  tpm: self test failure should not cause suspend to fail

Enric Balletbo i Serra (1):
  tpm: do not suspend/resume if power stays on

 drivers/char/tpm/tpm-chip.c      | 12 ++++++++++++
 drivers/char/tpm/tpm-interface.c |  7 +++++++
 drivers/char/tpm/tpm.h           |  1 +
 3 files changed, 20 insertions(+)

-- 
v3: use CONFIG_OF flag
v2: moved the check from tpm_of.c to tpm-chip.c as in v4.4 chip is
unreachable otherwise. I did compilation test now with BuildRoot
for power arch.
2.17.0

[PATCH v3 1/2] tpm: do not suspend/resume if power stays on

[Jarkko Sakkinen]

From: Enric Balletbo i Serra <enric.balletbo@collabora.com>

commit b5d0ebc99bf5d0801a5ecbe958caa3d68b8eaee8 upstream

The suspend/resume behavior of the TPM can be controlled by setting
"powered-while-suspended" in the DTS. This is useful for the cases
when hardware does not power-off the TPM.

Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
---
 drivers/char/tpm/tpm-chip.c      | 12 ++++++++++++
 drivers/char/tpm/tpm-interface.c |  3 +++
 drivers/char/tpm/tpm.h           |  1 +
 3 files changed, 16 insertions(+)

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 9ff853229957..1bdb465eafd1 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -388,8 +388,20 @@ static int tpm_add_legacy_sysfs(struct tpm_chip *chip)
  */
 int tpm_chip_register(struct tpm_chip *chip)
 {
+#ifdef CONFIG_OF
+	struct device_node *np;
+#endif
 	int rc;
 
+#ifdef CONFIG_OF
+	np = of_find_node_by_name(NULL, "vtpm");
+	if (np) {
+		if (of_property_read_bool(np, "powered-while-suspended"))
+			chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;
+	}
+	of_node_put(np);
+#endif
+
 	if (chip->ops->flags & TPM_OPS_AUTO_STARTUP) {
 		if (chip->flags & TPM_CHIP_FLAG_TPM2)
 			rc = tpm2_auto_startup(chip);
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index 830d7e30e508..5463b649bdf1 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -969,6 +969,9 @@ int tpm_pm_suspend(struct device *dev)
 	if (chip == NULL)
 		return -ENODEV;
 
+	if (chip->flags & TPM_CHIP_FLAG_ALWAYS_POWERED)
+		return 0;
+
 	if (chip->flags & TPM_CHIP_FLAG_TPM2) {
 		tpm2_shutdown(chip, TPM2_SU_STATE);
 		return 0;
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index aa4299cf7e5a..a4fc2badf633 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -143,6 +143,7 @@ enum tpm_chip_flags {
 	TPM_CHIP_FLAG_TPM2		= BIT(1),
 	TPM_CHIP_FLAG_IRQ		= BIT(2),
 	TPM_CHIP_FLAG_VIRTUAL		= BIT(3),
+	TPM_CHIP_FLAG_ALWAYS_POWERED	= BIT(5),
 };
 
 struct tpm_chip {
-- 
2.17.0

Re: [PATCH v3 1/2] tpm: do not suspend/resume if power stays on

[Greg KH]

On Tue, Jun 05, 2018 at 09:34:00PM +0300, Jarkko Sakkinen wrote:
> From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> 
> commit b5d0ebc99bf5d0801a5ecbe958caa3d68b8eaee8 upstream
> 
> The suspend/resume behavior of the TPM can be controlled by setting
> "powered-while-suspended" in the DTS. This is useful for the cases
> when hardware does not power-off the TPM.
> 
> Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> Signed-off-by: James Morris <james.l.morris@oracle.com>
> ---
>  drivers/char/tpm/tpm-chip.c      | 12 ++++++++++++
>  drivers/char/tpm/tpm-interface.c |  3 +++
>  drivers/char/tpm/tpm.h           |  1 +
>  3 files changed, 16 insertions(+)
> 
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index 9ff853229957..1bdb465eafd1 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -388,8 +388,20 @@ static int tpm_add_legacy_sysfs(struct tpm_chip *chip)
>   */
>  int tpm_chip_register(struct tpm_chip *chip)
>  {
> +#ifdef CONFIG_OF
> +	struct device_node *np;
> +#endif
>  	int rc;
>  
> +#ifdef CONFIG_OF
> +	np = of_find_node_by_name(NULL, "vtpm");
> +	if (np) {
> +		if (of_property_read_bool(np, "powered-while-suspended"))
> +			chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;
> +	}
> +	of_node_put(np);
> +#endif
> +
>  	if (chip->ops->flags & TPM_OPS_AUTO_STARTUP) {
>  		if (chip->flags & TPM_CHIP_FLAG_TPM2)
>  			rc = tpm2_auto_startup(chip);


This part of the patch blows up the build, please test-build your
patches :(

I've fixed it up now by properly including the needed .h file...

greg k-h

[PATCH v3 2/2] tpm: self test failure should not cause suspend to fail

[Jarkko Sakkinen]

From: Chris Chiu <chiu@endlessm.com>

commit 0803d7befa15cab5717d667a97a66214d2a4c083 upstream

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>
---
 drivers/char/tpm/tpm-interface.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index 5463b649bdf1..faf2db122ab9 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -803,6 +803,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)
 	 */
-- 
2.17.0

[PATCH v3 0/2] Fixes for v4.4

[Jarkko Sakkinen]

Chris Chiu (1):
  tpm: self test failure should not cause suspend to fail

Enric Balletbo i Serra (1):
  tpm: do not suspend/resume if power stays on

 drivers/char/tpm/tpm-chip.c      | 12 ++++++++++++
 drivers/char/tpm/tpm-interface.c |  7 +++++++
 drivers/char/tpm/tpm.h           |  1 +
 3 files changed, 20 insertions(+)

-- 
v3: use CONFIG_OF flag
v2: moved the check from tpm_of.c to tpm-chip.c as in v4.4 chip is
unreachable otherwise. I did compilation test now with BuildRoot
for power arch.
2.17.0

[PATCH v3 1/2] tpm: do not suspend/resume if power stays on

[Jarkko Sakkinen]

From: Enric Balletbo i Serra <enric.balletbo@collabora.com>

commit b5d0ebc99bf5d0801a5ecbe958caa3d68b8eaee8 upstream

The suspend/resume behavior of the TPM can be controlled by setting
"powered-while-suspended" in the DTS. This is useful for the cases
when hardware does not power-off the TPM.

Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
---
 drivers/char/tpm/tpm-chip.c      | 12 ++++++++++++
 drivers/char/tpm/tpm-interface.c |  3 +++
 drivers/char/tpm/tpm.h           |  1 +
 3 files changed, 16 insertions(+)

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index a0d9ac6b6cc9..18134cd9ddd7 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -324,8 +324,20 @@ static void tpm1_chip_unregister(struct tpm_chip *chip)
  */
 int tpm_chip_register(struct tpm_chip *chip)
 {
+#ifdef CONFIG_OF
+	struct device_node *np;
+#endif
 	int rc;
 
+#ifdef CONFIG_OF
+	np = of_find_node_by_name(NULL, "vtpm");
+	if (np) {
+		if (of_property_read_bool(np, "powered-while-suspended"))
+			chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;
+	}
+	of_node_put(np);
+#endif
+
 	rc = tpm1_chip_register(chip);
 	if (rc)
 		return rc;
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index aaa5fa95dede..247dd2b6504a 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -931,6 +931,9 @@ int tpm_pm_suspend(struct device *dev)
 	if (chip == NULL)
 		return -ENODEV;
 
+	if (chip->flags & TPM_CHIP_FLAG_ALWAYS_POWERED)
+		return 0;
+
 	if (chip->flags & TPM_CHIP_FLAG_TPM2) {
 		tpm2_shutdown(chip, TPM2_SU_STATE);
 		return 0;
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 772d99b3a8e4..36e1abda00f9 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -168,6 +168,7 @@ struct tpm_vendor_specific {
 enum tpm_chip_flags {
 	TPM_CHIP_FLAG_REGISTERED	= BIT(0),
 	TPM_CHIP_FLAG_TPM2		= BIT(1),
+	TPM_CHIP_FLAG_ALWAYS_POWERED	= BIT(5),
 };
 
 struct tpm_chip {
-- 
2.17.0

Re: [PATCH v3 1/2] tpm: do not suspend/resume if power stays on

[Greg KH]

On Tue, Jun 05, 2018 at 09:03:39PM +0300, Jarkko Sakkinen wrote:
> From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> 
> commit b5d0ebc99bf5d0801a5ecbe958caa3d68b8eaee8 upstream
> 
> The suspend/resume behavior of the TPM can be controlled by setting
> "powered-while-suspended" in the DTS. This is useful for the cases
> when hardware does not power-off the TPM.
> 
> Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> Signed-off-by: James Morris <james.l.morris@oracle.com>
> ---
>  drivers/char/tpm/tpm-chip.c      | 12 ++++++++++++
>  drivers/char/tpm/tpm-interface.c |  3 +++
>  drivers/char/tpm/tpm.h           |  1 +
>  3 files changed, 16 insertions(+)
> 
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index a0d9ac6b6cc9..18134cd9ddd7 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -324,8 +324,20 @@ static void tpm1_chip_unregister(struct tpm_chip *chip)
>   */
>  int tpm_chip_register(struct tpm_chip *chip)
>  {
> +#ifdef CONFIG_OF
> +	struct device_node *np;
> +#endif
>  	int rc;
>  
> +#ifdef CONFIG_OF
> +	np = of_find_node_by_name(NULL, "vtpm");
> +	if (np) {
> +		if (of_property_read_bool(np, "powered-while-suspended"))
> +			chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;
> +	}
> +	of_node_put(np);
> +#endif
> +
>  	rc = tpm1_chip_register(chip);
>  	if (rc)
>  		return rc;

Also has the same build error as the 4.9.y patch did :(

I'll fix it up...

greg k-h

Re: [PATCH v3 1/2] tpm: do not suspend/resume if power stays on

[Jarkko Sakkinen]

On Thu, Jun 07, 2018 at 11:38:49AM +0200, Greg KH wrote:
> On Tue, Jun 05, 2018 at 09:03:39PM +0300, Jarkko Sakkinen wrote:
> > From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> > 
> > commit b5d0ebc99bf5d0801a5ecbe958caa3d68b8eaee8 upstream
> > 
> > The suspend/resume behavior of the TPM can be controlled by setting
> > "powered-while-suspended" in the DTS. This is useful for the cases
> > when hardware does not power-off the TPM.
> > 
> > Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
> > Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> > Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > Signed-off-by: James Morris <james.l.morris@oracle.com>
> > ---
> >  drivers/char/tpm/tpm-chip.c      | 12 ++++++++++++
> >  drivers/char/tpm/tpm-interface.c |  3 +++
> >  drivers/char/tpm/tpm.h           |  1 +
> >  3 files changed, 16 insertions(+)
> > 
> > diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> > index a0d9ac6b6cc9..18134cd9ddd7 100644
> > --- a/drivers/char/tpm/tpm-chip.c
> > +++ b/drivers/char/tpm/tpm-chip.c
> > @@ -324,8 +324,20 @@ static void tpm1_chip_unregister(struct tpm_chip *chip)
> >   */
> >  int tpm_chip_register(struct tpm_chip *chip)
> >  {
> > +#ifdef CONFIG_OF
> > +	struct device_node *np;
> > +#endif
> >  	int rc;
> >  
> > +#ifdef CONFIG_OF
> > +	np = of_find_node_by_name(NULL, "vtpm");
> > +	if (np) {
> > +		if (of_property_read_bool(np, "powered-while-suspended"))
> > +			chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;
> > +	}
> > +	of_node_put(np);
> > +#endif
> > +
> >  	rc = tpm1_chip_register(chip);
> >  	if (rc)
> >  		return rc;
> 
> Also has the same build error as the 4.9.y patch did :(
> 
> I'll fix it up...
> 
> greg k-h

Ugh, I'm sorry :/ I did compile everything in BuildRoot with power arch.
Have to revisit if something was left out of staging area or what
happened.

I'll look forward reburnish my testing and get hardware if possible for
the power architecture. Otherwise, this will be difficult to deal with
also in future.

/Jarkko

Re: [PATCH v3 1/2] tpm: do not suspend/resume if power stays on

[Greg KH]

On Thu, Jun 07, 2018 at 05:05:14PM +0300, Jarkko Sakkinen wrote:
> On Thu, Jun 07, 2018 at 11:38:49AM +0200, Greg KH wrote:
> > On Tue, Jun 05, 2018 at 09:03:39PM +0300, Jarkko Sakkinen wrote:
> > > From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> > > 
> > > commit b5d0ebc99bf5d0801a5ecbe958caa3d68b8eaee8 upstream
> > > 
> > > The suspend/resume behavior of the TPM can be controlled by setting
> > > "powered-while-suspended" in the DTS. This is useful for the cases
> > > when hardware does not power-off the TPM.
> > > 
> > > Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
> > > Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> > > Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> > > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > > Signed-off-by: James Morris <james.l.morris@oracle.com>
> > > ---
> > >  drivers/char/tpm/tpm-chip.c      | 12 ++++++++++++
> > >  drivers/char/tpm/tpm-interface.c |  3 +++
> > >  drivers/char/tpm/tpm.h           |  1 +
> > >  3 files changed, 16 insertions(+)
> > > 
> > > diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> > > index a0d9ac6b6cc9..18134cd9ddd7 100644
> > > --- a/drivers/char/tpm/tpm-chip.c
> > > +++ b/drivers/char/tpm/tpm-chip.c
> > > @@ -324,8 +324,20 @@ static void tpm1_chip_unregister(struct tpm_chip *chip)
> > >   */
> > >  int tpm_chip_register(struct tpm_chip *chip)
> > >  {
> > > +#ifdef CONFIG_OF
> > > +	struct device_node *np;
> > > +#endif
> > >  	int rc;
> > >  
> > > +#ifdef CONFIG_OF
> > > +	np = of_find_node_by_name(NULL, "vtpm");
> > > +	if (np) {
> > > +		if (of_property_read_bool(np, "powered-while-suspended"))
> > > +			chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;
> > > +	}
> > > +	of_node_put(np);
> > > +#endif
> > > +
> > >  	rc = tpm1_chip_register(chip);
> > >  	if (rc)
> > >  		return rc;
> > 
> > Also has the same build error as the 4.9.y patch did :(
> > 
> > I'll fix it up...
> > 
> > greg k-h
> 
> Ugh, I'm sorry :/ I did compile everything in BuildRoot with power arch.
> Have to revisit if something was left out of staging area or what
> happened.

I don't think you enabled CONFIG_OF, that would have showed this failed.
Try 'make allmodconfig' next time.

thanks,

greg k-h