Commit c7d58182 authored by Enric Balletbo i Serra's avatar Enric Balletbo i Serra Committed by Greg Kroah-Hartman

tpm: do not suspend/resume if power stays on

commit b5d0ebc9 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: default avatarSonny Rao <sonnyrao@chromium.org>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dc45cafe
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/freezer.h> #include <linux/freezer.h>
#include <linux/major.h> #include <linux/major.h>
#include <linux/of.h>
#include "tpm.h" #include "tpm.h"
#include "tpm_eventlog.h" #include "tpm_eventlog.h"
...@@ -324,8 +325,20 @@ static void tpm1_chip_unregister(struct tpm_chip *chip) ...@@ -324,8 +325,20 @@ static void tpm1_chip_unregister(struct tpm_chip *chip)
*/ */
int tpm_chip_register(struct tpm_chip *chip) int tpm_chip_register(struct tpm_chip *chip)
{ {
#ifdef CONFIG_OF
struct device_node *np;
#endif
int rc; 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); rc = tpm1_chip_register(chip);
if (rc) if (rc)
return rc; return rc;
......
...@@ -931,6 +931,9 @@ int tpm_pm_suspend(struct device *dev) ...@@ -931,6 +931,9 @@ int tpm_pm_suspend(struct device *dev)
if (chip == NULL) if (chip == NULL)
return -ENODEV; return -ENODEV;
if (chip->flags & TPM_CHIP_FLAG_ALWAYS_POWERED)
return 0;
if (chip->flags & TPM_CHIP_FLAG_TPM2) { if (chip->flags & TPM_CHIP_FLAG_TPM2) {
tpm2_shutdown(chip, TPM2_SU_STATE); tpm2_shutdown(chip, TPM2_SU_STATE);
return 0; return 0;
......
...@@ -168,6 +168,7 @@ struct tpm_vendor_specific { ...@@ -168,6 +168,7 @@ struct tpm_vendor_specific {
enum tpm_chip_flags { enum tpm_chip_flags {
TPM_CHIP_FLAG_REGISTERED = BIT(0), TPM_CHIP_FLAG_REGISTERED = BIT(0),
TPM_CHIP_FLAG_TPM2 = BIT(1), TPM_CHIP_FLAG_TPM2 = BIT(1),
TPM_CHIP_FLAG_ALWAYS_POWERED = BIT(5),
}; };
struct tpm_chip { struct tpm_chip {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment