From: Greg KH <greg@kroah.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: Enric Balletbo i Serra <enric.balletbo@collabora.com>,
Chris Chiu <chiu@endlessm.com>,
stable@vger.kernel.org, Sonny Rao <sonnyrao@chromium.org>,
James Morris <james.l.morris@oracle.com>
Subject: Re: [PATCH v3 1/2] tpm: do not suspend/resume if power stays on
Date: Thu, 7 Jun 2018 11:36:42 +0200 [thread overview]
Message-ID: <20180607093642.GA23066@kroah.com> (raw)
In-Reply-To: <20180605183401.24198-2-jarkko.sakkinen@linux.intel.com>
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
next prev parent reply other threads:[~2018-06-07 9:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-05 18:33 [PATCH v3 0/2] Fixes for v4.9 Jarkko Sakkinen
2018-06-05 18:34 ` [PATCH v3 1/2] tpm: do not suspend/resume if power stays on Jarkko Sakkinen
2018-06-07 9:36 ` Greg KH [this message]
2018-06-05 18:34 ` [PATCH v3 2/2] tpm: self test failure should not cause suspend to fail Jarkko Sakkinen
-- strict thread matches above, loose matches on Subject: below --
2018-06-05 18:03 [PATCH v3 0/2] Fixes for v4.4 Jarkko Sakkinen
2018-06-05 18:03 ` [PATCH v3 1/2] tpm: do not suspend/resume if power stays on Jarkko Sakkinen
2018-06-07 9:38 ` Greg KH
2018-06-07 14:05 ` Jarkko Sakkinen
2018-06-07 14:44 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180607093642.GA23066@kroah.com \
--to=greg@kroah.com \
--cc=chiu@endlessm.com \
--cc=enric.balletbo@collabora.com \
--cc=james.l.morris@oracle.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=sonnyrao@chromium.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.