From 620cc1d5c7cec735f91261a9ea0153bbbf41ead7 Mon Sep 17 00:00:00 2001 From: deraadt Date: Mon, 4 Apr 2022 15:46:45 +0000 Subject: [PATCH] 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 --- sys/dev/acpi/tpm.c | 4 ++-- 1 file 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[] = { -- 2.20.1