summaryrefslogtreecommitdiff
path: root/sys/dev/acpi
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2022-04-04 15:46:46 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2022-04-04 15:46:46 +0000
commit61bca7052919244ac3d121921c1ee3d7fd07302c (patch)
tree6a2e65c153a03eb123eb8d41d26824c70875b56a /sys/dev/acpi
parent7904e4e77435465bee81036a0237f2dc0b5c9ebd (diff)
As a hack, use CD_SKIPHIBERNATE. For 2.0, our TPM lifecycle management
is improper, and some chips are more sensitive to this than others. In an unhibernate situation, /bsd.booted will 'suspend' the TPM, then jump directly into unhib /bsd, which 'resumes' it. This is wrong because the lifecycle is supposed to be more like suspend->BIOS->resume. This is a hack until we figure out how to fix the lifecycle. from claudio, ok dv
Diffstat (limited to 'sys/dev/acpi')
-rw-r--r--sys/dev/acpi/tpm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/acpi/tpm.c b/sys/dev/acpi/tpm.c
index 627cc0bfe25..c0e6a0274f5 100644
--- a/sys/dev/acpi/tpm.c
+++ b/sys/dev/acpi/tpm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tpm.c,v 1.15 2021/12/21 20:53:46 kettenis Exp $ */
+/* $OpenBSD: tpm.c,v 1.16 2022/04/04 15:46:45 deraadt Exp $ */
/*
* Minimal interface to Trusted Platform Module chips implementing the
@@ -233,7 +233,7 @@ struct cfattach tpm_ca = {
};
struct cfdriver tpm_cd = {
- NULL, "tpm", DV_DULL
+ NULL, "tpm", DV_DULL, CD_SKIPHIBERNATE /* XXX */
};
const char *tpm_hids[] = {