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