summaryrefslogtreecommitdiff
path: root/src/drivers/pc80/tpm/acpi
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2015-05-18 10:46:57 +0200
committerVladimir Serbinenko <phcoder@gmail.com>2015-05-27 22:25:45 +0200
commitce58a4e0021eb1b1bb6ab26bdb3bbbff26a5ad83 (patch)
tree7d5f1e04a941ab2bd22d93d4ec1a84c911ba7137 /src/drivers/pc80/tpm/acpi
parenta93c0143ac79f937f774b99e4afedee6a20eb5d3 (diff)
Deactivate TPM
Just not exporting TPM isn't good enough as it can still be accessed. You need to send it a deactivate command. Change-Id: I3eb84660949c2d1e2b492d541e01d4ba78037630 Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/10270 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/drivers/pc80/tpm/acpi')
-rw-r--r--src/drivers/pc80/tpm/acpi/tpm.asl10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/drivers/pc80/tpm/acpi/tpm.asl b/src/drivers/pc80/tpm/acpi/tpm.asl
index 30b14ce897..0562f2a935 100644
--- a/src/drivers/pc80/tpm/acpi/tpm.asl
+++ b/src/drivers/pc80/tpm/acpi/tpm.asl
@@ -27,11 +27,11 @@ Device (TPM)
Method (_STA, 0)
{
- If (CONFIG_LPC_TPM) {
- Return (0xf)
- } Else {
- Return (0x0)
- }
+#if CONFIG_LPC_TPM && !CONFIG_TPM_DEACTIVATE
+ Return (0xf)
+#else
+ Return (0x0)
+#endif
}
Name (IBUF, ResourceTemplate ()