Re: [PATCH v3 1/2] tpm: do not suspend/resume if power stays on
From: Greg KH <hidden>
Date: 2018-06-07 14:45:01
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:quoted
On Tue, Jun 05, 2018 at 09:03:39PM +0300, Jarkko Sakkinen wrote:quoted
From: Enric Balletbo i Serra <redacted> 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 <redacted> Signed-off-by: Enric Balletbo i Serra <redacted> Reviewed-by: Jason Gunthorpe <redacted> Reviewed-by: Jarkko Sakkinen <redacted> Signed-off-by: Jarkko Sakkinen <redacted> Signed-off-by: James Morris <redacted> --- 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-hUgh, 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