[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 37/44] tpm: add a "ppi" boolean property
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 37/44] tpm: add a "ppi" boolean property |
Date: |
Mon, 14 Jan 2019 20:37:05 -0500 |
From: Marc-André Lureau <address@hidden>
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 >=4.0 machine type, to avoid migration issues.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Tested-by: Stefan Berger <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/core/machine.c | 2 ++
hw/tpm/tpm_crb.c | 3 +++
hw/tpm/tpm_tis.c | 3 +++
3 files changed, 8 insertions(+)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index f0c0ae6be8..2629515363 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -28,6 +28,8 @@ GlobalProperty hw_compat_3_1[] = {
{ "pcie-root-port", "x-width", "1" },
{ "memory-backend-file", "x-use-canonical-path-for-ramblock-id", "true" },
{ "memory-backend-memfd", "x-use-canonical-path-for-ramblock-id", "true" },
+ { "tpm-crb", "ppi", "false" },
+ { "tpm-tis", "ppi", "false" },
};
const size_t hw_compat_3_1_len = G_N_ELEMENTS(hw_compat_3_1);
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 2563d7501f..1698d83cd3 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)
@@ -954,6 +956,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(),
};
--
MST
- [Qemu-devel] [PULL 00/44] pci, pc, virtio: fixes, features, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 44/44] acpi: update expected files, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 43/44] hw: acpi: Fix memory hotplug AML generation error, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 42/44] tpm: clear RAM when "memory overwrite" requested, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 41/44] acpi: add ACPI memory clear interface, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 40/44] acpi: build TPM Physical Presence interface, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 39/44] acpi: expose TPM/PPI configuration parameters to firmware via fw_cfg, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 38/44] tpm: allocate/map buffer for TPM Physical Presence interface, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 36/44] hw/misc/edu: add msi_uninit() for pci_edu_uninit(), Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 37/44] tpm: add a "ppi" boolean property,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 34/44] globals: Allow global properties to be optional, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 33/44] virtio: virtio 9p really requires CONFIG_VIRTFS to work, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 29/44] virtio: split virtio net bits from virtio-pci, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 25/44] virtio: split vhost user scsi bits from virtio-pci, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 24/44] virtio: split vhost user blk bits from virtio-pci, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 35/44] virtio: Make disable-legacy/disable-modern compat properties optional, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 32/44] virtio: split virtio crypto bits from virtio-pci.h, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 31/44] virtio: split virtio gpu bits from virtio-pci.h, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 20/44] virtio: split virtio input bits from virtio-pci, Michael S. Tsirkin, 2019/01/14
- [Qemu-devel] [PULL 19/44] virtio: split virtio input host bits from virtio-pci, Michael S. Tsirkin, 2019/01/14