[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 2/6] tpm: add a "ppi" boolean property
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v9 2/6] tpm: add a "ppi" boolean property |
Date: |
Fri, 10 Aug 2018 17:32:19 +0200 |
The following patches implement the TPM Physical Presence Interface,
make use of a new memory region and a fw_cfg entry. Enable PPI by
default with >3.0 machine type, to avoid migration issues.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
---
include/hw/compat.h | 12 +++++++++++-
hw/tpm/tpm_crb.c | 3 +++
hw/tpm/tpm_tis.c | 3 +++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/include/hw/compat.h b/include/hw/compat.h
index f8e596969a..fafbffd335 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -1,7 +1,17 @@
#ifndef HW_COMPAT_H
#define HW_COMPAT_H
-#define HW_COMPAT_3_0
+#define HW_COMPAT_3_0 \
+ {\
+ .driver = "tpm-crb",\
+ .property = "ppi",\
+ .value = "false",\
+ },\
+ {\
+ .driver = "tpm-tis",\
+ .property = "ppi",\
+ .value = "false",\
+ },
#define HW_COMPAT_2_12 \
{\
diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c
index a92dd50437..d5b0ac5920 100644
--- a/hw/tpm/tpm_crb.c
+++ b/hw/tpm/tpm_crb.c
@@ -41,6 +41,8 @@ typedef struct CRBState {
MemoryRegion cmdmem;
size_t be_buffer_size;
+
+ bool ppi_enabled;
} CRBState;
#define CRB(obj) OBJECT_CHECK(CRBState, (obj), TYPE_TPM_CRB)
@@ -221,6 +223,7 @@ static const VMStateDescription vmstate_tpm_crb = {
static Property tpm_crb_properties[] = {
DEFINE_PROP_TPMBE("tpmdev", CRBState, tpmbe),
+ DEFINE_PROP_BOOL("ppi", CRBState, ppi_enabled, true),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index 12f5c9a759..d9ddf9b723 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -81,6 +81,8 @@ typedef struct TPMState {
TPMVersion be_tpm_version;
size_t be_buffer_size;
+
+ bool ppi_enabled;
} TPMState;
#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
@@ -950,6 +952,7 @@ static const VMStateDescription vmstate_tpm_tis = {
static Property tpm_tis_properties[] = {
DEFINE_PROP_UINT32("irq", TPMState, irq_num, TPM_TIS_IRQ),
DEFINE_PROP_TPMBE("tpmdev", TPMState, be_driver),
+ DEFINE_PROP_BOOL("ppi", TPMState, ppi_enabled, true),
DEFINE_PROP_END_OF_LIST(),
};
--
2.18.0.547.g1d89318c48
- [Qemu-devel] [PATCH v9 0/6] Add support for TPM Physical Presence interface, Marc-André Lureau, 2018/08/10
- [Qemu-devel] [PATCH v9 2/6] tpm: add a "ppi" boolean property,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v9 3/6] tpm: allocate/map buffer for TPM Physical Presence interface, Marc-André Lureau, 2018/08/10
- [Qemu-devel] [PATCH v9 4/6] acpi: expose TPM/PPI configuration parameters to firmware via fw_cfg, Marc-André Lureau, 2018/08/10
- [Qemu-devel] [PATCH v9 5/6] acpi: build TPM Physical Presence interface, Marc-André Lureau, 2018/08/10
- [Qemu-devel] [PATCH v9 6/6] tpm: add ACPI memory clear interface, Marc-André Lureau, 2018/08/10
Re: [Qemu-devel] [PATCH v9 0/6] Add support for TPM Physical Presence interface, no-reply, 2018/08/16