Signed-off-by: Petr Vorel --- Hi, this backport patch already stacked to mainline for v5.1. IMHO it'd be nice not having to wait for v5.1 (some people use suspend often). Kind regards, Petr --- ...01-tpm-turn-on-TPM-on-suspend-for-TPM-1.x.patch | 51 ++++++++++++++++++++++ series.conf | 7 +++ 2 files changed, 58 insertions(+) create mode 100644 patches.suse/0001-tpm-turn-on-TPM-on-suspend-for-TPM-1.x.patch diff --git a/patches.suse/0001-tpm-turn-on-TPM-on-suspend-for-TPM-1.x.patch b/patches.suse/0001-tpm-turn-on-TPM-on-suspend-for-TPM-1.x.patch new file mode 100644 index 0000000000..343ea17349 --- /dev/null +++ b/patches.suse/0001-tpm-turn-on-TPM-on-suspend-for-TPM-1.x.patch @@ -0,0 +1,51 @@ +From ada14f61ed5e111523ace5553d152ca89883c0a4 Mon Sep 17 00:00:00 2001 +From: Jarkko Sakkinen +Date: Fri, 22 Mar 2019 12:51:20 +0200 +Subject: [PATCH] tpm: turn on TPM on suspend for TPM 1.x + +Patch-mainline: submitted https://patchwork.kernel.org/patch/10865495/ +References: http://git.infradead.org/users/jjs/linux-tpmdd.git/commitdiff/ada14f61ed5e11... + +tpm_chip_start/stop() should be also called for TPM 1.x devices on +suspend. Add that functionality back. Do not lock the chip because +it is unnecessary as there are no multiple threads using it when +doing the suspend. + +Fixes: a3fbfae82b4c ("tpm: take TPM chip power gating out of tpm_transmit()") +Reported-by: Paul Zimmerman +Signed-off-by: Jarkko Sakkinen +Tested-by: Domenico Andreoli +Signed-off-by: Petr Vorel +--- + drivers/char/tpm/tpm-interface.c | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c +index 83ece5639f86..ae1030c9b086 100644 +--- a/drivers/char/tpm/tpm-interface.c ++++ b/drivers/char/tpm/tpm-interface.c +@@ -402,15 +402,13 @@ int tpm_pm_suspend(struct device *dev) + if (chip->flags & TPM_CHIP_FLAG_ALWAYS_POWERED) + return 0; + +- if (chip->flags & TPM_CHIP_FLAG_TPM2) { +- mutex_lock(&chip->tpm_mutex); +- if (!tpm_chip_start(chip)) { ++ if (!tpm_chip_start(chip)) { ++ if (chip->flags & TPM_CHIP_FLAG_TPM2) + tpm2_shutdown(chip, TPM2_SU_STATE); +- tpm_chip_stop(chip); +- } +- mutex_unlock(&chip->tpm_mutex); +- } else { +- rc = tpm1_pm_suspend(chip, tpm_suspend_pcr); ++ else ++ rc = tpm1_pm_suspend(chip, tpm_suspend_pcr); ++ ++ tpm_chip_stop(chip); + } + + return rc; +-- +2.16.4 + diff --git a/series.conf b/series.conf index 3c07ccef6b..c21cb67d69 100644 --- a/series.conf +++ b/series.conf @@ -177,6 +177,13 @@ patches.suse/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch patches.suse/acpi_thermal_passive_blacklist.patch + ######################################################## + # + # TPM patches + # + ######################################################## + patches.suse/0001-tpm-turn-on-TPM-on-suspend-for-TPM-1.x.patch + ######################################################## # CPUFREQ ######################################################## -- 2.16.4 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org